dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1511
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-02-25 20:44:33 +0100
message:
  Moved the switch-view icon in the dataelementgroup editor
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/arrow_double_clockwise_y.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.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/images/arrow_double_clockwise_y.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/arrow_double_clockwise_y.png	2010-02-25 08:57:19 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/arrow_double_clockwise_y.png	2010-02-25 19:44:33 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView1.vm	2010-02-25 19:44:33 +0000
@@ -19,9 +19,7 @@
 </style>
 
 <h3>
-	$i18n.getString( "data_element_group_management" )
-	<a href="dataElementGroupEditor.action?view=$view" title="$i18n.getString( 'switch_view' )"><img align="absmiddle" src="../images/arrow_double_clockwise_y.png" title="$i18n.getString( 'switch_view' )"></a>
-	#openHelp( "dataElementGroupEditor" )
+	$i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
 </h3>
 
 <span id='message' style="position:fixed;top:80px;right:5px;"></span>
@@ -30,7 +28,7 @@
 	<tr>
 		<th>$i18n.getString( "data_element_group" )</th>
 		<th><span id="groupNameView" style="display:block;"></span></th>
-		<td></td>
+		<td rowspan="2" style="text-align:center"><a href="dataElementGroupEditor.action?view=$view" title="$i18n.getString( 'switch_view' )"><img src="../images/arrow_double_clockwise_y.png" title="$i18n.getString( 'switch_view' )"></a></td>
 		<th>$i18n.getString( "available_dataelements" )</th>
 
 	</tr>
@@ -38,7 +36,6 @@
 	<tr>
 		<td><input id="dataElementGroupsFilter" type="text" style="width:300px;" onkeyup="filterDataElementGroups();"></td>
 		<td><input id="selecteDataElementsFilter" type="text" style="width:300px;" onkeyup="filterSelectedDataElements();"></td>
-		<td></td>
 		<td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="filterAvailableDataElements();"></td>
 	</tr>
 
@@ -53,11 +50,11 @@
 		</td>
 
 		<td>
-			<input type="button" value="&lt;" onclick="addSelectedDataElements();" style="width:30px"><br><br>
-			<input type="button" value="&gt;" onclick="removeSelectedDataElements();" style="width:30px">
+			<input type="button" value="&lt;" onclick="addSelectedDataElements();" style="width:42px"><br><br>
+			<input type="button" value="&gt;" onclick="removeSelectedDataElements();" style="width:42px">
 		</td>
 		<td>
-			<select class="select" id="availableDataElements" multiple="multiple" size="30"  ondblclick="addSelectedDataElements();" disabled="true" onMouseOut="javascript: hideToolTip();">
+			<select class="select" id="availableDataElements" multiple="multiple" size="30" ondblclick="addSelectedDataElements();" disabled="true" onMouseOut="javascript: hideToolTip();">
 			</select>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm	2010-02-25 13:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView2.vm	2010-02-25 19:44:33 +0000
@@ -19,9 +19,7 @@
 </style>
 
 <h3>
-	$i18n.getString( "data_element_group_management" )
-	<a href="dataElementGroupEditor.action" title="$i18n.getString( 'switch_view' )"><img align="absmiddle" src="../images/arrow_double_clockwise_y.png" title="$i18n.getString( 'switch_view' )"></a>
-	#openHelp( "dataElementGroupEditor" )
+	$i18n.getString( "data_element_group_management" ) #openHelp( "dataElementGroupEditor" )
 </h3>
 
 <span id='message' style="position:fixed;top:80px;right:5px;"></span>
@@ -30,29 +28,28 @@
 	<tr>
 		<th>$i18n.getString( "available_dataelements" )</th>		
 		<th><span id="groupNameView" style="display:block;"></span></th>
-		<td></td>		
+		<td rowspan="2" style="text-align:center"><a href="dataElementGroupEditor.action" title="$i18n.getString( 'switch_view' )"><img src="../images/arrow_double_clockwise_y.png" title="$i18n.getString( 'switch_view' )"></a></td>		
 		<th>$i18n.getString( "available_groups" )</th>
 	</tr>
 
 	<tr>		
 		<td><input id="availableDataElementsFilter" type="text" style="width:300px;" onkeyup="filterAvailableDataElements();"></td>		
 		<td><input id="assignedGroupsFilter" type="text" style="width:300px;" onkeyup="filterAssignedGroups();"></td>
-		<td></td>
 		<td><input id="availableGroupsFilter" type="text" style="width:300px;" onkeyup="filterAvailableGroups();"></td>		
 	</tr>
 
 	<tr>
 		<td>
-			<select class="select" id="availableDataElements"  size="30"  onMouseOut="javascript: hideToolTip();" onclick="getAssignedDataElementGroups(this.value)">
-			</select>
-		</td>
-		<td>
-			<select class="select" id="assignedGroups" multiple="multiple" size="30"  ondblclick="removeSelectedGroups();" onMouseOut="javascript: hideToolTip();">
-			</select>
-		</td>
-		<td>
-			<input type="button" value="&lt;" onclick="addSelectedGroups();" style="width:30px"><br><br>
-			<input type="button" value="&gt;" onclick="removeSelectedGroups();" style="width:30px">
+			<select class="select" id="availableDataElements" size="30" onMouseOut="javascript: hideToolTip();" onclick="getAssignedDataElementGroups(this.value)">
+			</select>
+		</td>
+		<td>
+			<select class="select" id="assignedGroups" multiple="multiple" size="30" ondblclick="removeSelectedGroups();" onMouseOut="javascript: hideToolTip();">
+			</select>
+		</td>
+		<td>
+			<input type="button" value="&lt;" onclick="addSelectedGroups();" style="width:42px"><br><br>
+			<input type="button" value="&gt;" onclick="removeSelectedGroups();" style="width:42px">
 		</td>	
 		<td>
 			<select class="select" id="availableGroups" multiple="multiple" size="30" ondblclick="addSelectedGroups()" onMouseOut="javascript: hideToolTip();">