dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 890: Moved icons from datadictionary to commons project, improves reuse.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 20 Oct 2009 13:10:24 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 890
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-10-20 15:07:59 +0200
message:
  Moved icons from datadictionary to commons project, improves reuse.
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/divide.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/left_parent.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/minus.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/multiply.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/plus.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/right_parent.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_ascending.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_descending.png
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_ascending.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_descending.png
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditor.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditor.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.

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/divide.png	2009-10-20 13:07:59 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/left_parent.png	2009-10-20 13:07:59 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/minus.png	2009-10-20 13:07:59 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/multiply.png	2009-10-20 13:07:59 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/plus.png	2009-10-20 13:07:59 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/right_parent.png	2009-10-20 13:07:59 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_ascending.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_ascending.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_ascending.png	2009-10-20 13:07:59 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_descending.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_descending.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/sort_descending.png	2009-10-20 13:07:59 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditor.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditor.vm	2009-04-17 23:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditor.vm	2009-10-20 13:07:59 +0000
@@ -50,21 +50,21 @@
 	</tr>
 	<tr>
 		<td>
-			<a href="javascript:sortList( 'dataElementGroups', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'dataElementGroups', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'dataElementGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'dataElementGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
 			<input type="button" value="$i18n.getString( 'new' )" onclick="javascript:showAddDataElementGroupForm()" style="width:70px">
 			<input type="button" value="$i18n.getString( 'rename' )" onclick="javascript:showRenameDataElementGroupForm()" style="width:70px">
 			<input type="button" value="$i18n.getString( 'delete' )" onclick="javascript:deleteDataElementGroup()" style="width:70px">
 		</td>
 		<td>
-			<a href="javascript:sortList( 'selectedDataElements', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'selectedDataElements', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'selectedDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'selectedDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
 			<input type="button" value="$i18n.getString( 'update_dataelement_group_members' )" onclick="javascript:updateDataElementGroupMembers()">
 		</td>
 		<td></td>
 		<td>
-			<a href="javascript:sortList( 'availableDataElements', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'availableDataElements', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'availableDataElements', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'availableDataElements', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
 		</td>
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm	2009-10-20 13:07:59 +0000
@@ -34,12 +34,12 @@
   <tr>
   	<td valign="top">
   	  <textarea id="formula" name="formula" cols="30" rows="12" style="width:250px; height:180px" wrap="virtual" onkeyup="validate( 'formula', 'aggregationOperator' )">$encoder.htmlEncode( $formula )</textarea><br>
-  	  <a href="#" onclick="insertText( 'formula', '(', 'aggregationOperator' )"><img src="images/left_parent.png" alt="$i18n.getString( "left_brackets" )"></a>
-	  <a href="#" onclick="insertText( 'formula', ')', 'aggregationOperator' )"><img src="images/right_parent.png" alt="$i18n.getString( "right_brackets" )"></a>
-	  <a href="#" onclick="insertText( 'formula', '*', 'aggregationOperator' )"><img src="images/multiply.png" alt="$i18n.getString( "multiply" )"></a>
-	  <a href="#" onclick="insertText( 'formula', '/', 'aggregationOperator' )"><img src="images/divide.png" alt="$i18n.getString( "divide" )"></a>
-	  <a href="#" onclick="insertText( 'formula', '+', 'aggregationOperator' )"><img src="images/plus.png" alt="$i18n.getString( "plus" )"></a>
-	  <a href="#" onclick="insertText( 'formula', '-', 'aggregationOperator' )"><img src="images/minus.png" alt="$i18n.getString( "minus" )"></a>
+  	  <a href="#" onclick="insertText( 'formula', '(', 'aggregationOperator' )"><img src="../images/left_parent.png" alt="$i18n.getString( "left_brackets" )"></a>
+	  <a href="#" onclick="insertText( 'formula', ')', 'aggregationOperator' )"><img src="../images/right_parent.png" alt="$i18n.getString( "right_brackets" )"></a>
+	  <a href="#" onclick="insertText( 'formula', '*', 'aggregationOperator' )"><img src="../images/multiply.png" alt="$i18n.getString( "multiply" )"></a>
+	  <a href="#" onclick="insertText( 'formula', '/', 'aggregationOperator' )"><img src="../images/divide.png" alt="$i18n.getString( "divide" )"></a>
+	  <a href="#" onclick="insertText( 'formula', '+', 'aggregationOperator' )"><img src="../images/plus.png" alt="$i18n.getString( "plus" )"></a>
+	  <a href="#" onclick="insertText( 'formula', '-', 'aggregationOperator' )"><img src="../images/minus.png" alt="$i18n.getString( "minus" )"></a>
 	</td>
 	<td></td>
   	<td valign="top">

=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/divide.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/divide.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/divide.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/left_parent.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/left_parent.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/left_parent.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/minus.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/minus.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/minus.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/multiply.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/multiply.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/multiply.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/plus.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/plus.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/plus.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/right_parent.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/right_parent.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/right_parent.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_ascending.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_ascending.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_ascending.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_descending.png'
Binary files dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_descending.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/images/sort_descending.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditor.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditor.vm	2009-09-09 05:41:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditor.vm	2009-10-20 13:07:59 +0000
@@ -50,21 +50,21 @@
 	</tr>
 	<tr>
 		<td>			
-			<a href="javascript:sortList( 'indicatorGroups', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'indicatorGroups', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>			
+			<a href="javascript:sortList( 'indicatorGroups', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'indicatorGroups', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>			
 			<input type="button" value="$i18n.getString( 'new' )" onclick="javascript:showAddIndicatorGroupForm()" style="width:70px"><input 
 			       type="button" value="$i18n.getString( 'rename' )" onclick="javascript:showRenameIndicatorGroupForm()" style="width:70px"><input 
 			       type="button" value="$i18n.getString( 'delete' )" onclick="javascript:deleteIndicatorGroup()" style="width:70px">
 		</td>
 		<td>
-			<a href="javascript:sortList( 'selectedIndicatoss', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'selectedIndicatoss', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>			
+			<a href="javascript:sortList( 'selectedIndicatoss', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'selectedIndicatoss', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>			
 			<input type="button" value="$i18n.getString( 'update_indicator_group_member' )" onclick="javascript:updateIndicatorGroupMembers()">
 		</td>
 		<td></td>
 		<td>
-			<a href="javascript:sortList( 'availableIndicators', 'ASC' );"><img align="absmiddle" src="images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
-			<a href="javascript:sortList( 'availableIndicators', 'DES' );"><img align="absmiddle" src="images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>						
+			<a href="javascript:sortList( 'availableIndicators', 'ASC' );"><img align="absmiddle" src="../images/sort_ascending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>
+			<a href="javascript:sortList( 'availableIndicators', 'DES' );"><img align="absmiddle" src="../images/sort_descending.png" style="border:#666666 thin solid;cursor:pointer;width:20px;"></a>						
 		</td>