dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19458
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8490: Moved dashboard menu to commons-resources so it can be used for profile/account
------------------------------------------------------------
revno: 8490
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-11 18:02:00 +0200
message:
Moved dashboard menu to commons-resources so it can be used for profile/account
removed:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menu.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js
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/resources/struts.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.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
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menu.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menu.vm 2012-03-05 13:21:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menu.vm 2012-10-11 16:02:00 +0000
@@ -12,6 +12,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>
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm 2012-10-11 16:02:00 +0000
@@ -0,0 +1,21 @@
+
+#if ( $keyFlag )
+<img src="../dhis-web-commons/flags/${keyFlagImage}" onclick="window.location.href='../${startModule}/index.action'"
+ style="margin-top: 16px; margin-left: 16px; border: 1px solid #D0D0D0; border-radius: 2px; cursor: pointer;" title="$i18n.getString( 'view_home_page' )">
+#end
+
+<h2>$i18n.getString( "dashboard" ) </h2>
+
+<ul>
+ <li><a href="../dhis-web-dashboard-integration/index.action">$i18n.getString( "dashboard" ) </a></li>
+ <li><a href="../dhis-web-dashboard-integration/profile.action?id=${currentUser.uid}">$i18n.getString( "profile" ) </a></li>
+ <li><a href="../dhis-web-dashboard-integration/message.action">$i18n.getString( "messages" ) </a></li>
+ <li><a href="../dhis-web-dashboard-integration/interpretation.action">$i18n.getString( "interpretations" ) </a></li>
+</ul>
+
+<h2>$i18n.getString( "dhis2_online" ) </h2>
+
+<ul>
+ <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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js 2012-02-24 09:02:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js 2012-10-11 16:02:00 +0000
@@ -35,6 +35,6 @@
, function( xmlObject )
{
xmlObject = xmlObject.getElementsByTagName( 'message' )[0];
- setMessage( xmlObject.firstChild.nodeValue );
+ setHeaderDelayMessage( xmlObject.firstChild.nodeValue );
} );
}
=== 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 15:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2012-10-11 16:02:00 +0000
@@ -850,11 +850,13 @@
<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>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
</action>
<action name="showUpdateUserProfileForm" class="org.hisp.dhis.useraccount.action.GetCurrentUserAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-commons/useraccount/updateUserProfileForm.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
</action>
<action name="updateUserAccount" class="org.hisp.dhis.useraccount.action.UpdateUserAccountAction">
=== 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 15:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-11 16:02:00 +0000
@@ -333,6 +333,10 @@
india=India
vietnam=Vietnam
settings_updated=Settings were updated
+dashboard=Dashboard
+messages=Messages
+interpretations=Interpretations
+
#-- Change Log------------------------------------------------------------------#
@@ -376,7 +380,7 @@
phone_number=Mobile phone number
organisation_units=Organisation units
user_roles=User roles
-update_user_success=Updated information successfully
+update_user_success=Account was updated
wrong_password=Wrong password
help_center=Help Center
help_intro_header=Welcome to the DHIS 2 Help Center
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-10-06 12:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-10-11 16:02:00 +0000
@@ -58,7 +58,7 @@
<action name="message" class="org.hisp.dhis.dashboard.message.action.GetMessagesAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/message.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">javascript/message.js</param>
<param name="stylesheets">style/dashboard.css</param>
</action>
@@ -80,7 +80,7 @@
<action name="showSendMessage" class="org.hisp.dhis.dashboard.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/sendMessage.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js,../dhis-web-commons/select2/select2.min.js</param>
<param name="stylesheets">style/dashboard.css,../dhis-web-commons/select2/select2.css</param>
<param name="requiredAuthorities">F_SEND_MESSAGE</param>
@@ -89,7 +89,7 @@
<action name="showSendFeedback" class="org.hisp.dhis.dashboard.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/sendFeedback.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js</param>
<param name="stylesheets">style/dashboard.css</param>
</action>
@@ -97,7 +97,7 @@
<action name="readMessage" class="org.hisp.dhis.dashboard.message.action.ReadMessageAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/readMessage.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">javascript/message.js</param>
<param name="stylesheets">style/dashboard.css</param>
</action>
@@ -133,7 +133,7 @@
<action name="interpretation" class="org.hisp.dhis.dashboard.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/interpretation.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="javascripts">javascript/interpretation.js</param>
<param name="stylesheets">style/dashboard.css</param>
</action>
@@ -147,7 +147,7 @@
<action name="profile" class="org.hisp.dhis.dashboard.profile.action.GetUserAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/profile.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
<param name="stylesheets">style/dashboard.css</param>
</action>
=== removed 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-11 15:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-
-#if ( $keyFlag )
-<img src="../dhis-web-commons/flags/${keyFlagImage}" onclick="window.location.href='../${startModule}/index.action'"
- style="margin-top: 16px; margin-left: 16px; border: 1px solid #D0D0D0; border-radius: 2px; cursor: pointer;" title="$i18n.getString( 'go_to_home_page' )">
-#end
-
-<h2>$i18n.getString( "dashboard" ) </h2>
-
-<ul>
- <li><a href="index.action">$i18n.getString( "dashboard" ) </a></li>
- <li><a href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" ) </a></li>
- <li><a href="message.action">$i18n.getString( "messages" ) </a></li>
- <li><a href="interpretation.action">$i18n.getString( "interpretations" ) </a></li>
-</ul>
-
-<h2>$i18n.getString( "dhis2_online" ) </h2>
-
-<ul>
- <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/profile.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm 2012-10-08 13:29:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm 2012-10-11 16:02:00 +0000
@@ -18,7 +18,7 @@
<div class="userRow"><div class="userLabel">$i18n.getString( "interested_in" )</div><div class="userValue">$!encoder.htmlEncode( $user.jobTitle )</div></div>
<div class="userRow"><div class="userLabel">$i18n.getString( "speaks" )</div><div class="userValue">$!encoder.htmlEncode( $user.languages )</div></div>
<div class="userRow"><div class="userLabel">$i18n.getString( "birthday" )</div><div class="userValue">$!format.formatDate( $user.birthday )</div></div>
-<div class="userRow"><div class="userLabel">$i18n.getString( "gender" )</div><div class="userValue">$!encoder.htmlEncode( $user.gender )</div></div>
+<div class="userRow"><div class="userLabel">$i18n.getString( "gender" )</div><div class="userValue">$!i18n.getString( $user.gender )</div></div>
<div class="userRow"><div class="userLabel">$i18n.getString( "nationality" )</div><div class="userValue">$!encoder.htmlEncode( $user.nationality )</div></div>
<div class="userRow"><div class="userLabel">$i18n.getString( "email" )</div><div class="userValue">$!encoder.htmlEncode( $user.email )</div></div>
<div class="userRow"><div class="userLabel">$i18n.getString( "phone_number" )</div><div class="userValue">$!encoder.htmlEncode( $user.phoneNumber )</div></div>
=== 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-11 15:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-11 16:02:00 +0000
@@ -314,7 +314,7 @@
{
width: 590px;
border-bottom: 1px solid #ccc;
- padding: 22px 10px 20px 10px;
+ padding: 24px 10px 24px 10px;
}
.interpretation
