=== 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" ), "'")'; -

$i18n.getString( "dashboard" ) #openHelp( "dashboards_setup" ) -• $i18n.getString( "write_feedback" ) -#if( $messageCount > 0 )• $messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end #end - -• #if( $interpretationCount > 0 )$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end +

 $encoder.htmlEncode( $currentUser.name ) + •  $i18n.getString( "write_feedback" ) +#if( $messageCount > 0 ) •  $messageCount #if( $messageCount > 1 )$i18n.getString( "unread_messages" )#else$i18n.getString( "unread_message" )#end #end + •  #if( $interpretationCount > 0 )$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end #else$i18n.getString( "share_interpretation" )#end

=== 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;