dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19457
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8489: Removed change log page, not useful
------------------------------------------------------------
revno: 8489
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-11 17:06:54 +0200
message:
Removed change log page, not useful
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.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
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
--
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/changeLog.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm 2012-10-08 17:17:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/changeLog.vm 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-
-<h3>$i18n.getString( "change_log" )</h3>
-
-<dl>
- <dt>$i18n.getString( "release" ) 2.9:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.9"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.8:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.8"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.7:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.7"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.6:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.6"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.5:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.5"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.4:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.4"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.3:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.3"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.2:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.2"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.1:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.1"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.6:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.6"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.5:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.5"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.4:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.4"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.3:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.3"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.2:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.2"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
- <dt>$i18n.getString( "release" ) 2.0.1:</dt>
- <dd><a href="https://blueprints.launchpad.net/dhis2/+milestone/2.0.1"; target="_blank">Launchpad $i18n.getString( "online_release_page" )</a></dd>
-</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
=== 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 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2012-10-11 15:06:54 +0000
@@ -30,11 +30,6 @@
window.location.href = currentPath + "help.action" + backURL;
});
- $( "#menuDropDownChangeLog" ).click( function()
- {
- window.location.href = currentPath + "displayChangeLog.action" + backURL;
- } );
-
$( "#menuDropDownSupportiveSoftware" ).click( function()
{
window.location.href= currentPath + "displaySupportiveSoftware.action" + backURL;
@@ -45,11 +40,6 @@
window.location.href = currentPath + "modules.action" + backURL;
} );
- $( "#menuDropDownWebApi" ).click( function()
- {
- window.location.href = "../api";
- } );
-
$( "#menuDropDownAboutDHIS2" ).click( function()
{
window.location.href = currentPath + "about.action" + backURL;
=== 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 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-10-11 15:06:54 +0000
@@ -99,10 +99,9 @@
<div id="menuDropDown3" class="menuDropDownArea">
<ul class="menuDropDownBox">
<li><a id="menuDropDownHelpCenter">$i18n.getString( "help_center" ) </a></li>
- <li><a id="menuDropDownChangeLog">$i18n.getString( "change_log" ) </a></li>
<li><a id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" ) </a></li>
<li><a id="menuDropDownModuleOverview">$i18n.getString( "system_overview" ) </a></li>
- <li><a id="menuDropDownWebApi">$i18n.getString( "web_api" ) </a></li>
+ <li><a href="../api">$i18n.getString( "web_api" ) </a></li>
<li><a id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" ) </a></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 2012-10-08 07:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2012-10-11 15:06:54 +0000
@@ -841,12 +841,6 @@
<result name="success" type="outputStreamResult"></result>
</action>
- <action name="displayChangeLog" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-commons/about/changeLog.vm</param>
- <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>
=== 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 2012-10-11 14:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-11 15:06:54 +0000
@@ -261,9 +261,8 @@
not_set=Not set
current_user=Current user
dhis2_online=DHIS 2 Online
-hisp_homepage=HISP Homepage
-dhis2_home_page=DHIS 2 Homepage
-dhis2_issue_tracking=DHIS 2 Issue Tracking
+home_page=Home Page
+launchpad_site=Launchpad Site
message_to_the_dhis2_development_team=Message to the DHIS 2 development team
error_message_stack_trace=Error message / Stack trace
enter_message=Enter a message
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2012-10-07 16:21:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2012-10-11 15:06:54 +0000
@@ -16,6 +16,6 @@
<h2>$i18n.getString( "dhis2_online" ) </h2>
<ul>
- <li><a href="http://dhis2.org"; target="_blank">$i18n.getString( "dhis2_home_page" ) </a></li>
- <li><a href="https://launchpad.net/dhis2"; target="_blank">$i18n.getString( "dhis2_issue_tracking" ) </a></li>
+ <li><a href="http://dhis2.org"; target="_blank">$i18n.getString( "home_page" ) </a></li>
+ <li><a href="https://launchpad.net/dhis2"; target="_blank">$i18n.getString( "launchpad_site" ) </a></li>
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-08 13:29:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-11 15:06:54 +0000
@@ -108,12 +108,12 @@
{
padding: 6px 12px;
height: 25px;
- border: 1px solid #2f73d8;
+ border: 1px solid #3F79B4;
border-radius: 3px;
margin-right: 4px;
font-family: LiberationSansBold, arial;
font-size: 13px;
- background-color: #4685dd;
+ background-color: #427DB8;
color: #fff !important;
text-decoration: none !important;
}
@@ -121,7 +121,7 @@
.blueButtonLink:hover
{
text-decoration: none;
- background-color: #3f7fd3;
+ background-color: #3674B3;
}
#searchDiv
