← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12991: moved symbol js to commons.js

 

------------------------------------------------------------
revno: 12991
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-11-20 15:12:58 +0100
message:
  moved symbol js to commons.js
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js


--
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/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-10-08 17:16:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-11-20 14:12:58 +0000
@@ -1885,3 +1885,26 @@
 		}
 	} );
 }
+
+
+//-----------------------------------------------------------------------------
+// Symbol
+//-----------------------------------------------------------------------------
+
+function openSymbolDialog()
+{
+	$( "#symbolDiv" ).dialog( {
+		height: 294,
+		width: 250,
+		modal: true,
+		resizable: false,
+		title: "Select symbol"
+	} );
+}
+
+function selectSymbol( img )
+{
+	$( "#symbol" ).val( img );
+	$( "#symbolDiv" ).dialog( "close" );
+	$( "#symbolImg" ).attr( "src", "../images/orgunitgroup/" + img ).show();
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2013-03-01 05:14:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2013-11-20 14:12:58 +0000
@@ -24,25 +24,3 @@
 {
 	removeItem( unitGroupId, unitGroupName, confirm_to_delete_org_unit_group, 'removeOrganisationUnitGroup.action' );
 }
-
-//-----------------------------------------------------------------------------
-//Symbol
-//-----------------------------------------------------------------------------
-
-function openSymbolDialog()
-{
-	$( "#symbolDiv" ).dialog( {
-		height: 294,
-		width: 250,
-		modal: true,
-		resizable: false,
-		title: "Select symbol"
-	} );
-}
-
-function selectSymbol( img )
-{
-	$( "#symbol" ).val( img );
-	$( "#symbolDiv" ).dialog( "close" );
-	$( "#symbolImg" ).attr( "src", "../images/orgunitgroup/" + img ).show();
-}
\ No newline at end of file