dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3276
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-04-04 17:49:50 +0200
message:
  Small cleanup in oust
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/oust/selectionTreeSingleSelect.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.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/javascripts/oust/selectionTreeSingleSelect.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/oust/selectionTreeSingleSelect.js	2011-03-14 09:46:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/oust/selectionTreeSingleSelect.js	2011-04-04 15:49:50 +0000
@@ -1,10 +1,6 @@
 
 var selectedOrganisationUnitListABCDEF;
 
-jQuery(document).ready( function() {
-
-});
-
 function addSelectedOrganisationUnitABCDEF( id )
 {
 	selectedOrganisationUnitListABCDEF.append( '<option value="' + id + ' selected="selected">' + id + '</option>');

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-03-14 09:46:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-04-04 15:49:50 +0000
@@ -28,9 +28,7 @@
 }
 </script>
 
-
-## You don't have to use this template directly if you don't want to
-<table cellspacing=0 width="795px">
+<table cellspacing=0 width="620px">
 	<thead>
 		<tr>
 			<th colspan="2">$i18n.getString( "organisation_unit_selection_tree" )			
@@ -43,17 +41,17 @@
 			<td>
 				<div style="height:360px;width:100%;background-image:url( ../images/loading.png );background-repeat:no-repeat">	
 					<div id="selectionTreeContainer" style="display:none;">
-						<input type="button" value="$i18n.getString( 'select_at_level' )" onclick="selectOrganisationUnitAtLevel()" style="width:12em"/>
-						<select id="levelList" name="levelList" style="width:12em"/>
-						<input type="button" value="$i18n.getString( 'unselect_at_level' )" onclick="unSelectOrganisationUnitAtLevel()" style="width:12em"/>
-						<input type="button" value="$i18n.getString( 'unselect_all' )" onclick="unSelectAllTree()" style="width:12em"/>	
-						<input type="button" value="$i18n.getString( 'unselect_children' )" onclick="unSelectChildren()" style="width:12em"/>	
+						<input type="button" value="$i18n.getString( 'select_at_level' )" onclick="selectOrganisationUnitAtLevel()" style="width:10em"/>
+						<select id="levelList" name="levelList" style="width:10em"/>
+						<input type="button" value="$i18n.getString( 'unselect_at_level' )" onclick="unSelectOrganisationUnitAtLevel()" style="width:10em"/>
+						<input type="button" value="$i18n.getString( 'unselect_all' )" onclick="unSelectAllTree()" style="width:10em"/>	
+						<input type="button" value="$i18n.getString( 'unselect_children' )" onclick="unSelectChildren()" style="width:10em"/>	
 						<br>
-						<input type="button" value="$i18n.getString( 'select_in_group' )" onclick="selectOrganisationUnitByGroup()" style="width:12em">
-						<select id="groupList" name="groupList" style="width:12em"/>
-						<input type="button" value="$i18n.getString( 'unselect_in_group' )" onclick="unSelectOrganisationUnitByGroup()" style="width:12em">	
-						<input type="button" value="$i18n.getString( 'select_all' )" onclick="selectAllTree()" style="width:12em"/>	
-						<input type="button" value="$i18n.getString( 'select_children' )" onclick="selectChildren()" style="width:12em"/>	
+						<input type="button" value="$i18n.getString( 'select_in_group' )" onclick="selectOrganisationUnitByGroup()" style="width:10em">
+						<select id="groupList" name="groupList" style="width:10em"/>
+						<input type="button" value="$i18n.getString( 'unselect_in_group' )" onclick="unSelectOrganisationUnitByGroup()" style="width:10em">	
+						<input type="button" value="$i18n.getString( 'select_all' )" onclick="selectAllTree()" style="width:10em"/>	
+						<input type="button" value="$i18n.getString( 'select_children' )" onclick="selectChildren()" style="width:10em"/>	
 						<div id="selectionTree" style="padding:5px;width:100%"></div>
 					</div>
 				</div>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm	2011-03-14 09:46:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm	2011-04-04 15:49:50 +0000
@@ -17,8 +17,7 @@
 });
 </script>
 
-## You don't have to use this template directly if you don't want to
-<table cellspacing=0 width="100%">
+<table cellspacing=0 width="620px">
 	<thead>
 		<tr>
 			<th colspan="2">$i18n.getString( "organisation_unit_selection_tree" )

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2010-12-06 22:38:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2011-04-04 15:49:50 +0000
@@ -107,7 +107,7 @@
 #end
 
 #macro( organisationUnitSelectionTree $cleanAll $multipleSelectionAllowed $requied )
-#if( $multipleSelectionAllowed ==true )
+#if( $multipleSelectionAllowed )
 	#parse( "/dhis-web-commons/oust/selectionTreeMultipleSelect.vm" )
 #else
 	#parse( "/dhis-web-commons/oust/selectionTreeSingleSelect.vm" )