dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21524: Maintenance app in menu

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 24 Dec 2015 00:22:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 21524
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-24 01:21:36 +0100
message:
  Maintenance app in menu
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html


--
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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-12-09 17:24:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-12-24 00:21:36 +0000
@@ -37,6 +37,7 @@
 
 #-- Modules --------------------------------------------------------------------#
 
+dhis-web-maintenance=Data Elements / Indicators
 dhis-web-maintenance-datadictionary=Data Elements / Indicators
 dhis-web-maintenance-dataset=Data Sets
 dhis-web-maintenance-organisationunit=Organisation Units

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2015-10-15 14:07:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml	2015-12-24 00:21:36 +0000
@@ -72,7 +72,13 @@
 
 	<package name="dhis-web-settings" extends="dhis-web-commons" namespace="/dhis-web-settings">
 		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
-			<result name="success" type="redirect">index.html</result>
+			<result name="success" type="redirect">#</result>
+		</action>
+	</package>
+    
+	<package name="dhis-web-maintenance" extends="dhis-web-commons" namespace="/dhis-web-maintenance">
+		<action name="index" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="redirect">#</result>
 		</action>
 	</package>
     

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html	2015-10-15 14:07:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html	2015-12-24 00:21:36 +0000
@@ -3,7 +3,6 @@
 <body>
 	<h3>Apps</h3>
     <ul>
-    	<li><a href="../dhis-web-settings/index.html">dhis-web-settings</a></li>
         <li><a href="../dhis-web-pivot/index.html">dhis-web-pivot</a></li>
         <li><a href="../dhis-web-visualizer/index.html">dhis-web-visualizer</a></li>
         <li><a href="../dhis-web-mapping/index.html">dhis-web-mapping</a></li>