dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21304
committer: jijukjose <jijukjose@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-03 18:37:22 +0100
message:
  Added ng-class support for positioning the completed checkbox
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/completedForm.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2015-11-27 09:35:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css	2015-12-03 17:37:22 +0000
@@ -408,6 +408,16 @@
     word-wrap: break-word;
 }
 
+.default-form-completed {
+    width: 100%;
+}
+
+.custom-form-completed {
+    width: 35%
+}
+
+
+
 /*.file-input input[readonly] {
     background-color: white !important;
     cursor: text !important;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/completedForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/completedForm.html	2015-12-03 10:01:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/completedForm.html	2015-12-03 17:37:22 +0000
@@ -1,4 +1,5 @@
-<table style='width: 50%;'>
+
+<table ng-class="{'custom-form-completed': displayCustomForm,'default-form-completed': !displayCustomForm}">
     <tr>
     <th colspan="2">{{'completed_event'| translate}}</th>
     </tr>
@@ -11,3 +12,5 @@
         </td>
     </tr>
 </table>
+
+

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-12-03 11:34:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-12-03 17:37:22 +0000
@@ -62,7 +62,6 @@
                     </div>
                 </div>
                 <div class="row col-sm-12 small-vertical-spacing" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
-
                     <div class="col-sm-4">
                         {{category.name}}
                     </div>
@@ -114,7 +113,7 @@
         <div ng-include="'views/eventList.html'"></div>
         <!-- event grid ends -->
 
-        <!-- event update in full / registration begins-->            
+        <!-- event update in full / registration begins-->
         <form name="outerForm" novalidate>
             <div ng-if="editingEventInFull || eventRegistration">
                 <h3>
@@ -126,6 +125,7 @@
                         <div ng-if="displayCustomForm" ng-include="'views/ec-custom-form.html'"></div>  
                         <div ng-if="!displayCustomForm" ng-include="'views/defaultForm.html'"></div>
                         <div ng-include="'views/completedForm.html'"></div>
+
                         <div ng-include="'views/comments-section.html'"></div>
                         <div ng-include="'views/buttons-section.html'"></div>
                     </div>