=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2012-02-08 15:15:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2012-03-26 15:08:13 +0000
@@ -564,10 +564,11 @@
 }
 .treepanel-layer-border {
     padding:3px 0 0 2px;
+    margin-left:3px;
     background-color:#fff;
-    width:253px;
-    height:310px;
-    border:1px solid #ccc;
+    width:250px;
+    height:258px;
+    border:1px solid #bbb;
     overflow:auto;
 }
 #east {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-03-26 13:07:14 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-03-26 15:08:13 +0000
@@ -2209,7 +2209,7 @@
     boundary.window = new Ext.Window({
         title: '<span id="window-boundary-title">' + G.i18n.boundary_layer + '</span>',
         layout: 'fit',
-        bodyStyle: 'padding:8px; background-color:#fff',
+        bodyStyle: 'padding:8px 8px 11px 8px; background-color:#fff',
         closeAction: 'hide',
         width: 287,
         collapsed: false,
@@ -2261,8 +2261,7 @@
         }
     });    
     boundary.window.setPagePosition(G.conf.window_x_left,G.conf.window_y_left);
-	
-    /* Section: widgets */
+    
     choropleth = new mapfish.widgets.geostat.Choropleth({
         map: G.vars.map,
         layer: polygonLayer,
@@ -2539,7 +2538,7 @@
     centroid.window = new Ext.Window({
         title: '<span id="window-centroid-title">' + G.conf.centroid_layer + '</span>',
         layout: 'fit',
-        bodyStyle: 'padding:8px; background-color:#fff',
+        bodyStyle: 'padding:8px 8px 11px 8px; background-color:#fff',
         closeAction: 'hide',
         width: 570,
         isUpdate: false,

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Boundary.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Boundary.js	2012-02-09 15:02:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Boundary.js	2012-03-26 15:08:13 +0000
@@ -338,7 +338,7 @@
 							this.cmp.level
 						]
 					},                            
-					{ html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
+					{ html: '<div class="thematic-br"></div>' },                            
 					{ html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
 					this.cmp.parent
 				]

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-03-25 11:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-03-26 15:08:13 +0000
@@ -686,7 +686,7 @@
                                     this.cmp.level
                                 ]
                             },                            
-                            { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
+                            { html: '<div class="thematic-br"></div>' },                            
                             { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-03-26 13:00:42 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-03-26 15:08:13 +0000
@@ -701,6 +701,7 @@
                     fn: function(cb) {
                         if (cb.getValue() == G.conf.map_legendset_type_predefined && cb.getValue() != this.legend.value) {
                             this.legend.value = G.conf.map_legendset_type_predefined;
+                            
                             this.prepareMapViewLegend();
                             
                             if (this.cmp.mapLegendSet.getValue()) {
@@ -819,7 +820,7 @@
         this.cmp.startColor = new Ext.ux.ColorField({
             fieldLabel: G.i18n.low_color,
             allowBlank: false,
-            width: G.conf.combo_width,
+            width: 73,
             value: "#FF0000",
             listeners: {
                 'select': {
@@ -832,9 +833,8 @@
         });
         
         this.cmp.endColor = new Ext.ux.ColorField({
-            fieldLabel: G.i18n.high_color,
             allowBlank: false,
-            width: G.conf.combo_width,
+            width: 73,
             value: "#FFFF00",
             listeners: {
                 'select': {
@@ -848,7 +848,7 @@
         
         this.cmp.radiusLow = new Ext.form.NumberField({
             fieldLabel: G.i18n.low_point_size,
-            width: G.conf.combo_number_width_small,
+            width: 73,
             allowDecimals: false,
             allowNegative: false,
             minValue: 1,
@@ -865,7 +865,7 @@
         
         this.cmp.radiusHigh = new Ext.form.NumberField({
             fieldLabel: G.i18n.high_point_size,
-            width: G.conf.combo_number_width_small,
+            width: 73,
             allowDecimals: false,
             allowNegative: false,
             minValue: 1,
@@ -943,6 +943,42 @@
                 }
             }
         });
+        
+        this.cmp.colorPanel = new Ext.Panel({
+			layout: 'hbox',
+			style: 'padding-bottom:4px',
+			items: [
+				{
+					html: 'Low / high color:',
+					width: 107,
+					style: 'padding:3px 0 0 4px; color:#444'
+				},
+				this.cmp.startColor,
+				{
+					style: 'width:4px'
+				},
+				this.cmp.endColor,
+				{
+					style: 'height:4px'
+				}
+			]
+		});
+		
+		this.cmp.radiusPanel = new Ext.Panel({
+			layout: 'hbox',
+			items: [
+				{
+					html: 'Low / high radius:',
+					width: 107,
+					style: 'padding:3px 0 0 4px; color:#444'
+				},
+				this.cmp.radiusLow,
+				{
+					style: 'width:4px'
+				},
+				this.cmp.radiusHigh
+			]
+		});
     },
     
     addItems: function() {
@@ -952,6 +988,7 @@
                 xtype: 'panel',
                 layout: 'column',
                 width: 570,
+                style: 'padding-bottom:3px',
                 items: [
                     {
                         xtype: 'form',
@@ -974,11 +1011,8 @@
                             this.cmp.method,
                             this.cmp.bounds,
                             this.cmp.classes,
-                            this.cmp.startColor,
-                            this.cmp.endColor,
-                            { html: '<div class="thematic-br">' },
-                            this.cmp.radiusLow,
-                            this.cmp.radiusHigh
+                            this.cmp.colorPanel,
+                            this.cmp.radiusPanel
                         ]
                     },
                     {
@@ -994,7 +1028,7 @@
                                     this.cmp.level
                                 ]
                             },                            
-                            { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
+                            { html: '<div class="thematic-br"></div>' },                            
                             { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
@@ -1328,8 +1362,7 @@
         
         if (this.legend.value == G.conf.map_legendset_type_automatic) {
             this.cmp.method.show();
-            this.cmp.startColor.show();
-            this.cmp.endColor.show();
+            this.cmp.colorPanel.show();
             this.cmp.mapLegendSet.hide();
             
             if (this.legend.method == G.conf.classify_with_bounds) {
@@ -1345,8 +1378,7 @@
             this.cmp.method.hide();
             this.cmp.classes.hide();
             this.cmp.bounds.hide();
-            this.cmp.startColor.hide();
-            this.cmp.endColor.hide();
+            this.cmp.colorPanel.hide();
             this.cmp.mapLegendSet.show();
         }
     },

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-03-25 11:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-03-26 15:08:13 +0000
@@ -819,7 +819,7 @@
         this.cmp.startColor = new Ext.ux.ColorField({
             fieldLabel: G.i18n.low_color,
             allowBlank: false,
-            width: G.conf.combo_width,
+            width: 73,
             value: "#FF0000",
             listeners: {
                 'select': {
@@ -832,9 +832,8 @@
         });
         
         this.cmp.endColor = new Ext.ux.ColorField({
-            fieldLabel: G.i18n.high_color,
             allowBlank: false,
-            width: G.conf.combo_width,
+            width: 73,
             value: "#FFFF00",
             listeners: {
                 'select': {
@@ -848,7 +847,7 @@
         
         this.cmp.radiusLow = new Ext.form.NumberField({
             fieldLabel: G.i18n.low_point_size,
-            width: G.conf.combo_number_width_small,
+            width: 73,
             allowDecimals: false,
             allowNegative: false,
             minValue: 1,
@@ -865,7 +864,7 @@
         
         this.cmp.radiusHigh = new Ext.form.NumberField({
             fieldLabel: G.i18n.high_point_size,
-            width: G.conf.combo_number_width_small,
+            width: 73,
             allowDecimals: false,
             allowNegative: false,
             minValue: 1,
@@ -943,6 +942,42 @@
                 }
             }
         });
+        
+        this.cmp.colorPanel = new Ext.Panel({
+			layout: 'hbox',
+			style: 'padding-bottom:4px',
+			items: [
+				{
+					html: 'Low / high color:',
+					width: 107,
+					style: 'padding:3px 0 0 4px; color:#444'
+				},
+				this.cmp.startColor,
+				{
+					style: 'width:4px'
+				},
+				this.cmp.endColor,
+				{
+					style: 'height:4px'
+				}
+			]
+		});
+		
+		this.cmp.radiusPanel = new Ext.Panel({
+			layout: 'hbox',
+			items: [
+				{
+					html: 'Low / high radius:',
+					width: 107,
+					style: 'padding:3px 0 0 4px; color:#444'
+				},
+				this.cmp.radiusLow,
+				{
+					style: 'width:4px'
+				},
+				this.cmp.radiusHigh
+			]
+		});
     },
     
     addItems: function() {
@@ -952,12 +987,13 @@
                 xtype: 'panel',
                 layout: 'column',
                 width: 570,
+                style: 'padding-bottom:3px',
                 items: [
                     {
                         xtype: 'form',
                         width: 270,
                         items: [
-                            {  html: '<div class="window-info">' + G.i18n.data_options + '</div>' },
+                            { html: '<div class="window-info">' + G.i18n.data_options + '</div>' },
                             this.cmp.mapview,
                             { html: '<div class="thematic-br">' },
                             this.cmp.mapValueType,
@@ -974,11 +1010,8 @@
                             this.cmp.method,
                             this.cmp.bounds,
                             this.cmp.classes,
-                            this.cmp.startColor,
-                            this.cmp.endColor,
-                            { html: '<div class="thematic-br">' },
-                            this.cmp.radiusLow,
-                            this.cmp.radiusHigh
+                            this.cmp.colorPanel,
+                            this.cmp.radiusPanel
                         ]
                     },
                     {
@@ -994,7 +1027,7 @@
                                     this.cmp.level
                                 ]
                             },                            
-                            { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
+                            { html: '<div class="thematic-br"></div>' },                            
                             { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
@@ -1328,8 +1361,7 @@
         
         if (this.legend.value == G.conf.map_legendset_type_automatic) {
             this.cmp.method.show();
-            this.cmp.startColor.show();
-            this.cmp.endColor.show();
+            this.cmp.colorPanel.show();
             this.cmp.mapLegendSet.hide();
             
             if (this.legend.method == G.conf.classify_with_bounds) {
@@ -1345,8 +1377,7 @@
             this.cmp.method.hide();
             this.cmp.classes.hide();
             this.cmp.bounds.hide();
-            this.cmp.startColor.hide();
-            this.cmp.endColor.hide();
+            this.cmp.colorPanel.hide();
             this.cmp.mapLegendSet.show();
         }
     },

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-03-25 11:59:43 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-03-26 15:08:13 +0000
@@ -362,7 +362,7 @@
         this.cmp.group = new Ext.Panel({
             layout: 'form',
             width: 257,
-            height: 344,
+            height: 288,
             bodyStyle: 'padding:8px 0px 8px 18px;overflow-x:hidden;overflow-y:auto;',
             labelWidth: 170,
             defaults: {
@@ -487,7 +487,7 @@
                                     this.cmp.level
                                 ]
                             },                            
-                            { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
+                            { html: '<div class="thematic-br"></div>' },                            
                             { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]