dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5045 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-26 14:35:33 +0200
message:
  Minor fixes.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-26 10:30:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-26 12:13:44 +0000
@@ -1,5 +1,12 @@
 DV = {};
 DV.conf = {
+    init: {
+        data: [
+            {x: 'Category 1', 'Series 1': 41, 'Series 2': 69, 'Series 3': 63, 'Series 4': 51},
+            {x: 'Category 2', 'Series 1': 51, 'Series 2': 42, 'Series 3': 58, 'Series 4': 52},
+            {x: 'Category 3', 'Series 1': 44, 'Series 2': 71, 'Series 3': 62, 'Series 4': 54}
+        ]
+    },
     finals: {
         ajax: {
             url_visualizer: '../',
@@ -48,12 +55,7 @@
     layout: {
         west_cmp_width: 380,
         west_width: 424
-    },
-    data: [
-        {x: 'Category 1', 'Series 1': 41, 'Series 2': 69, 'Series 3': 63, 'Series 4': 51},
-        {x: 'Category 2', 'Series 1': 51, 'Series 2': 42, 'Series 3': 58, 'Series 4': 52},
-        {x: 'Category 3', 'Series 1': 44, 'Series 2': 71, 'Series 3': 62, 'Series 4': 54}
-    ]
+    }
 };
 
 Ext.Loader.setConfig({enabled: true});
@@ -70,7 +72,7 @@
         success: function(r) {
             
     DV.init = Ext.JSON.decode(r.responseText);
-    
+    DV.init.isInit = true;
     DV.init.initialize = function(vp) {
         DV.util.combobox.filter.category(vp);
         
@@ -81,7 +83,7 @@
         DV.store.area = DV.store.defaultChartStore;
         DV.store.pie = DV.store.defaultChartStore;
         
-        DV.data.data = DV.conf.data;
+        DV.data.data = DV.conf.init.data;
         
         DV.chart.init = true;
         DV.store.getChartStore(true);
@@ -656,7 +658,7 @@
                     }
                     else {
                         return DV.value.values;
-                    }                    
+                    }
                 }
             });
         }
@@ -695,11 +697,6 @@
     
     DV.chart = {
         init: false,
-        isInit: function() {
-            var bool = this.init ? true : false;
-            this.init = false;
-            return bool;
-        },
         chart: null,
         getChart: function(exe) {
             this[DV.state.type]();
@@ -732,7 +729,7 @@
                         }
                     },
                     {
-                        title: this.isInit() ? 'Categories' : DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
+                        title: this.init.isInit ? 'Categories' : DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
                         type: 'Category',
                         position: 'bottom',
                         fields: DV.store.chart.bottom
@@ -910,6 +907,7 @@
             c.removeAll(true);
             c.add(this.chart);
             c.down('label').setText(DV.state.filter.data[0] || 'Example chart');
+            this.init.isInit = false;
         }
     };
         
@@ -927,8 +925,8 @@
                 items: [
                     {
                         xtype: 'toolbar',
-                        height: 44,
-                        style: 'padding-top:2px; border-style:none',
+                        height: 45,
+                        style: 'padding-top:1px; border-style:none',
                         defaults: {
                             height: 40,
                             toggleGroup: 'chartsettings',
@@ -945,7 +943,7 @@
                             {
                                 xtype: 'label',
                                 text: 'Chart type',
-                                style: 'font-size:11px; font-weight:bold; padding:12px 8px 0 10px'
+                                style: 'font-size:11px; font-weight:bold; padding:13px 8px 0 10px'
                             },
                             {
 								xtype: 'button',

=== 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	2011-10-26 10:46:53 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2011-10-26 12:31:47 +0000
@@ -193,9 +193,9 @@
 /* Second toolbar */
 #chartsettings_tb {
     background: #eee;
-    padding: 4px 0 0 8px;
+    padding: 5px 0 0 8px;
     border-style: none;
-    border-top: 1px dashed #bbb;
+    border-top: 1px dashed #ccc;
 }
 
 /* Multiselect dock border radius */
@@ -248,6 +248,10 @@
     border-color: #aaa;
 }
 
+.x-menu-item-link {
+    padding: 3px 5px 4px 35px;
+}
+
 .x-menu-item-active .x-menu-item-link {
     -moz-border-radius: 2px 2px 2px 2px;
     -webkit-border-radius: 2px 2px 2px 2px;