dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8291
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-27 19:46:32 +0700
message:
  minor fixes
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/inbox.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.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-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-09-27 09:38:59 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-09-27 12:46:32 +0000
@@ -37,7 +37,13 @@
 @Controller
 public class MobileController
 {
-    @RequestMapping
+    @RequestMapping( value = "/dhis-web-mobile" )
+    public String base()
+    {
+        return "redirect:dhis-web-mobile/index";
+    }
+
+    @RequestMapping( value = "/index" )
     public String index( Model model )
     {
         model.addAttribute( "page", "index.vm" );

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/inbox.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/inbox.vm	2012-09-27 09:38:59 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/inbox.vm	2012-09-27 12:46:32 +0000
@@ -3,7 +3,7 @@
 
 	<header data-role="header" data-theme="b">
 		<div align="center"><img src="../dhis-web-commons/css/light_blue/logo_banner.png" /></div>
-        <a href="../dhis-web-mobile" data-icon="back">Back</a>
+        <a href="index" data-icon="back">Back</a>
 	</header>
 
 	<section data-role="content">

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-09-27 09:38:59 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-09-27 12:46:32 +0000
@@ -21,8 +21,8 @@
 
 	<section data-role="content">
         <ul data-role="listview" data-inset="true">
-            <li id="inbox"><a href="dhis-web-mobile/inbox">Inbox</a></li>
-            <li id="settings"><a href="dhis-web-mobile/settings">Settings</a></li>
+            <li id="inbox"><a href="inbox">Inbox</a></li>
+            <li id="settings"><a href="settings">Settings</a></li>
         </ul>
 	</section>
 

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-09-27 09:38:59 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm	2012-09-27 12:46:32 +0000
@@ -41,7 +41,7 @@
 
 	<header data-role="header" data-theme="b">
 		<div align="center"><img src="../dhis-web-commons/css/light_blue/logo_banner.png" /></div>
-        <a href="../dhis-web-mobile" data-icon="back">Back</a>
+        <a href="index" data-icon="back">Back</a>
 	</header>
 
     <section data-role="content">

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml	2012-09-12 05:58:51 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml	2012-09-27 12:46:32 +0000
@@ -14,7 +14,7 @@
     <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
     <init-param>
       <param-name>redirectPath</param-name>
-      <param-value>dhis-web-mobile/</param-value>
+      <param-value>dhis-web-mobile/index</param-value>
     </init-param>
   </filter>
   <filter>