------------------------------------------------------------ revno: 2783 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Mon 2011-01-31 09:47:19 +0100 message: Added about page for supportive software like recommended browser and PDF reader added: 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.js 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 dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
-- 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
=== added 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 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm 2011-01-31 08:47:19 +0000 @@ -0,0 +1,12 @@ + +<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> +</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 2011-01-11 16:52:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2011-01-31 08:47:19 +0000 @@ -86,6 +86,12 @@ window.location.href = currentPath + 'displayChangeLog.action' + backURL; }); + $( "#menuDropDownSupportiveSoftware" ).click( + function() + { + window.location.href= currentPath + 'displaySupportiveSoftware.action' + backURL; + }); + $( "#menuDropDownUserAccount" ).click( 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 2011-01-17 14:26:28 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-01-31 08:47:19 +0000 @@ -93,11 +93,12 @@ <div id="menuDropDown3" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()"> <ul class="menuDropDownBox"> - <li class="menuDropDownItem" id="menuDropDownHelpCenter" >$i18n.getString( "help_center" ) </li> - <li class="menuDropDownItem" id="menuDropDownFeedBack" >$i18n.getString( "feedback" ) </li> - <li class="menuDropDownItem" id="menuDropDownChangeLog" >$i18n.getString( "change_log" ) </li> - <li class="menuDropDownItem" id="menuDropDownUserAccount" >$i18n.getString( "user_account" ) </li> - <li class="menuDropDownItem" id="menuDropDownAboutDHIS2" >$i18n.getString( "about_dhis2" ) </li> + <li class="menuDropDownItem" id="menuDropDownHelpCenter">$i18n.getString( "help_center" ) </li> + <li class="menuDropDownItem" id="menuDropDownFeedBack">$i18n.getString( "feedback" ) </li> + <li class="menuDropDownItem" id="menuDropDownChangeLog">$i18n.getString( "change_log" ) </li> + <li class="menuDropDownItem" id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" ) </li> + <li class="menuDropDownItem" id="menuDropDownUserAccount">$i18n.getString( "user_account" ) </li> + <li class="menuDropDownItem" id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" ) </li> </ul> </div> === 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 2011-01-25 09:03:44 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-01-31 08:47:19 +0000 @@ -655,6 +655,12 @@ <param name="menu">/dhis-web-commons/about/menu.vm</param> </action> + <action name="displaySupportiveSoftware" 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> === 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-01-27 17:44:40 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2011-01-31 08:47:19 +0000 @@ -54,7 +54,6 @@ dhis-web-importexport = Import-Export dhis-web-datamart = Data Mart dhis-web-validationrule = Data Quality -#dhis-web-dashboard = Dashboard dhis-web-dashboard = Data Analyser dhis-web-gis = GIS dhis-web-reporting = Reports @@ -259,6 +258,11 @@ os_name = OS name os_architecture = OS architecture os_version = OS version +supportive_software = Supportive Software +chrome_description = Super fast web browser for all platforms +foxit_description = Free and simple PDF reader for Windows +web_browser = Web browser +pdf_reader = PDF reader #-- Change Log------------------------------------------------------------------#
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
