dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7761 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-30 11:52:25 +0200
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartPluginController.java
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.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-api/src/main/java/org/hisp/dhis/api/controller/ChartPluginController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartPluginController.java	2012-07-27 08:18:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartPluginController.java	2012-07-30 09:51:01 +0000
@@ -133,12 +133,12 @@
         // Periods
         // ---------------------------------------------------------------------
         
-        List<Period> allPeriods = rewind ? relativePeriods.getRewindedRelativePeriods() :
+        List<Period> allRelativePeriods = rewind ? relativePeriods.getRewindedRelativePeriods() :
             relativePeriods.getRelativePeriods();
         
         List<Period> periods = new ArrayList<Period>();
         
-        for ( Period period : allPeriods )
+        for ( Period period : allRelativePeriods )
         {
             if ( periods.contains( period ) )
             {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-07-28 11:04:53 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-07-30 09:51:01 +0000
@@ -1,14 +1,17 @@
-body {
-    font: normal 10px arial,sans-serif,ubuntu,consolas;
-}
-
+body,
 .x-body,
 .x-btn-default-toolbar-small .x-btn-inner,
 .x-form-item,
 .x-panel-header-text-default,
-.x-grid-cell-inner {
+.x-grid-cell-inner,
+.x-form-item-label,
+.x-window-header-text-default {
 	font-family: arial,sans-serif,ubuntu,consolas;
 }
+
+body {
+    font-size: 10px;
+}
 	
 .x-panel-body {
     font-size: 11px;
@@ -54,7 +57,7 @@
 
 /* Combobox field label font */
 .x-form-item-label {
-    font: 11px arial,sans-serif,ubuntu,consolas;
+    font-size: 11px;
     color: #111;
 }