dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4808 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-10-03 17:18:53 +0200
message:
  (DV) Minor fixes.
added:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/refresh.png
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-03 11:50:55 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-03 15:17:06 +0000
@@ -743,7 +743,7 @@
                                         width: DV.conf.layout.west_cmp_width,
                                         valueField: 'id',
                                         displayField: 'name',
-                                        fieldLabel: 'Indicator group',
+                                        fieldLabel: 'Select group',
                                         labelStyle: 'padding-left:7px;',
                                         labelWidth: 110,
                                         editable: false,
@@ -885,7 +885,7 @@
                                         width: DV.conf.layout.west_cmp_width,
                                         valueField: 'id',
                                         displayField: 'name',
-                                        fieldLabel: 'Data element group',
+                                        fieldLabel: 'Select group',
                                         labelStyle: 'padding-left:7px;',
                                         labelWidth: 110,
                                         editable: false,
@@ -1060,7 +1060,8 @@
                                                     {
                                                         xtype: 'checkbox',
                                                         paramName: 'monthsLastYear',
-                                                        boxLabel: 'Months last year'
+                                                        boxLabel: 'Months last year',
+                                                        checked: true
                                                     }
                                                 ]
                                             },
@@ -1172,6 +1173,8 @@
                                             }
                                         }),
                                         listeners: {
+                                            //afterrender: function(tp) {
+                                                //tp.getRootNode()
                                             itemcontextmenu: function(a,b,c,d,e) {
                                                 console.log(e);
                                             }
@@ -1219,9 +1222,12 @@
                             }
                         }
                     },
+                    ' ',
                     {
                         xtype: 'button',
                         text: 'Update',
+                        cls: 'x-btn-text-icon',
+                        icon: 'images/refresh.png',
                         handler: function() {
                             DV.state.getState(true);
                         }

=== 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-03 11:50:55 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2011-10-03 15:17:06 +0000
@@ -147,27 +147,27 @@
 
 /* Multiselect dock border radius */
 #availableIndicators .x-docked-top {
-    -webkit-border-top-left-radius: 3px;
-    -moz-border-radius-topleft: 3px;
-    border-top-left-radius: 3px;
+    -webkit-border-top-left-radius: 2px;
+    -moz-border-radius-topleft: 2px;
+    border-top-left-radius: 2px;
 }
 
 #availableDataElements .x-docked-top {
-    -webkit-border-top-left-radius: 3px;
-    -moz-border-radius-topleft: 3px;
-    border-top-left-radius: 3px;
+    -webkit-border-top-left-radius: 2px;
+    -moz-border-radius-topleft: 2px;
+    border-top-left-radius: 2px;
 }
 
 #selectedIndicators .x-docked-top {
-    -webkit-border-top-right-radius: 3px;
-    -moz-border-radius-topright: 3px;
-    border-top-right-radius: 3px;
+    -webkit-border-top-right-radius: 2px;
+    -moz-border-radius-topright: 2px;
+    border-top-right-radius: 2px;
 }
 
 #selectedDataElements .x-docked-top {
-    -webkit-border-top-right-radius: 3px;
-    -moz-border-radius-topright: 3px;
-    border-top-right-radius: 3px;
+    -webkit-border-top-right-radius: 2px;
+    -moz-border-radius-topright: 2px;
+    border-top-right-radius: 2px;
 }
 
 .dv-fieldset-title-link {
@@ -175,4 +175,15 @@
     text-decoration:none;
 }
 
+.x-btn-default-toolbar-small {
+    border-width: 2px;
+}
 
+.x-btn-default-toolbar-small-over {
+    background-color: transparent;
+    border-color: #aaa;
+    border-radius: 3px 3px 3px 3px;
+    border-style: double;
+    border-width: 2px;
+    padding: 2px;
+}

=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/refresh.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/refresh.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/refresh.png	2011-10-03 15:17:06 +0000 differ