dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4836
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-05 12:31:52 +0200
message:
  minor adjustments to the way attributes are shown in orgunits add/update
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.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-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2011-10-05 10:31:52 +0000
@@ -68,14 +68,20 @@
         <td><label for="url">$i18n.getString( "url" )</label></td>
         <td><input type="text" id="url" name="url" style="width:20em"/></td>
     </tr>	
+</table>
+
+#tblDynamicAttributes( { "attributes": $attributes } )
+
+<table>
 	<tr>
 		<td style="height:15px" colspan="2">
 	</tr>
+
     <tr>
 		<th colspan="2">$i18n.getString( "contact_details" )</th>
     </tr>
 	<tr>
-		<td><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
+		<td style="width:200px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
 		<td><input type="text" id="contactPerson" name="contactPerson" style="width:20em"/></td>
 	</tr>
 	<tr>
@@ -90,10 +96,12 @@
         <td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
         <td><input type="text" id="phoneNumber" name="phoneNumber" style="width:20em"/></td>
     </tr>	
+
+	<tr>
+		<td style="height:15px" colspan="2">
+	</tr>
 </table>
 
-#tblDynamicAttributes( { "attributes": $attributes } )
-
 <table>
 	<tr>
 		<th colspan="2">$i18n.getString( "data_sets" )</th>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2011-10-05 10:31:52 +0000
@@ -93,14 +93,20 @@
         <td><label for="url">$i18n.getString( "url" )</label></td>
         <td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $organisationUnit.url )" style="width:20em"></td>
     </tr>    
+</table>
+
+#tblDynamicAttributes( { "attributes": $attributes, "attributeValues": $attributeValues } )
+
+<table>
 	<tr>
 		<td style="height:15px" colspan="2">
 	</tr>
+
 	<tr>
 		<th colspan="2">$i18n.getString( "contact_details" )</th>
     </tr>
 	<tr>
-		<td><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
+		<td style="width:200px"><label for="contactPerson">$i18n.getString( "contact_person" ) </label></td>
 		<td><input type="text" id="contactPerson" name="contactPerson" value="$!encoder.htmlEncode( $organisationUnit.contactPerson )" style="width:20em"></td>
 	</tr>
 	<tr>
@@ -115,10 +121,12 @@
         <td><label for="phoneNumber">$i18n.getString( "phone_number" )</label></td>
         <td><input type="text" id="phoneNumber" name="phoneNumber" value="$!encoder.htmlEncode( $organisationUnit.phoneNumber )" style="width:20em"></td>
     </tr>
+
+	<tr>
+		<td style="height:15px" colspan="2">
+	</tr>
 </table>
 
-#tblDynamicAttributes( { "attributes": $attributes, "attributeValues": $attributeValues } )
-
 <table>    
     <tr>
 		<th colspan="2">$i18n.getString( "data_sets" )</th>