dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19066
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-04-30 13:07:26 +0700
message:
  add extra parameter to oust macro to allow for selection buttons, enable this for send message
modified:
  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/macros.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.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/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2014-04-05 17:55:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2015-04-30 06:07:26 +0000
@@ -44,14 +44,18 @@
 			<td>
 				<div style="width:100%">	
 					<div id="selectionTreeContainer" style="display:none;">
-						<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"/><br>
-						<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_children' )" onclick="selectChildren()" style="width:10em"/>	
+						#if( $hideCtrls )
+						<div id="selectionCtrl">
+							<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"/><br>
+							<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_children' )" onclick="selectChildren()" style="width:10em"/>
+						</div>
+						#end
 						<div id="selectionTree"></div>
 					</div>
 				</div>

=== 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	2015-04-24 10:09:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2015-04-30 06:07:26 +0000
@@ -88,7 +88,7 @@
 </li>
 #end
 
-#macro( organisationUnitSelectionTree $cleanAll $multipleSelectionAllowed $required )
+#macro( organisationUnitSelectionTree $cleanAll $multipleSelectionAllowed $required $hideCtrls )
 #if( $multipleSelectionAllowed )
 	#parse( "/dhis-web-commons/oust/selectionTreeMultipleSelect.vm" )
 #else

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2013-10-30 12:20:19 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2015-04-30 06:07:26 +0000
@@ -43,7 +43,7 @@
 <tr>
 <td style="width:80px">$i18n.getString( "to_org_unit" )</td>
 <td>
-#organisationUnitSelectionTree( true true false )
+#organisationUnitSelectionTree( true true false true )
 </td>
 </tr>
 #else
@@ -70,7 +70,7 @@
 </tr>
 
 <tr>
-<td colspan="2" style="height:10px"></td>
+<td colspan="2" style="height:10px"></td>
 </tr>
 
 <tr>