← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3818: Comestic fixed

 

------------------------------------------------------------
revno: 3818
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-06-01 10:39:55 +0200
message:
  Comestic fixed
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
  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-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java	2010-09-10 09:54:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java	2011-06-01 08:39:55 +0000
@@ -94,6 +94,7 @@
         }
     }
 
+    @Override
     public boolean allowDeleteDataElement( DataElement dataElement )
     {
         for ( Indicator indicator : indicatorService.getAllIndicators() )

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-04-24 12:47:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-06-01 08:39:55 +0000
@@ -20,8 +20,8 @@
     
     <action name="getChart" class="org.hisp.dhis.dashboard.action.GetChartAction">
       <result name="success" type="chart">
-        <param name="width">305</param>
-        <param name="height">300</param>
+        <param name="width">309</param>
+        <param name="height">309</param>
       </result>
     </action>
     

=== 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	2011-04-19 10:06:23 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2011-06-01 08:39:55 +0000
@@ -19,7 +19,7 @@
 {
   border:1px solid #d0d0d0;
   padding:1px;
-  height:192px;
+  height:196px;
   width:305px;
   overflow:hidden;
   margin-bottom:15px;
@@ -34,8 +34,8 @@
 {
   border:1px solid #d0d0d0;
   padding:1px;
-  height:304px;
-  width:305px;
+  height:310px;
+  width:310px;
   overflow:hidden;
   margin-bottom:15px;
 }