=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java	2010-02-24 14:11:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java	2010-02-24 16:36:32 +0000
@@ -52,94 +52,97 @@
     // -------------------------------------------------------------------------
     // Input
     // -------------------------------------------------------------------------
-    
+
     private String name;
-    
+
     public void setName( String name )
     {
         this.name = name;
     }
-    
+
     private int indicatorGroupId;
-    
+
     public void setIndicatorGroupId( int indicatorGroupId )
     {
         this.indicatorGroupId = indicatorGroupId;
     }
-    
+
     private int indicatorId;
-    
+
     public void setIndicatorId( int indicatorId )
     {
         this.indicatorId = indicatorId;
     }
-    
+
     private String periodTypeId;
-    
+
     public void setPeriodTypeId( String periodTypeId )
     {
         this.periodTypeId = periodTypeId;
     }
-    
+
     private int periodId;
-    
+
     public void setPeriodId( int periodId )
     {
         this.periodId = periodId;
     }
-    
+
     private String mapSource;
-    
+
     public void setMapSource( String mapSource )
     {
         this.mapSource = mapSource;
     }
-    
+
     private int method;
-    
+
     public void setMethod( int method )
     {
         this.method = method;
     }
-    
+
     private int classes;
-    
+
     public void setClasses( int classes )
     {
         this.classes = classes;
     }
-    
+
     private String colorLow;
-    
+
     public void setColorLow( String colorLow )
     {
         this.colorLow = colorLow;
     }
-    
+
     private String colorHigh;
-    
+
     public void setColorHigh( String colorHigh )
     {
         this.colorHigh = colorHigh;
     }
-    
+
     private String longitude;
-    
-    public void setLongitude(String longitude) {
-		this.longitude = longitude;
-	}
-    
+
+    public void setLongitude( String longitude )
+    {
+        this.longitude = longitude;
+    }
+
     private String latitude;
 
-	public void setLatitude(String latitude) {
-		this.latitude = latitude;
-	}
-	
-	private int zoom;
-
-	public void setZoom(int zoom) {
-		this.zoom = zoom;
-	}
+    public void setLatitude( String latitude )
+    {
+        this.latitude = latitude;
+    }
+
+    private int zoom;
+
+    public void setZoom( int zoom )
+    {
+        this.zoom = zoom;
+    }
 
     // -------------------------------------------------------------------------
     // Action implementation
@@ -150,7 +153,7 @@
     {
         mappingService.addOrUpdateMapView( name, indicatorGroupId, indicatorId, periodTypeId, periodId, mapSource,
             method, classes, colorLow, colorHigh, longitude, latitude, zoom );
-        
+
         return SUCCESS;
     }
 }
\ No newline at end of file

=== 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	2010-02-18 17:01:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-02-24 16:36:32 +0000
@@ -1,11 +1,35 @@
-.row-assigned  {
+/* MAPPING GRID */
+
+.row-assigned  {
 	background-color:#b1ffa1;
 }
 
-.row-not-assigned  {
+.row-unassigned  {
 	background-color:#FFFFFF;
 }
 
+.x-grid3-cell-inner, .x-grid3-hd-inner  {
+	font-family:lucida sans unicode, arial;
+	font-weight:normal;
+	font-size:10px;
+	letter-spacing:0px;
+	color:#777;
+}
+
+.x-grid3-hd-inner, .x-grid3-hd-organisationUnitId  {
+	font-family:lucida sans unicode, arial;
+	font-weight:normal;
+	font-size:11px;
+	letter-spacing:0px;
+	color:#333;
+}
+
+/* BUTTONS */
+
+.x-btn button {
+	font:10px lucida sans unicode,arial normal;
+}
+
 .x-btn .icon-zoomin  {
 	background-image:url(../../../images/zoom_in.png);
 }
@@ -26,18 +50,10 @@
 	background-image:url(../../../images/pdf.png);
 }
 
-.x-mask-loading2 div  {
-	padding:2px 11px 3px 32px;
-	background:#fbfbfb url('../../../images/loader.gif') no-repeat 5px 2px;
-	line-height:20px;
-	font-weight:normal;
-}
-
 .aa_dark button  {
 	font-family:lucida sans unicode, arial;
 	font-weight:normal;
 	font-size:10px;
-	letter-spacing:0px;
 	color:#111;
 }
 
@@ -45,7 +61,6 @@
 	font-family:lucida sans unicode, arial;
 	font-weight:normal;
 	font-size:10px;
-	letter-spacing:0px;
 	color:#333;
 }
 
@@ -53,22 +68,46 @@
 	font-family:lucida sans unicode, arial;
 	font-weight:bold;
 	font-size:10px;
-	letter-spacing:0px;
 	color:#888;
 }
 
