dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11035
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-28 13:48:33 +0700
message:
  Merge Tracking-menu into Person menu
removed:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.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-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2013-04-16 05:41:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2013-05-28 06:48:33 +0000
@@ -1,15 +1,12 @@
-#if( $auth.hasAccess( "dhis-web-caseentry", "patient" ) )
+#if( $auth.hasAccess( "dhis-web-caseentry", "patient" ) 
+	|| $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) 
+	|| $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
 <h2>$i18n.getString( "patient" )&nbsp;</h2>
-<ul>
-	<li><a href="patient.action">$i18n.getString( "find_and_add_person" )</a></li>
-</ul>
-#end
-
-#if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) 
-	|| $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
-<h2>$i18n.getString( "tracking" )&nbsp;</h2>
-#end
-<ul>
+#end
+<ul>
+	#if( $auth.hasAccess( "dhis-web-caseentry", "patient" ) )
+		<li><a href="patient.action">$i18n.getString( "find_and_add_person" )</a></li>
+	#end
     #if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) )
 		<li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>     
 	#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm	2013-05-28 06:48:33 +0000
@@ -2,7 +2,15 @@
 <a href="index.action"><h2>$i18n.getString( "patient" )&nbsp;</h2></a>
 
 <ul>
+	#if( $auth.hasAccess( "dhis-web-caseentry", "patient" ) )
 	<li><a href="patient.action">$i18n.getString( "find_and_add_person" )</a></li>
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) )
+		<li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>  
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
+		<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>     
+	#end
 </ul>
 
 <br>

=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-<a href="index.action"><h2>$i18n.getString( "tracking" )&nbsp;</h2></a>
-<ul>
-    #if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) )
-		<li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>  
-	#end
-	#if( $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
-		<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>     
-	#end
-</ul>
-
-#parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )