dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7176
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-06-04 14:52:49 +0200
message:
  Minor
modified:
  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/dashboard.vm
  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
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.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/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:06:05 +0000
+++ 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
@@ -48,5 +48,6 @@
 click_to_view_in_gis=Click to view in GIS
 share=Share
 write_your_interpretation=Write your interpretation
-share_your_interpretation=Share your interpretation
-interpretation_was_shared=Interpretation was shared
\ No newline at end of file
+share_your_interpretation_of=Share your interpretation of
+interpretation_was_shared=Interpretation was shared
+viewing=Viewing
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2012-06-04 12:06:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2012-06-04 12:52:49 +0000
@@ -14,7 +14,7 @@
     <a href="javascript:clearArea( '${areaDivId}' )">$i18n.getString( "clear" )</a>
     #if( $chart )
     <a href="javascript:explore( '${chart.uid}' )">$i18n.getString( "explore" )</a>
-    <a href="javascript:viewShareForm( '${chart.uid}' )">$i18n.getString( "share" )</a>
+    <a href="javascript:viewShareForm( '${chart.uid}', '${encoder.htmlEncode( $chart.name )}' )">$i18n.getString( "share" )</a>
     #end
 </div>
 #end
@@ -46,7 +46,7 @@
         </ul>
     </div>
     #if ( $chart )
-        <img style="cursor:pointer" src="../api/charts/${chart.uid}/data?width=310&height=310" onclick="viewChart( '../api/charts/${chart.uid}/data' )">
+        <img style="cursor:pointer" src="../api/charts/${chart.uid}/data?width=310&height=310" onclick="viewChart( '../api/charts/${chart.uid}/data', '${encoder.htmlEncode( $chart.name )}' )">
     #else
         <div class="labelText">$i18n.getString( 'this_is_a_chart_area' )</div>
     #end

=== 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:06:05 +0000
+++ 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
@@ -38,10 +38,11 @@
     } );
 }
 
-function viewChart( url )
+function viewChart( url, name )
 {
     var width = 820;
     var height = 520;
+    var title = i18n_viewing + " " + name;
 
     $( "#chartImage" ).attr( "src", url );
     $( "#chartView" ).dialog( {
@@ -50,7 +51,7 @@
         height : height + 65,
         width : width + 25,
         resizable : false,
-        title : "Viewing Chart"
+        title : title
     } );
 }
 
@@ -59,15 +60,17 @@
 	window.location.href = "../dhis-web-visualizer/app/index.html?id=" + uid;
 }
 
-function viewShareForm( uid )
+function viewShareForm( uid, name )
 {	
 	$( "#interpretationChartId" ).val( uid );
 	
+	var title = i18n_share_your_interpretation_of + " " + name;
+	
 	$( "#shareForm" ).dialog( {
-		modal : true,
-		width : 500,
+		modal: true,
+		width: 550,
 		resizable: false,
-		title : i18n_share_your_interpretation
+		title: title
 	} );
 }
 

=== 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:06:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2012-06-04 12:52:49 +0000
@@ -1,6 +1,7 @@
 <script type="text/javascript">
-var i18n_share_your_interpretation = '$encoder.jsEscape( $i18n.getString( "share_your_interpretation" ), "'")';
+var i18n_share_your_interpretation_of = '$encoder.jsEscape( $i18n.getString( "share_your_interpretation_of" ), "'")';
 var i18n_interpretation_was_shared = '$encoder.jsEscape( $i18n.getString( "interpretation_was_shared" ), "'")';
+var i18n_viewing = '$encoder.jsEscape( $i18n.getString( "viewing" ), "'")';
 </script>
 
 <h3>$i18n.getString( "dashboard" ) #openHelp( "dashboards_setup" )

=== 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-06-04 12:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-04 12:52:49 +0000
@@ -112,7 +112,7 @@
 .interpretationArea
 {
   height: 125px;
-  width: 460px;
+  width: 510px;
   border: 1px solid #ccc;
   resize: none;
   overflow: auto;

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js	2012-05-31 21:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js	2012-06-04 12:52:49 +0000
@@ -78,7 +78,7 @@
 {
 	$( "#shareForm" ).dialog( {
 		modal : true,
-		width : 500,
+		width : 550,
 		resizable: false,
 		title : i18n_share_your_interpretation
 	} );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css	2012-06-04 12:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css	2012-06-04 12:52:49 +0000
@@ -7,7 +7,7 @@
 .interpretationArea
 {
   height: 125px;
-  width: 460px;
+  width: 510px;
   border: 1px solid #ccc;
   resize: none;
   overflow: auto;