-.x-grid3-cell-inner, .x-grid3-hd-inner  {
-	font-family:lucida sans unicode, arial;
+/* LOADING MASK */
+
+.x-mask-loading2 div  {
+	padding:2px 11px 3px 32px;
+	background:#fbfbfb url('../../../images/loader.gif') no-repeat 5px 2px;
+	line-height:20px;
 	font-weight:normal;
-	font-size:10px;
-	letter-spacing:0px;
-	color:#777;
 }
 
-.x-grid3-hd-inner, .x-grid3-hd-organisationUnitId  {
-	font-family:lucida sans unicode, arial;
+/* DIALOGUE BOX */
+
+.window-info {
+	font-family:lucida sans unicode,arial;
 	font-weight:normal;
 	font-size:11px;
-	letter-spacing:0px;
 	color:#333;
-}
\ No newline at end of file
+	padding:0 0 8px 0;
+}
+
+.window-field-label {
+	padding:0px 0 4px 3px;
+	font-family:lucida sans unicode,arial;
+	font-weight:normal;
+	font-size:11px;
+	color:#888;
+}
+
+.window-button {
+	padding:8px 0 0 0;
+}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-02-24 14:11:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-02-24 16:36:32 +0000
@@ -356,8 +356,7 @@
         selectOnFocus: true,
         width: combo_width,
         minListWidth: combo_list_width,
-        store: viewStore,
-        bodyStyle: 'margin-bottom:4px'
+        store: viewStore
     });
     
     var newViewPanel = new Ext.form.FormPanel({
@@ -365,18 +364,16 @@
 		bodyStyle: 'border:0px solid #fff',
         items:
         [
-            { html: '<font style="' + AA_MED + '">Saving current thematic map selection.</font>' },
-			{ html: '<br>' },
-            { html: '<p style="' + LABEL + AA_LIGHT + '">Display name</p>' },
+            { html: '<div class="window-info">Saving current thematic map selection.</div>' },
+            { html: '<div class="window-field-label">Display name</div>' },
 			viewNameTextField,
-			{ html: '<p style="padding-bottom:7px>' },
 			{
 				xtype: 'button',
                 id: 'newview_b',
 				isFormField: true,
 				hideLabel: true,
+				cls: 'window-button',
 				text: 'Save',
-				cls: 'aa_med',
 				handler: function() {
 					var vn = Ext.getCmp('viewname_tf').getValue();
 					var ig = Ext.getCmp('indicatorgroup_cb').getValue();
@@ -449,16 +446,15 @@
 		bodyStyle: 'border:0px solid #fff',
         items:
         [   
-            { html: '<p style="' + LABEL + AA_LIGHT + '">View</p>' },
+            { html: '<div class="window-field-label">View</div>' },
 			viewComboBox,
-			{ html: '<p style="padding-bottom:7px>' },
 			{
 				xtype: 'button',
                 id: 'deleteview_b',
 				isFormField: true,
 				hideLabel: true,
 				text: 'Delete',
-				cls: 'aa_med',
+				cls: 'window-button',
 				handler: function() {
 					var v = Ext.getCmp('view_cb').getValue();
 					var name = Ext.getCmp('view_cb').getStore().getById(v).get('name');
@@ -488,21 +484,20 @@
         ]
     });
     
-    var dashboardViewPanel = new Ext.Panel({   
+    var dashboardViewPanel = new Ext.form.FormPanel({   
         id: 'dashboardview_p',
 		bodyStyle: 'border:0px solid #fff',
         items:
         [   
-            { html: '<p style="' + LABEL + AA_LIGHT + '">View</p>' },
+            { html: '<div class="window-field-label">View</div>' },
 			view2ComboBox,
-			{ html: '<p style="padding-bottom:11px>' },
 			{
 				xtype: 'button',
                 id: 'dashboardview_b',
 				isFormField: true,
 				hideLabel: true,
-				text: 'Add to DHIS 2 Dashboard',
-				cls: 'aa_med',
+				text: 'Add to DHIS dashboard',
+				cls: 'window-button',
 				handler: function() {
 					var v2 = Ext.getCmp('view2_cb').getValue();
 					var nv = Ext.getCmp('view2_cb').getRawValue();
@@ -552,13 +547,13 @@
                     tabchange: function(panel, tab)
                     {
                         if (tab.id == 'view0') { 
-                            viewWindow.setHeight(192);
+                            viewWindow.setHeight(173);
                         }
                         else if (tab.id == 'view1') {
-                            viewWindow.setHeight(148);
+                            viewWindow.setHeight(150);
                         }
                         else if (tab.id == 'view2') {
-                            viewWindow.setHeight(148);
+                            viewWindow.setHeight(150);
                         }
                     }
                 },
@@ -582,16 +577,6 @@
                     },
                     {
                         title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
-                        title: '<font style="' + AA_MED + '">Add to dashboard</font>',
                         id: 'view2',
                         items:
                         [

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js	2010-02-23 14:22:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js	2010-02-24 16:36:32 +0000
@@ -171,7 +171,7 @@
                 var cls = ''; 
                 switch (row.data.featureId) {
                     case '': 
-                        cls = 'row-not-assigned';
+                        cls = 'row-unassigned';
                         break;
                     default:
                         cls = 'row-assigned';