=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-05-23 13:55:43 +0000
@@ -87,14 +87,14 @@
/dhis-web-light/main.vm
- /dhis-web-light/selectNamebasedOrganisationUnits.vm
+ /dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm
/dhis-web-light/main.vm
- /dhis-web-light/selectActivityType.vm
+ /dhis-web-light/namebased/selectActivityType.vm
/dhis-web-light/main.vm
- /dhis-web-light/selectActivity.vm
+ /dhis-web-light/namebased/selectActivity.vm
/dhis-web-light/main.vm
- /dhis-web-light/programStageForm.vm
+ /dhis-web-light/namebased/programStageForm.vm
/mobile/showPatientProgramStageList.action?patientId=${beneficiaryId}&programInstanceId=${programInstanceId}&programId=${programId}&validated=true
/dhis-web-light/main.vm
- /dhis-web-light/programStageForm.vm
+ /dhis-web-light/namebased/programStageForm.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiaryDetail.vm
+ /dhis-web-light/namebased/beneficiaryDetail.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiaryDetail.vm
+ /dhis-web-light/namebased/beneficiaryDetail.vm
showPatientProgramList.action?patientId=${beneficiaryId}
@@ -189,7 +189,7 @@
/dhis-web-light/main.vm
- /dhis-web-light/selectRegistrationOrganisationUnits.vm
+ /dhis-web-light/registration/selectRegistrationOrganisationUnits.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiaryRegistrationForm.vm
+ /dhis-web-light/registration/beneficiaryRegistrationForm.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiaryRegistrationForm.vm
+ /dhis-web-light/registration/beneficiaryRegistrationForm.vm
@@ -215,7 +215,7 @@
/dhis-web-light/main.vm
- /dhis-web-light/selectEnrollmentOrganisationUnits.vm
+ /dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiarySearchingForm.vm
+ /dhis-web-light/enrollment/beneficiarySearchingForm.vm
/dhis-web-light/main.vm
- /dhis-web-light/beneficiarySearchResult.vm
+ /dhis-web-light/enrollment/beneficiarySearchResult.vm
/dhis-web-light/main.vm
- /dhis-web-light/enrollmentProgramList.vm
+ /dhis-web-light/enrollment/enrollmentProgramList.vm
/dhis-web-light/main.vm
- /dhis-web-light/programEnrollmentForm.vm
+ /dhis-web-light/enrollment/programEnrollmentForm.vm
/mobile/selectEnrollmentProgram.action?beneficiaryId=${beneficiaryId}&validated=true
/dhis-web-light/main.vm
- /dhis-web-light/programEnrollmentForm.vm
+ /dhis-web-light/enrollment/programEnrollmentForm.vm
@@ -261,21 +261,21 @@
class="org.hisp.dhis.light.singleevent.action.GetSingleEventAction">
/dhis-web-light/main.vm
- /dhis-web-light/selectSingleEvent.vm
+ /dhis-web-light/singleevent/selectSingleEvent.vm
/dhis-web-light/main.vm
- /dhis-web-light/selectSingleEventBeneficiary.vm
+ /dhis-web-light/registration/selectSingleEventBeneficiary.vm
/dhis-web-light/main.vm
- /dhis-web-light/singleEventForm.vm
+ /dhis-web-light/singleevent/singleEventForm.vm
/mobile/selectSingleEventBeneficiary.action?programId=${programId}&organisationUnitId=${organisationUnitId}&validated=true
/dhis-web-light/main.vm
- /dhis-web-light/singleEventForm.vm
+ /dhis-web-light/singleevent/singleEventForm.vm
=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm 2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryDetail.vm 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-
$i18n.getString("details_for") $!encoder.htmlEncode( ${patient.getFullName()} )
-
-
-
- - $i18n.getString("id"): $patient.id
- - $i18n.getString("gender"): #if ($patient.gender == "F") Female #else Male #end
- #set($day = $patient.birthDate.date)
- #set($month = $patient.birthDate.month+1)
- #set($year = $patient.birthDate.year + 1900)
- - $i18n.getString("date_of_birth"): $year - $month - $day
- - $i18n.getString("blood_group"): $patient.bloodGroup
-
-
-
-