dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12799
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-22 19:26:04 +0200
message:
  Removed supportive software page
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.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

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm	2012-10-11 16:23:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-
-<h3>$i18n.getString( "supportive_software" )</h3>
-
-<dl>
-	<dt>$i18n.getString( "web_browser" )</dt>
-	<dd><a href="http://www.google.com/chrome"; target="blank">Google Chrome</a> - $i18n.getString( "chrome_description" )</dd>
-	
-	<dt>$i18n.getString( "pdf_reader" )</dt>
-	<dd><a href="http://www.foxitsoftware.com/pdf/reader/addons.php"; target="blank">Foxit Reader</a> - $i18n.getString( "foxit_description" )</dd>
-	
-	<dt>$i18n.getString( "report_designer" )</dt>
-	<dd><a href="http://jasperforge.org/projects/ireport"; target="blank">iReport</a> - $i18n.getString( "ireport_description" )</dd>
-	
-	<dt>$i18n.getString( "my_datamart" )</dt>
-	<dd><a href="http://dhis2.org/downloads#mydatamart"; target="blank">MyDatamart</a> - $i18n.getString( "my_datamart_description" )</dd>
-	
-	<dt>$i18n.getString( "mobile_client" )</dt>
-	<dd><a href="http://dhis2.org/downloads#mobileclient"; target="blank">Mobile client</a> - $i18n.getString( "mobile_client_description" )</dd>
-</dl>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-10-09 17:31:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-10-22 17:26:04 +0000
@@ -102,8 +102,6 @@
       <div id="menuDropDown3" class="menuDropDownArea">
       <ul class="menuDropDownBox">
         <li><a href="../dhis-web-commons-about/help.action">$i18n.getString( "help_center" )&nbsp;</a></li>
-        <li><a href="../dhis-web-commons-about/software.action">$i18n.getString( "supportive_software" )&nbsp;</a></li>
-        <li><a href="../dhis-web-commons-about/modules.action">$i18n.getString( "system_overview" )&nbsp;</a></li>
         <li><a href="../api">$i18n.getString( "web_api" )&nbsp;</a></li>
         <li><a href="../dhis-web-commons-about/about.action">$i18n.getString( "about_dhis2" )&nbsp;</a></li>
       </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2013-10-16 17:46:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2013-10-22 17:26:04 +0000
@@ -862,12 +862,6 @@
       <result name="success" type="outputStreamResult"></result>
     </action>
 
-    <action name="software" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/about/software.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-    </action>
-
     <action name="showUpdateUserAccountForm" class="org.hisp.dhis.useraccount.action.GetCurrentUserAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-commons/useraccount/updateUserAccountForm.vm</param>