← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17353: Event capture, css fixes

 

------------------------------------------------------------
revno: 17353
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-11-03 21:32:10 -0500
message:
  Event capture, css fixes
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/customForm.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css


--
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/views/customForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/customForm.html	2014-11-03 10:34:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/customForm.html	2014-11-04 02:32:10 +0000
@@ -19,8 +19,7 @@
                    ng-model="currentEvent.eventDate"
                    ng-disabled="editingEventInFull"    
                    ng-required="true" 
-                   name="eventDate"
-                   style="width:99%;"/>
+                   name="eventDate"/>
             <span ng-show="outerForm.submitted && outerForm.eventDate.$invalid" class="required">{{'required'| translate}}</span>
         </td>
     </tr>
@@ -37,7 +36,7 @@
                    min="-90"
                    max="90"
                    ng-required="false"
-                   style="width:100%;"/>
+                   style="min-width:128px"/>
                 <span ng-show="outerForm.submitted && outerForm.latitude.$invalid" class="required">{{'number_required'| translate}} [-90 ... 90]</span>
             </span>
             <span class="coordinate-container">
@@ -48,7 +47,7 @@
                    min="-180"
                    max="180"
                    ng-required="false"
-                   style="width:100%;"/>
+                   style="min-width:128px"/>
                 <span ng-show="outerForm.submitted && outerForm.longitude.$invalid" class="required">{{'number_required'| translate}}[-180 ... 180]</span>
             </span>
             <!--<span class='pull-right'>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2014-11-03 10:34:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2014-11-04 02:32:10 +0000
@@ -31,8 +31,7 @@
                            ng-model="currentEvent.eventDate"
                            ng-disabled="editingEventInFull"    
                            ng-required="true" 
-                           name="eventDate" 
-                           style="width:99%;">
+                           name="eventDate"/>
                     <span ng-show="outerForm.submitted && outerForm.eventDate.$invalid" class="required">{{'required'| translate}}</span>
                 </td>
             </tr>
@@ -49,7 +48,7 @@
                            min="-90"
                            max="90"
                            ng-required="false"
-                           style="width:100%;"/>
+                           style="min-width:128px"/>
                         <span ng-show="outerForm.submitted && outerForm.latitude.$invalid" class="required">{{'number_required'| translate}} [-90 ... 90]</span>
                     </span>
                     <span class="coordinate-container">
@@ -60,7 +59,7 @@
                            min="-180"
                            max="180"
                            ng-required="false"
-                           style="width:100%;"/>
+                           style="min-width:128px"/>
                         <span ng-show="outerForm.submitted && outerForm.longitude.$invalid" class="required">{{'number_required'| translate}}[-180 ... 180]</span>
                     </span>
                     <!--<span class='pull-right'>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-10-22 18:43:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-11-04 02:32:10 +0000
@@ -880,6 +880,11 @@
   font-size: 10pt !important;
 }
 
+.ui-datepicker-header
+{
+  margin-bottom: 2px;
+}
+
 .ui-button-text
 {
   font-family: LiberationSans, arial, sans-serif !important;