=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-07-07 12:09:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-07-27 12:38:08 +0000 @@ -44,7 +44,7 @@ a:visited { - color:#3567cd; + color: #3567cd; } /*----------------------------------------------------------------------------*/ === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-06-04 12:52:49 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-07-27 12:38:08 +0000 @@ -50,4 +50,8 @@ write_your_interpretation=Write your interpretation share_your_interpretation_of=Share your interpretation of interpretation_was_shared=Interpretation was shared -viewing=Viewing \ No newline at end of file +viewing=Viewing +from=From +load_favorite_click_share=load a favorite and click 'Share' on the top menu +generate_report_table_click_share=generate a report table and click 'Share' on the top menu +share_interpretation=Share interpretation \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js 2012-06-04 12:52:49 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js 2012-07-27 12:38:08 +0000 @@ -99,3 +99,13 @@ } ); } } + +function showShareHelp() +{ + $( "#shareHelpForm" ).dialog( { + modal: true, + width: 380, + resizable: false, + title: "Share your data interpretations" + } ); +} === 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-06-04 12:52:49 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-07-27 12:38:08 +0000 @@ -7,11 +7,13 @@

$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 #end + +• #if( $interpretationCount > 0 )$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end +#else$i18n.getString( "share_interpretation" )#end

@@ -25,3 +27,10 @@ + +
+ +
\ No newline at end of file === 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-07-13 21:24:31 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-07-27 12:38:08 +0000 @@ -107,6 +107,29 @@ display: none; } +#shareHelpForm +{ + display: none; + padding: 5px 35px 5px 35px; +} + +#shareHelpForm li +{ + margin-bottom: 10px; +} + +#shareHelpForm a +{ + color: #3567cd; + outline: none; +} + +#shareHelpLink +{ + color: #3567cd; + cursor: pointer; +} + #chartView { display: none;