------------------------------------------------------------ revno: 8491 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Thu 2012-10-11 18:23:03 +0200 message: Removed back button from about pages modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 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/main.js dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java 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
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2012-02-27 14:53:31 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2012-10-11 16:23:03 +0000 @@ -20,6 +20,4 @@ <dt>$i18n.getString( "os_version" ):</dt><dd>$systemProperties.get( "os.version" )</dd> <dt>$i18n.getString( "server_date" ):</dt><dd>$format.formatDateTime( $serverDate )</dd> #end -</dl> -<br/> -<div><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:140px"/></div> \ No newline at end of file +</dl> \ No newline at end of file === modified 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 2011-08-12 11:35:39 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm 2012-10-11 16:23:03 +0000 @@ -17,5 +17,3 @@ <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> - -<div><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:140px"/></div> \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2012-10-11 15:06:54 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2012-10-11 16:23:03 +0000 @@ -19,32 +19,7 @@ { $( this ).attr( "src", "../images/hide.png" ); } ); - - // Set dynamic back URLs for about page links - - var currentPath = '../dhis-web-commons-about/'; - var backURL = '?backUrl=' + window.location; - - $( "#menuDropDownHelpCenter" ).click( function() - { - window.location.href = currentPath + "help.action" + backURL; - }); - - $( "#menuDropDownSupportiveSoftware" ).click( function() - { - window.location.href= currentPath + "displaySupportiveSoftware.action" + backURL; - } ); - - $( "#menuDropDownModuleOverview" ).click( function() - { - window.location.href = currentPath + "modules.action" + backURL; - } ); - - $( "#menuDropDownAboutDHIS2" ).click( function() - { - window.location.href = currentPath + "about.action" + backURL; - } ); - + // Set show and hide drop down events on top menu $( "#menuLink1" ).hover( function() === 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 2012-10-11 15:06:54 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-10-11 16:23:03 +0000 @@ -98,11 +98,11 @@ <div id="menuDropDown3" class="menuDropDownArea"> <ul class="menuDropDownBox"> - <li><a id="menuDropDownHelpCenter">$i18n.getString( "help_center" ) </a></li> - <li><a id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" ) </a></li> - <li><a id="menuDropDownModuleOverview">$i18n.getString( "system_overview" ) </a></li> + <li><a href="../dhis-web-commons-about/help.action">$i18n.getString( "help_center" ) </a></li> + <li><a href="../dhis-web-commons-about/software.action">$i18n.getString( "supportive_software" ) </a></li> + <li><a href="../dhis-web-commons-about/modules.action">$i18n.getString( "system_overview" ) </a></li> <li><a href="../api">$i18n.getString( "web_api" ) </a></li> - <li><a id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" ) </a></li> + <li><a href="../dhis-web-commons-about/about.action">$i18n.getString( "about_dhis2" ) </a></li> </ul> </div> === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2012-03-30 12:49:52 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2012-10-11 16:23:03 +0000 @@ -144,19 +144,7 @@ { return javaOpts; } - - private String backUrl; - - public String getBackUrl() - { - return backUrl; - } - - public void setBackUrl( String backUrl ) - { - this.backUrl = backUrl; - } - + private Properties systemProperties; public Properties getSystemProperties() === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java 2012-10-11 16:23:03 +0000 @@ -35,24 +35,6 @@ public class NoAction implements Action { - // TODO remove not required with struts2 - - // ------------------------------------------------------------------------- - // Input & Output - // ------------------------------------------------------------------------- - - private String backUrl; - - public String getBackUrl() - { - return backUrl; - } - - public void setBackUrl( String backUrl ) - { - this.backUrl = backUrl; - } - // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- === 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 2012-10-11 16:02:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2012-10-11 16:23:03 +0000 @@ -841,7 +841,7 @@ <result name="success" type="outputStreamResult"></result> </action> - <action name="displaySupportiveSoftware" class="org.hisp.dhis.commons.action.NoAction"> + <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>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
