dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7743
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-07-27 14:38:08 +0200
message:
  Added informational dialog on how to share interpretations in dashboard
modified:
  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-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  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/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-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 @@
 <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
-#if( $interpretationCount > 0 )&#8226; <a href="interpretation.action">$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#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> 
+#else<span id="shareHelpLink" onclick="showShareHelp()">$i18n.getString( "share_interpretation" )</span>#end
 </h3>
 
 <div id="subMenu">
-	<ul><li><a href="message.action">Messages</a></li><li><a href="interpretation.action">Interpretations</a></li></ul>
+	<ul><li><a href="message.action">$i18n.getString( "messages" )</a></li><li><a href="interpretation.action">$i18n.getString( "interpretations" )</a></li></ul>
 </div>
 
 <div id="contentDiv"></div>
@@ -25,3 +27,10 @@
 	<input type="button" class="interpretationButton" value="$i18n.getString( 'share' )" onclick="shareInterpretation()">
 	<input type="hidden" id="interpretationChartId">
 </div>
+
+<div id="shareHelpForm">
+	<ul>
+		<li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">Data visualizer</a>, $i18n.getString( "load_favorite_click_share" )</li>
+		<li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/displayManageTableForm.action">Report table</a>, $i18n.getString( "generate_report_table_click_share" )</li>
+	</ul>
+</div>
\ 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;