dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21419
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-12-11 10:59:38 +0100
message:
  tracker-capture: some consistency on tables
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.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-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-11-25 10:41:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-12-11 09:59:38 +0000
@@ -1,5 +1,5 @@
 <form name="outerForm" novalidate>   
-    <table class="dhis2-list-table-striped" ng-if='currentEvent && !currentStage.programStageSections.length'>
+    <table class="dhis2-list-table-striped dhis2-table-hover" ng-if='currentEvent && !currentStage.programStageSections.length'>
         <thead>
             <tr>
                 <th ng-bind="dataElementLabel">
@@ -241,7 +241,7 @@
                     <div class="alert alert-warning">{{'section'| translate}} {{section.name}} {{'has_no_dataelements'| translate}}</div>
                 </div> 
                 
-                <table class="dhis2-list-table-striped" ng-if="section.programStageDataElements && section.programStageDataElements.length > 0">                    
+                <table class="dhis2-list-table-striped dhis2-table-hover" ng-if="section.programStageDataElements && section.programStageDataElements.length > 0">                    
                     <thead>
                         <tr>
                             <th ng-bind="dataElementLabel">

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-10 22:49:35 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-11 09:59:38 +0000
@@ -26,34 +26,34 @@
         <!-- operations on selected enrollment begins -->
         <div ng-if="selectedEnrollment.enrollment">
 
-            <table class="table-borderless table-striped">
-                <tr class="col-md-12">
-                    <td class="col-md-6">
+            <table class="dhis2-list-table-striped dhis2-table-hover">
+                <tr>
+                    <td>
                         {{'enrolling_orgunit' | translate}}
                     </td>
-                    <td class="col-md-6">
+                    <td>
                         <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
                     </td>
                 </tr>
-                <tr class="col-md-12">
-                    <td class="col-md-6">
+                <tr>
+                    <td>
                         {{selectedProgram.enrollmentDateLabel}}
                     </td>
-                    <td class="col-md-6">
+                    <td>
                         <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.enrollmentDate" ng-disabled="true"/>
                     </td>
                 </tr>
-                <tr class="col-md-12" ng-if="selectedProgram.displayIncidentDate">                    
-                    <td class="col-md-6">
+                <tr ng-if="selectedProgram.displayIncidentDate">                    
+                    <td>
                         {{selectedProgram.incidentDateLabel}}
                     </td>
-                    <td class="col-md-6">
+                    <td>
                         <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.incidentDate" ng-disabled="true"/>
                     </td>
                 </tr>                
             </table>
 
-            <div class="vertical-spacing horizonal-spacing">
+            <div class="vertical-spacing">
 
                 <button type="button" 
                         class="btn btn-primary"
@@ -96,26 +96,24 @@
 
         <!-- operations on historical enrollment begins -->
         <div ng-if="showEnrollmentHistoryDiv && !selectedEnrollment">
-            <div class="row">
-                <table class="table table-bordered table-striped dhis2-table-hover">
-                    <tr>
-                        <th>
-                            {{selectedProgram.enrollmentDateLabel}}
-                        </th>
-                        <th ng-if="selectedProgram.displayIncidentDate">
-                            {{selectedProgram.incidentDateLabel}}
-                        </th>
-                    </tr>
-                    <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
-                        <td>
-                            {{en.enrollmentDate}}
-                        </td>
-                        <td ng-if="selectedProgram.displayIncidentDate">
-                            {{en.incidentDate}}
-                        </td>
-                    </tr>
-                </table>
-            </div>
+            <table class="table table-striped dhis2-table-hover table-bordered">
+                <tr>
+                    <th>
+                        {{selectedProgram.enrollmentDateLabel}}
+                    </th>
+                    <th ng-if="selectedProgram.displayIncidentDate">
+                        {{selectedProgram.incidentDateLabel}}
+                    </th>
+                </tr>
+                <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
+                    <td>
+                        {{en.enrollmentDate}}
+                    </td>
+                    <td ng-if="selectedProgram.displayIncidentDate">
+                        {{en.incidentDate}}
+                    </td>
+                </tr>
+            </table>
         </div>
         <!-- operations on historical enrollment ends -->