← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14353: Fixed bug - css for add/update tracked entity attribute group.

 

------------------------------------------------------------
revno: 14353
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-24 12:58:03 +0700
message:
  Fixed bug - css for add/update tracked entity attribute group.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.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-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm	2014-03-24 05:58:03 +0000
@@ -23,9 +23,9 @@
 
 <table>
 	<colgroup>
-		<col style='width:300px'/>
+		<col style='width:500px'/>
 		<col/>
-		<col style='width:300px'/>
+		<col style='width:500px'/>
 	</colgroup>
 	<tr>
 		<th>$i18n.getString( "availableAttribute" )</th>
@@ -37,7 +37,7 @@
 	
 	<tr>
 		<td>
-			<select style='width:100%' multiple="multiple" id="availableAttributes" name="availableAttributes" size="15" ></select>
+			<select style="height: 200px; width: 100%;" multiple="multiple" id="availableAttributes" name="availableAttributes" ></select>
 		</td>
 		<td>
 			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )" class='filterButton'/><br/>
@@ -46,7 +46,7 @@
 			<input type="button" value="&lt;&lt;" onclick="moveAllById( 'selectedAttributes', 'availableAttributes' )" class='filterButton' />
 		</td>
 		<td>
-			<select style='width:100%' multiple="multiple" id="selectedAttributes" name="selectedAttributes" size="15" ></select>
+			<select style="height: 200px; width: 100%; margin-top: 22px;" multiple="multiple" id="selectedAttributes" name="selectedAttributes" ></select>
 		</td>
 		<td>
 			<a href="javascript:moveUpSelectedOption( 'selectedAttributes')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
@@ -55,8 +55,8 @@
 	</tr>  
 	<tr>
 		<td colspan='2'>
-			<input type="submit" value="$i18n.getString( 'add' )" />
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='attributeGroup.action'"/>
+			<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
+			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='attributeGroup.action'" style="width:10em" />
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm	2014-03-24 05:58:03 +0000
@@ -26,9 +26,9 @@
 
 <table>
 	<colgroup>
-		<col style='width:300px'/>
+		<col style='width:500px'/>
 		<col/>
-		<col style='width:300px'/>
+		<col style='width:500px'/>
 	</colgroup>
 	<tr>
 		<th>$i18n.getString( "availableAttribute" )</th>
@@ -40,7 +40,7 @@
 	
 	<tr>
 		<td>
-			<select style='width:100%' multiple id="availableAttributes" name="availableAttributes" size="15"></select>
+			<select style="height: 200px; width: 100%; margin-top: 22px;" multiple id="availableAttributes" name="availableAttributes" size="15"></select>
 		</td>
 		<td>
 			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="dhisAjaxSelect_moveAllSelected( 'availableAttributes', 'selectedAttributes' )" class='filterButton'/><br/>
@@ -49,7 +49,7 @@
 			<input type="button" value="&lt;&lt;" onclick="moveAllById( 'selectedAttributes', 'availableAttributes' )" class='filterButton' />
 		</td>
 		<td>
-			<select style='width:100%' multiple id="selectedAttributes" name="selectedAttributes" size="15">
+			<select style="height: 200px; width: 100%; margin-top: 22px;" multiple id="selectedAttributes" name="selectedAttributes" size="15">
 			#foreach($attribute in $attributeGroup.attributes)
 			#if($!attribute)
 				<option value='$attribute.id'>$attribute.name</option>
@@ -65,8 +65,8 @@
 
 	<tr>
 		<td colspan='2'>
-			<input type="submit" value="$i18n.getString( 'update' )" />
-			<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='attributeGroup.action'" />
+			<input type="submit" value="$i18n.getString( 'update' )" style="width:10em" />
+			<input type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='attributeGroup.action'" />
 		</td>
 	</tr>
 </table>