dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8902
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-06 16:08:45 +0300
message:
  Including name of current user in dashboard
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-10-10 13:23:23 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-11-06 13:08:45 +0000
@@ -4,17 +4,16 @@
 var i18n_viewing = '$encoder.jsEscape( $i18n.getString( "viewing" ), "'")';
 </script>
 
-<h3>$i18n.getString( "dashboard" ) #openHelp( "dashboards_setup" )
-&#8226; <a href="showSendFeedback.action">$i18n.getString( "write_feedback" )</a>
-#if( $messageCount > 0 )&#8226; <a href="message.action">$messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end</a> #end
-
-&#8226; #if( $interpretationCount > 0 )<a href="interpretation.action">$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end</a> 
+<h3><a href="profile.action"><img src="../images/user_small.png"></a> &nbsp;<a href="profile.action">$encoder.htmlEncode( $currentUser.name )</a>
+&nbsp;&#8226;&nbsp; <a href="showSendFeedback.action">$i18n.getString( "write_feedback" )</a>
+#if( $messageCount > 0 )&nbsp;&#8226;&nbsp; <a href="message.action">$messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end</a> #end
+&nbsp;&#8226;&nbsp; #if( $interpretationCount > 0 )<a href="interpretation.action">$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end</a> 
 #else<span id="shareHelpLink" onclick="showShareHelp()">$i18n.getString( "share_interpretation" )</span>#end
 </h3>
 
 <div id="dashboardMenu" class="horizontalMenu">
 	<ul>
-        <li><a class="greyButtonLink" href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )</a></li>
+        <li><a class="greyButtonLink" href="profile.action">$i18n.getString( "profile" )</a></li>
 		<li><a class="greyButtonLink" href="message.action">$i18n.getString( "messages" )</a></li>
 		<li><a class="greyButtonLink" href="interpretation.action">$i18n.getString( "interpretations" )</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-11-06 12:30:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-11-06 13:08:45 +0000
@@ -109,8 +109,8 @@
 {
   position: absolute;
   margin-top: 29px;
-  left: 330px;
-  width: 362px;
+  left: 331px;
+  width: 347px;
   border-right: 1px solid #bbb;
   border-bottom: 1px solid #bbb;
   border-left: 1px solid #bbb;