dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8955
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-08 22:37:56 +0300
message:
  Improved interpretations
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm
  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/profile.vm


--
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/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-11-01 08:32:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2012-11-08 19:37:56 +0000
@@ -677,6 +677,26 @@
 /* jQuery overrides                                                           */
 /*----------------------------------------------------------------------------*/
 
+#updateProfileHeader
+{
+  display: inline-block;
+  font-size: 14pt;
+  color: #606060;
+  padding: 0 0 19px 0;
+}
+
+#updateProfileLink
+{
+  position: relative; 
+  top: -2px; 
+  display: inline-block; 
+  margin-left: 200px;
+}
+
+/*----------------------------------------------------------------------------*/
+/* jQuery overrides                                                           */
+/*----------------------------------------------------------------------------*/
+
 .ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button
 {
   font-family: LiberationSansRegular, arial, sans-serif !important;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-10-17 19:06:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-11-08 19:37:56 +0000
@@ -1,6 +1,7 @@
 <script type="text/javascript" src="../dhis-web-commons/javascripts/useraccount/updateUserProfileForm.js"></script>
 
-<h3>$encoder.htmlEncode( $userCredentials.user.getName() )</h3>
+<div id="updateProfileHeader">$encoder.htmlEncode( $userCredentials.user.getName() )</div>
+<div id="updateProfileLink"><a class="blueButtonLink" href="../dhis-web-dashboard-integration/profile.action">$i18n.getString( "view_profile" )</a></div>
 
 <form id="updateUserProfileForm" name="updateUserProfileForm" class="inputForm">
 <div><input type="hidden" id="id" name="id" value="$userCredentials.id"/></div>

=== 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-11-07 08:12:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-11-08 19:37:56 +0000
@@ -314,6 +314,7 @@
 server_date=Server date
 online_release_page=online release page
 edit_profile=Edit profile
+view_profile=View profile
 profile_details=Profile details
 job_title=Job title
 introduction=Introduction

=== 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-11-07 09:51:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-11-08 19:37:56 +0000
@@ -38,5 +38,11 @@
 </div>
 <div id="userInfoLink"><a class="bold" href="javascript:showFullProfile()">$i18n.getString( "view_full_profile" )</a></div>
 
-<div id="profileInterpretationHeader" class="bold">$i18n.getString( "latest_interpretations" )</div>
+<div id="profileInterpretationHeader">
+	<span class="bold">$i18n.getString( "latest_interpretations" )</span> |
+    <span>$i18n.getString( "share_your_own_interpretations_from" ) 
+    <a href="../dhis-web-visualizer/app/index.html">$i18n.getString( "data_visualizer" )</a>,
+    <a href="../dhis-web-mapping/app/index.html">$i18n.getString( "gis" )</a> or 
+    <a href="../dhis-web-reporting/displayManageTableForm.action">$i18n.getString( "report_table" )</a></span>
+</div>
 <div id="profileInterpretationFeed"></div>
\ No newline at end of file