dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6087: (patient) Re-organize menu in maintenance-patient.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 23 Feb 2012 02:54:12 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 6087
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-02-23 09:49:20 +0700
message:
  (patient) Re-organize menu in maintenance-patient.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.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-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-02-21 15:14:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-02-23 02:49:20 +0000
@@ -205,7 +205,7 @@
 tall= Tall
 patient_chart_details=Beneficiary chart details
 single_event=Single event
-paitents_and_programs=Beneficiaries and Programs
+patients=Beneficiaries
 gender=Gender
 dob_type=DOB Type
 date_of_enrollment_description=Description of enrollment date

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-02-15 06:47:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-02-23 02:49:20 +0000
@@ -20,7 +20,7 @@
 			class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/relationshipType.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
 			<param name="javascripts">javascript/relationship.js</param>
 		</action>
 
@@ -85,7 +85,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">
 				/dhis-web-maintenance-patient/patientAttribute.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
 			<param name="javascripts">javascript/patientAttribute.js</param>
 		</action>
 
@@ -178,7 +178,7 @@
 			class="org.hisp.dhis.patient.action.orgunitregistration.GetPatientOrgnunitRegistrationAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/orgunitRegistration.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
 			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
 		</action>
 
@@ -194,7 +194,7 @@
 			class="org.hisp.dhis.patient.action.program.GetProgramListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programList.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
 			<param name="javascripts">javascript/program.js</param>
 		</action>
 
@@ -262,7 +262,7 @@
 			class="org.hisp.dhis.patient.action.program.GetProgramAttributeListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programAttributeList.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
 			<param name="javascripts">javascript/programAttribute.js</param>
 		</action>
 
@@ -495,7 +495,7 @@
 			class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/patientAttributeGroup.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
 			<param name="javascripts">javascript/patientAttributeGroup.js</param>
 		</action>
 
@@ -606,7 +606,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">
 				/dhis-web-maintenance-patient/listPatientIdentifierType.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/patientMenu.vm</param>
 			<param name="javascripts">javascript/patientIdentifierType.js</param>
 		</action>
 
@@ -647,7 +647,7 @@
 			class="org.hisp.dhis.patient.action.caseaggregation.GetAllCaseAggregationConditionAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/caseAggregation.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
 			<param name="javascripts">javascript/caseaggregation.js</param>
 		</action>
 
@@ -749,7 +749,7 @@
 			class="org.hisp.dhis.patient.action.validation.GetValidationCriteriaListAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/validationCriteria.vm</param>
-			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
+			<param name="menu">/dhis-web-maintenance-patient/programMenu.vm</param>
 			<param name="javascripts">javascript/validationcriteria.js</param>
 		</action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-02-15 06:47:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-02-23 02:49:20 +0000
@@ -1,14 +1,16 @@
-<h2>$i18n.getString( "paitents_and_programs" )</h2>
+<h2>$i18n.getString( "patients" )</h2>
 <ul>
 	<li><a href="patientAttribute.action">$i18n.getString( "patient_attribute" )</a></li>
 	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
 	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
 	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
 	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_organisation_unit_registration" )</a></li>
+</ul>
+
+<h2>$i18n.getString( "programs" )</h2>
+<ul>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
 	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation_query_builder" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 </ul>
-
-