------------------------------------------------------------ revno: 2321 committer: Tran Chau <[email protected]> branch nick: dhis2 timestamp: Thu 2010-12-09 15:20:18 +0700 message: Re-organize menu into Beneficiary and Program function. added: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
-- 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/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-12-03 05:41:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-12-09 08:20:18 +0000 @@ -21,7 +21,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/relationship.js</param> </action> @@ -48,7 +48,7 @@ <action name="showAddRelationshipTypeForm" class="org.hisp.dhis.patient.action.NoAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addRelationshipTypeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/relationship.js</param> <param name="requiredAuthorities">F_RELATIONSHIPTYPE_ADD</param> </action> @@ -57,7 +57,7 @@ class="org.hisp.dhis.patient.action.relationship.GetRelationshipTypeAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/relationship.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param> </action> @@ -93,7 +93,7 @@ </result> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/relationshipList.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/relationship.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTEVALUE_UPDATE</param> @@ -104,7 +104,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/relationshipList.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/relationship.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTEVALUE_UPDATE</param> @@ -115,7 +115,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addRelationshipForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/relationship.js</param> <param name="requiredAuthorities">F_RELATIONSHIP_ADD</param> @@ -177,7 +177,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addRelationshipPatientForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js @@ -217,7 +217,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttribute.js</param> </action> @@ -245,7 +245,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/addPatientAttributeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttribute.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param> </action> @@ -255,7 +255,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/updatePatientAttibuteForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttribute.js ,javascript/jquery/cluetip/jquery.cluetip.min.js</param> <param name="stylesheets">javascript/jquery/cluetip/jquery.cluetip.css</param> @@ -291,7 +291,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updatePatientAttributeValueForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/patientAttributeValue.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTEVALUE_UPDATE</param> @@ -322,7 +322,7 @@ </result> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/selectPatient.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param> @@ -333,7 +333,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/patient.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param> @@ -355,7 +355,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/listPatient.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param> @@ -368,7 +368,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="listAll">true</param> <param name="page">/dhis-web-maintenance-patient/listPatient.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js,javascript/patient.js</param> @@ -404,7 +404,7 @@ <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addPatientForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js @@ -421,7 +421,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/updatePatientForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">285</param> <param name="javascripts"> ../dhis-web-commons/ouwt/ouwt.js @@ -482,7 +482,7 @@ <result name="enrollmentform" type="chain">enrollmentform </result> <result name="success" type="velocity">/main.vm</result> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="page">/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm</param> <param name="javascripts"> @@ -496,7 +496,7 @@ class="org.hisp.dhis.patient.action.patient.ProgramEnrollmentAction"> <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="page">/dhis-web-maintenance-patient/programEnrollmentForm.vm</param> <param name="javascripts"> @@ -521,7 +521,7 @@ class="org.hisp.dhis.patient.action.patient.SaveProgramEnrollmentAction"> <interceptor-ref name="organisationUnitTreeStack" /> <result name="success" type="velocity">/main.vm</result> - <param name="menu">/dhis-web-maintenance-patient/menuWithTree.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> <param name="menuTreeHeight">321</param> <param name="page">/dhis-web-maintenance-patient/programEnrollmentForm.vm</param> <param name="javascripts"> @@ -549,7 +549,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/program.js</param> </action> @@ -576,7 +576,7 @@ class="org.hisp.dhis.patient.action.program.ShowAddProgramFormAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addProgramForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/program.js</param> <param name="requiredAuthorities">F_PROGRAM_ADD</param> </action> @@ -585,7 +585,7 @@ class="org.hisp.dhis.patient.action.program.GetProgramAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updateProgramForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/program.js</param> <param name="requiredAuthorities">F_PROGRAM_UPDATE</param> </action> @@ -611,7 +611,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programAttribute.js</param> </action> @@ -654,7 +654,7 @@ class="org.hisp.dhis.patient.action.NoAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addProgramAttributeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programAttribute.js</param> <param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_ADD</param> </action> @@ -663,7 +663,7 @@ class="org.hisp.dhis.patient.action.program.GetProgramAttributeAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updateProgramAttributeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programAttribute.js</param> <param name="requiredAuthorities">F_PROGRAM_ATTRIBUTE_UPDATE</param> </action> @@ -718,7 +718,7 @@ class="org.hisp.dhis.patient.action.programstage.GetProgramStageListAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/programStageList.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> </action> <action name="getProgramStage" @@ -735,7 +735,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/addProgramStageForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programStage.js</param> <param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param> </action> @@ -766,7 +766,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/updateProgramStageForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programStage.js</param> <param name="requiredAuthorities">F_PROGRAMSTAGE_UPDATE</param> </action> @@ -783,7 +783,7 @@ class="org.hisp.dhis.patient.action.programstage.ShowSortProgramStageFormAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/sortProgramStageForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param> </action> @@ -844,7 +844,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttributeGroup.js</param> </action> @@ -873,7 +873,7 @@ class="org.hisp.dhis.patient.action.patientattribute.GetPatientAttributesWithdoutGroupAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttributeGroup.js</param> <param name="stylesheets">style/basic.css</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param> @@ -883,7 +883,7 @@ class="org.hisp.dhis.patient.action.patientattributegroup.GetPatientAttributeGroupAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientAttributeGroup.js</param> <param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param> </action> @@ -908,7 +908,7 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientIdentifierType.js</param> <param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_ADD</param> </action> @@ -926,8 +926,8 @@ <result name="success" type="velocity">/main.vm</result> <param name="page"> /dhis-web-maintenance-patient/updatePatientIdentifierType.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> - <param name="javascripts">javascript/patientIdentifierType.js </param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> + <param name="javascripts">javascript/patientIdentifierType.js</param> <param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_UPDATE</param> </action> @@ -936,7 +936,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/patientIdentifierType.js</param> </action> @@ -975,7 +975,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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/caseaggregation.js</param> </action> @@ -983,7 +983,7 @@ class="org.hisp.dhis.patient.action.caseaggregation.ShowCaseAggregationConditionFormAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addCaseAggregation.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/caseaggregation.js</param> </action> @@ -996,7 +996,7 @@ class="org.hisp.dhis.patient.action.caseaggregation.GetCaseAggregationConditionAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updateCaseAggregation.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/caseaggregation.js</param> </action> @@ -1049,14 +1049,14 @@ 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/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/validationcriteria.js</param> </action> <action name="showAddValidationCriteriaForm" class="org.hisp.dhis.patient.action.NoAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/addValidationCriteria.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/validationcriteria.js</param> <param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param> </action> @@ -1072,7 +1072,7 @@ class="org.hisp.dhis.patient.action.validation.GetValidationCriteriaAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/updateValidationCriteria.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/validationcriteria.js</param> <param name="requiredAuthorities">F_VALIDATIONCRITERIA_UPDATE</param> </action> @@ -1127,7 +1127,7 @@ class="org.hisp.dhis.patient.action.validation.GetProgramStageDEValidationListAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/programStageDataElementValidation.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenu.vm</param> <param name="javascripts">javascript/programStageDEValidation.js</param> </action> @@ -1149,7 +1149,7 @@ class="org.hisp.dhis.patient.action.configuration.GetPatientExcelItemplateFileAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/configurationParams.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param> <param name="javascripts">javascript/import.js</param> </action> @@ -1165,7 +1165,7 @@ class="org.hisp.dhis.patient.action.NoAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/importPatientParams.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param> <param name="javascripts">../dhis-web-commons/javascripts/ajaxfileupload.js, javascript/import.js</param> </action> @@ -1195,7 +1195,7 @@ class="org.hisp.dhis.patient.action.NoAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/importPatientResult.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/importMenu.vm</param> <param name="javascripts">../dhis-web-commons/javascripts/ajaxfileupload.js, javascript/import.js</param> </action> @@ -1205,7 +1205,7 @@ class="org.hisp.dhis.patient.action.mobilesetting.ShowMobileSettingFormAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-maintenance-patient/showPatientMobileSetting.vm</param> - <param name="menu">/dhis-web-maintenance-patient/menu.vm</param> + <param name="menu">/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm</param> </action> <action name="editPatientMobileSetting" === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/importMenu.vm 2010-12-09 08:20:18 +0000 @@ -0,0 +1,7 @@ +<a href="index.action"><h2>$i18n.getString( "import" )</h2></a> +<ul> + <li><a href="configuration.action">$i18n.getString( "configuration" )</a></li> + <li><a href="importPatientForm.action">$i18n.getString( "import_data" )</a></li> +</ul> + + === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 2010-12-09 08:20:18 +0000 @@ -0,0 +1,15 @@ +<a href="index.action"><h2>$i18n.getString( "paitents_and_programs" )</h2></a> +<ul> + <li><a href="patient.action">$i18n.getString( "patient" )</a></li> + <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="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( "case_aggregation_mapping" )</a></li> + <li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li> + <li><a href="patientMobileSetting.action">$i18n.getString( "patientMobileSetting" )</a></li> +</ul> + + === added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenuWithTree.vm 2010-12-09 08:20:18 +0000 @@ -0,0 +1,4 @@ + +#parse( "/dhis-web-maintenance-patient/patientAndProgramMenu.vm" ) + +#parse( "/dhis-web-commons/ouwt/orgunittree.vm" ) \ No newline at end of file
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
