dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4910: made dhis-web-light module available as /mobile

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 12 Oct 2011 13:16:18 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4910
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-12 15:13:14 +0200
message:
  made dhis-web-light module available as /mobile
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.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/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-09-26 14:31:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-10-12 13:13:14 +0000
@@ -57,7 +57,7 @@
 dhis-web-dashboard = Data Analyser
 dhis-web-gis = GIS
 dhis-web-reporting = Reports
-dhis-web-light = Light
+dhis-web-light = Mobile
 dhis-web-openhealth-integration = Data analysis
 dhis-web-integration = NHRM Integration
 dhis-web-reports = NRHM Reports

=== 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	2011-10-11 17:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2011-10-12 13:13:14 +0000
@@ -5,7 +5,7 @@
 <struts>
   <include file="dhis-web-commons.xml" />
 
-  <package name="dhis-web-light" extends="dhis-web-commons" namespace="/dhis-web-light">
+  <package name="dhis-web-light" extends="dhis-web-commons" namespace="/mobile">
 
     <action name="index" class="org.hisp.dhis.light.action.NoAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
@@ -35,7 +35,7 @@
     </action>
 
     <action name="saveSectionForm" class="org.hisp.dhis.light.dataentry.action.SaveSectionFormAction">
-      <result name="success" type="redirect">/dhis-web-light/selectPeriod.action</result>
+      <result name="success" type="redirect">/mobile/selectPeriod.action</result>
       <result name="error" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/dataEntry.vm</param>
       <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml	2011-03-24 19:34:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml	2011-10-12 13:13:14 +0000
@@ -18,7 +18,7 @@
     <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
     <init-param>
       <param-name>redirectPath</param-name>
-      <param-value>dhis-web-light/index.action</param-value>
+      <param-value>mobile/index.action</param-value>
     </init-param>
   </filter>
   <filter>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-10-11 17:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm	2011-10-12 13:13:14 +0000
@@ -3,7 +3,7 @@
 <head>
 <title>$i18n.getString("DHIS_2")</title>
 <meta name="viewport" content="width=device-width, user-scalable=yes" />
-<link rel="stylesheet" href="style/light.css" />
+<link rel="stylesheet" href="/dhis-web-light/style/light.css" />
 </head>
 
 <body>
@@ -19,9 +19,4 @@
 #parse( $page )
 
 </div>
-
-
-
-
 </body>
-

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-10-11 17:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-10-12 13:13:14 +0000
@@ -9,9 +9,10 @@
     </ul>
 </p>
 
-
 <div id="footer">
+
 <ul>
-		<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString("logout")</a></li>
-	</ul>
-</div>
\ No newline at end of file
+	<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString("logout")</a></li>
+</ul>
+
+</div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2011-10-11 17:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2011-10-12 13:13:14 +0000
@@ -6,7 +6,7 @@
 		#foreach( $period in $periods )
 		<li>
 			<a href="dataEntry.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$period.getExternalId()">$!encoder.jsonEncode( ${period.name} )</a>
-			#if( $periodCompletedMap.get($period) )<img src="images/check.jpg" />#end
+			#if( $periodCompletedMap.get($period) )<img src="/dhis-web-light/images/check.jpg" />#end
 		</li>
 		#end
 	</ul>