dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3894
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-06-14 10:01:50 +0200
message:
  minor fixes
modified:
  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-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm


--
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/javascript/dropdown.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2011-06-09 19:35:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2011-06-14 08:01:50 +0000
@@ -16,8 +16,8 @@
 
 function viewChart( url )
 {
-    var width = 700;
-    var height = 500;
+    var width = 700 + 20;
+    var height = 500 + 20;
 
     $('#chartImage').attr('src', url);
     $('#chartView').dialog({

=== 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	2011-06-09 19:07:37 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2011-06-14 08:01:50 +0000
@@ -81,5 +81,5 @@
 </table>
 
 <div id="chartView" style="display: none; padding: 0; margin: 0;'">
-	<img id='chartImage' src=''></img>
+	<img id="chartImage" src="" style="padding: 10px;"></img>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2011-06-10 13:15:44 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2011-06-14 08:01:50 +0000
@@ -6,7 +6,10 @@
 {
     var width = size === 'wide' ? 1000 : 700;
     var height = size === 'tall' ? 800 : 500;
-
+    
+    width += 20;
+    height += 20;
+    
     $('#chartImage').attr('src', url);
     $('#chartView').dialog({
        autoOpen: true,

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm	2011-06-10 13:15:44 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm	2011-06-14 08:01:50 +0000
@@ -24,12 +24,12 @@
 				  	<td>#filterDiv( "displayViewChartForm" )</td>
                     <td align="right" style="padding-top: 16px;">
                     	<select id="chart_type">
+                    		<option value='indicator'>$i18n.getString( 'indicator_by_period_chart' )</option>
+                    		<option value='organisationUnit'>$i18n.getString( 'indicator_by_organisation_unit_chart' )</option>
+                    		<option value='dataElement_period'>$i18n.getString( 'dataelement_by_period_chart' )</option>
+                    		<option value='organisationUnit_dataElement'>$i18n.getString( 'dataelement_by_organisation_unit_chart' )</option>
                     		<option value='period'>$i18n.getString( 'period_by_indicator_chart' )</option>
                     		<option value='period_dataElement'>$i18n.getString( 'period_by_dataelement_chart' )</option>
-                    		<option value='organisationUnit'>$i18n.getString( 'indicator_by_organisation_unit_chart' )</option>
-                    		<option value='organisationUnit_dataElement'>$i18n.getString( 'dataelement_by_organisation_unit_chart' )</option>
-                    		<option value='indicator'>$i18n.getString( 'indicator_by_period_chart' )</option>
-                    		<option value='dataElement_period'>$i18n.getString( 'dataelement_by_period_chart' )</option>
                     	</select>
                     	<button type="button" id="add_chart">$i18n.getString( 'add' )</button>
                     </td>
@@ -87,5 +87,5 @@
 </table>
 
 <div id="chartView" style="display: none; padding: 0; margin: 0;'">
-	<img id='chartImage' src=''></img>
+	<img id="chartImage" src="" style="padding: 10px;"></img>
 </div>