← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11792: Data set add/update, made description field a text area

 

------------------------------------------------------------
revno: 11792
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-08-25 22:18:18 +0200
message:
  Data set add/update, made description field a text area
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm


--
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-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	2013-08-25 14:20:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-08-25 20:18:18 +0000
@@ -91,7 +91,7 @@
 #detailsArea 
 {
   display: none;
-  border: 1px solid #ececec;
+  border: 1px solid #ddd;
   position: fixed;
   top: 150px;
   width: 233px;
@@ -99,6 +99,7 @@
   padding: 15px;
   overflow: auto;
   color: #222;
+  box-shadow: #f2f2f2 0 1px 1px 0;
 }
 
 #detailsArea label 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2013-08-13 16:43:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2013-08-25 20:18:18 +0000
@@ -75,7 +75,7 @@
       </tr>
       <tr>
         <td><label>$i18n.getString( "description" )</label></td>
-        <td><input type="text" id="description" name="description"></td>
+        <td><textarea id="description" name="description"></textarea></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "expiry_days" )</label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2013-08-13 18:04:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2013-08-25 20:18:18 +0000
@@ -75,7 +75,7 @@
       </tr>
       <tr>
         <td><label>$i18n.getString( "description" )</label></td>
-        <td><input type="text" id="description" name="description" value="$!encoder.htmlEncode( $dataSet.description )"/></td>
+        <td><textarea id="description" name="description">$!encoder.htmlEncode( $dataSet.description )</textarea></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "expiry_days" )</label></td>