dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3156
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-24 15:01:18 +0100
message:
  minor fixes
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittreesearch.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.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/dhis-web-commons/ouwt/orgunittreesearch.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittreesearch.vm	2010-12-02 14:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittreesearch.vm	2011-03-24 14:01:18 +0000
@@ -1,18 +1,21 @@
-
-<img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="$i18n.getString( 'locate_organisation_unit_by_code_or_name' )">
-<span id="searchSpan" style="display:none"><input type="text" id="searchField" name="key" style="width:130px" onchange="selection.findByCode()"><input type="button" value="Find" onclick="selection.findByCode()"></span>
-
-<script>
-$(document).ready(function(){
-	$("#searchIcon").click(function(){
-		$("#searchSpan").toggle();
-		$("#searchField").focus();
+<script type="text/javascript">
+	jQuery(document).ready(function(){
+		jQuery("#searchIcon").click(function(){
+			jQuery("#searchSpan").toggle();
+			jQuery("#searchField").focus();
+		});
 	});
-});
 
-var i18n_find = '$encoder.jsEscape( $i18n.getString( "find" ) , "'")';
+	var i18n_find = '$encoder.jsEscape( $i18n.getString( "find" ) , "'")';
 </script>
 
+<img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="$i18n.getString( 'locate_organisation_unit_by_code_or_name' )">
+
+<span id="searchSpan" style="display:none">
+	<input type="text" id="searchField" name="key" style="width:130px" onchange="selection.findByCode()" />
+	<input type="button" value="Find" onclick="selection.findByCode()" />
+</span>
+
 <div id="orgUnitTreeContainer">
 #parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm	2011-03-18 14:24:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/hierarchyOperations.vm	2011-03-24 14:01:18 +0000
@@ -1,7 +1,10 @@
 
 #if( $selectedOrganisationUnit )
 <script type="text/javascript">
-	organisationUnitToMoveSelected( [$selectedOrganisationUnit.id] );
+	jQuery(document).ready(function() {
+		organisationUnitToMoveSelected( [$selectedOrganisationUnit.id] );
+	});
+
 	var verication_of_the_org_unit_to_move_failed = '$encoder.jsEscape( $i18n.getString( "verication_of_the_org_unit_to_move_failed" ) , "'" )';
 	var not_selected_moved_to_root_position = '$encoder.jsEscape( $i18n.getString( "not_selected_moved_to_root_position" ) , "'" )';
 	var verification_of_the_new_parent_org_unit_failed = '$encoder.jsEscape( $i18n.getString( "verification_of_the_new_parent_org_unit_failed" ) , "'" )';