dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3080: more js cleanup in module dhis-web-maintenance-organisationunit

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 18 Mar 2011 14:26:25 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3080
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-18 15:24:55 +0100
message:
  more js cleanup in module dhis-web-maintenance-organisationunit
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/assignToCompulsoryGroupSetForm.vm
  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/organisationUnit.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/assignToCompulsoryGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/assignToCompulsoryGroupSetForm.vm	2011-03-14 08:18:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/assignToCompulsoryGroupSetForm.vm	2011-03-18 14:24:55 +0000
@@ -17,4 +17,4 @@
 
 <input type="hidden" name="organisationUnitId" value="$organisationUnitId"/>
 
-</form>
\ No newline at end of file
+</form>

=== 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-01-20 15:03:58 +0000
+++ 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
@@ -1,4 +1,13 @@
 
+#if( $selectedOrganisationUnit )
+<script type="text/javascript">
+	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" ) , "'" )';
+</script>
+#end
+
 <h3>$i18n.getString( "hierarchy_operations" ) #openHelp( "hierarchy_operations" )</h3>
 
 <form action="moveOrganisationUnit.action" method="post">
@@ -43,14 +52,4 @@
 		<td><input id="submitButton" type="submit" value="$i18n.getString( 'move' )" style="width:10em" disabled="disabled"/><input type="button" value="$i18n.getString( 'reset' )" style="width:10em" onclick="window.location.href='hierarchyOperations.action'"/></td>
 	</tr>
 </table>
-
 </form>
-
-#if( $selectedOrganisationUnit )
-<script type="text/javascript">
-	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" ) , "'" )';
-</script>
-#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2011-02-15 13:45:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2011-03-18 14:24:55 +0000
@@ -1,3 +1,13 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){	
+		tableSorter( 'listTable' );	
+	});
+
+	var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
+	var yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )';
+	var no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'" )';
+	var confirm_to_delete_org_unit = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit" ) , "'" )';
+</script>
 
 <h3>$i18n.getString( "org_unit_management" ) #openHelp( "orgunit" )</h3>
 
@@ -72,13 +82,3 @@
 		</td>
 	</tr>
 </table>
-
-<script type="text/javascript">
-	var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
-	var yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )';
-	var no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'" )';
-	var confirm_to_delete_org_unit = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit" ) , "'" )';
-	jQuery(document).ready(function(){	
-		tableSorter( 'listTable' );	
-	});
-</script>
\ 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/organisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm	2010-12-28 17:49:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm	2011-03-18 14:24:55 +0000
@@ -1,3 +1,10 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){	
+		tableSorter( 'listTable' );	
+	});
+
+	var confirm_to_delete_org_unit_group = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group" ) , "'" )';
+</script>
 
 <h3>$i18n.getString( "org_unit_group_management" ) #openHelp( "ou_groups" )</h3>
 
@@ -56,10 +63,3 @@
 		</td>
 	</tr>
 </table>
-
-<script type="text/javascript">
-	var confirm_to_delete_org_unit_group = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group" ) , "'" )';
-	jQuery(document).ready(function(){	
-		tableSorter( 'listTable' );	
-	});
-</script>
\ 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/organisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm	2010-12-28 17:49:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm	2011-03-18 14:24:55 +0000
@@ -1,3 +1,12 @@
+<script type="text/javascript">
+	jQuery(document).ready(function(){	
+		tableSorter( 'listTable' );	
+	});
+
+	var confirm_to_delete_org_unit_group_set = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group_set" ) , "'" )';
+	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )';
+	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'" )';
+</script>
 
 <h3>$i18n.getString( "org_unit_group_set_management" ) #openHelp( "ou_groupsets" )</h3>
 
@@ -59,12 +68,3 @@
 		</td>
 	</tr>
 </table>
-
-<script type="text/javascript">
-	var confirm_to_delete_org_unit_group_set = '$encoder.jsEscape( $i18n.getString( "confirm_to_delete_org_unit_group_set" ) , "'" )';
-	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )';
-	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'" )';
-	jQuery(document).ready(function(){	
-		tableSorter( 'listTable' );	
-	});
-</script>
\ 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/organisationUnitSearch.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2011-03-17 23:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2011-03-18 14:24:55 +0000
@@ -1,3 +1,13 @@
+<script type="text/javascript">
+	jQuery( document ).ready( function() {	
+		tableSorter( 'listTable' );	
+		initOrgUnitDetails();
+	} );
+
+	var i18n_all = '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )';
+	var i18n_please_wait_while_downloading = '$encoder.jsEscape( $i18n.getString( "please_wait_while_downloading" ) , "'" )';
+	var i18n_please_wait_while_searching = '$encoder.jsEscape( $i18n.getString( "please_wait_while_searching" ) , "'" )';
+</script>
 
 #if( $selectedOrganisationUnit )
 #set( $orgUnitText = "[ $!encoder.htmlEncode( $selectedOrganisationUnit.name ) ]" )
@@ -108,16 +118,3 @@
 #end
 
 <div id="organisationUnitDetails"></div>
-
-<script type="text/javascript">
-
-$( document ).ready( function() {	
-	tableSorter( 'listTable' );	
-	initOrgUnitDetails();
-} );
-
-var i18n_all = '$encoder.jsEscape( $i18n.getString( "all" ) , "'" )';
-var i18n_please_wait_while_downloading = '$encoder.jsEscape( $i18n.getString( "please_wait_while_downloading" ) , "'" )';
-var i18n_please_wait_while_searching = '$encoder.jsEscape( $i18n.getString( "please_wait_while_searching" ) , "'" )';
-
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm	2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm	2011-03-18 14:24:55 +0000
@@ -25,5 +25,4 @@
     	   type="button" value="$i18n.getString( 'cancel' )" onclick="javascript:window.location.href='index.action'" style="width:10em"/></td>
     </tr>
 </table>
-
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2011-03-17 10:20:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2011-03-18 14:24:55 +0000
@@ -12,6 +12,9 @@
 		datePickerValid( 'openingDate', false );
 		#end			
 	});
+	
+	var previousName = '$encoder.jsEscape( $organisationUnit.name, "'" )';
+	var saving_the_org_unit_failed = '$encoder.jsEscape( $i18n.getString( "saving_the_org_unit_failed" ) , "'" )';
 </script>
 
 
@@ -119,10 +122,3 @@
 </table>
 
 </form>
-
-<script type="text/javascript">
-	
-	var previousName = '$encoder.jsEscape( $organisationUnit.name, "'" )';
-	var saving_the_org_unit_failed = '$encoder.jsEscape( $i18n.getString( "saving_the_org_unit_failed" ) , "'" )';
-	
-</script>