=== 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-03-09 04:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-03-10 14:41:28 +0000
@@ -1,13 +1,12 @@
 /* Ext */
 .ext-gecko .x-window-body .x-form-item {
-	overflow: hidden;
+	overflow:hidden;
 }
 
 /* Ext theme gray-extend */
 .x-btn-right{
 	background:url(../../resources/ext-ux/theme/gray-extend-ux/btn-sprite.gif) no-repeat scroll 0 -21px transparent;
 }
-
 .x-btn-left {
 	background:url(../../resources/ext-ux/theme/gray-extend-ux/btn-sprite.gif) no-repeat scroll 0 0 transparent;
 }
@@ -51,23 +50,17 @@
 	color:#333;
 }
 .x-grid3-cell-inner, .x-grid3-hd-inner  {
-	font-family:lucida sans unicode, arial;
-	font-weight:normal;
-	font-size:10px;
-	letter-spacing:0px;
+	font:normal 10px lucida sans unicode,arial;
 	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;
+	font-family:normal 11px lucida sans unicode,arial;
 	color:#333;
 }
 
 /* Ext Button */
 .x-btn button {
-	font:10px lucida sans unicode,arial normal;
+	font:normal 10px lucida sans unicode,arial;
 }
 .x-btn .icon-zoomin  {
 	background-image:url(../../../images/zoom_in.png);
@@ -85,19 +78,19 @@
 	background-image:url(../../../images/pdf.png);
 }
 .aa_dark button  {
-	font-family:lucida sans unicode, arial;
+	font-family:lucida sans unicode,arial;
 	font-weight:normal;
 	font-size:10px;
 	color:#111;
 }
 .aa_med button  {
-	font-family:lucida sans unicode, arial;
+	font-family:lucida sans unicode,arial;
 	font-weight:normal;
 	font-size:10px;
 	color:#333;
 }
 .aa_light button  {
-	font-family:lucida sans unicode, arial;
+	font-family:lucida sans unicode,arial;
 	font-weight:bold;
 	font-size:10px;
 	color:#888;
@@ -115,7 +108,7 @@
 .window-info {
 	padding:0 0 8px 0;
 	font:normal 11px lucida sans unicode,arial;
-	color: #333;
+	color:#333;
 }
 .window-field-label-first {
 	padding:0px 0 3px 3px;
@@ -161,12 +154,12 @@
 }
 .panel-fieldlabel {
 	padding:5px 0 2px 2px;
-	font:normal 11px lucida sans unicode;
+	font:normal 11px lucida sans unicode,arial;
 	color:#777;
 }
 .panel-fieldlabel-first {
 	padding:0px 0 2px 2px;
-	font:normal 11px lucida sans unicode;
+	font:normal 11px lucida sans unicode,arial;
 	color:#777;
 }
 .panel-tab-title {
@@ -174,6 +167,12 @@
 	color:#333;
 }
 
+/* Msg */
+.x-msg-hl {
+	font-style:italic;
+	color:#333;
+}
+
 /* DHIS Help */
 #help {
 	padding:0px 8px 8px 8px;

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-02 16:32:27 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-10 14:41:28 +0000
@@ -4,11 +4,7 @@
 
 //  MapFish print module
 
-    var layerOverrides = {
-        "World": {overview: true},
-        Countries: { format: 'image/svg+xml' }
-    };
-
+    var layerOverrides = {"World": {overview: true}, Countries: {format: 'image/svg+xml'}};
     var printConfigUrl = '../../pdf/info.json';
 
 //  Ajax requests
@@ -57,11 +53,6 @@
 	
 //	DHIS variables
 
-	MAP_SOURCE_TYPE_DATABASE = 'database';
-	MAP_SOURCE_TYPE_GEOJSON = 'geojson';
-	MAP_SOURCE_TYPE_SHAPEFILE = 'shapefile';
-
-//  Ext.message
-
-    msg_highlight_start = '<b><span color="#555555">';
-    msg_highlight_end = '</span></b>';      
\ No newline at end of file
+	map_source_type_database = 'database';
+	map_source_type_geojson = 'geojson';
+	map_source_type_shapefile = 'shapefile';
\ 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-03-09 17:15:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-10 14:41:28 +0000
@@ -1,5 +1,4 @@
-/* reference local blank image */
-Ext.BLANK_IMAGE_URL = '../resources/ext/resources/images/default/s.gif';
+Ext.BLANK_IMAGE_URL = '../resources/ext/resources/images/default/s.gif';
 
 var MAP;
 var BASECOORDINATE;
@@ -408,7 +407,7 @@
 							
 							for (var i = 0; i < mapViews.length; i++) {
 								if (mapViews[i].name == vn) {
-									Ext.messageRed.msg('New map view', 'There is already a map view called ' + msg_highlight_start + vn + msg_highlight_end + '.');
+									Ext.messageRed.msg('New map view', 'There is already a map view called <span class="x-msg-hl">' + vn + '</span>.');
 									return;
 								}
 							}
@@ -419,7 +418,7 @@
 								params: { name: vn, indicatorGroupId: ig, indicatorId: ii, periodTypeId: pt, periodId: p, mapSource: ms, method: 2, classes: c, colorLow: ca, colorHigh: cb, longitude: lon, latitude: lat, zoom: zoom },
 
 								success: function( responseObject ) {
-									Ext.messageBlack.msg('New map view', 'The view ' + msg_highlight_start + vn + msg_highlight_end + ' was registered.');
+									Ext.messageBlack.msg('New map view', 'The view <span class="x-msg-hl">' + vn + '</span> was registered.');
 									Ext.getCmp('view_cb').getStore().reload();
 									Ext.getCmp('mapview_cb').getStore().reload();
 									Ext.getCmp('viewname_tf').reset();
@@ -467,7 +466,7 @@
 						params: { id: v },
 
 						success: function( responseObject ) {
-							Ext.messageBlack.msg('Delete map view', 'The map view ' + msg_highlight_start + name + msg_highlight_end + ' was deleted.');
+							Ext.messageBlack.msg('Delete map view', 'The map view <span class="x-msg-hl">' + name + '</span> was deleted.');
 							Ext.getCmp('view_cb').getStore().reload();
 							Ext.getCmp('view_cb').reset();
 							Ext.getCmp('mapview_cb').getStore().reload();
@@ -510,7 +509,7 @@
 						params: { id: v2 },
 
 						success: function( responseObject ) {
-							Ext.messageBlack.msg('Dashboard map view', 'The view ' + msg_highlight_start + nv + msg_highlight_end + ' was added to dashboard.');
+							Ext.messageBlack.msg('Dashboard map view', 'The view <span class="x-msg-hl">' + nv + '</span> was added to dashboard.');
 							
 							Ext.getCmp('view_cb').getStore().reload();
 							Ext.getCmp('view_cb').reset();
@@ -799,7 +798,7 @@
                             var mapLegendSets = Ext.util.JSON.decode( responseObject.responseText ).mapLegendSets;
                             for (var i = 0; i < mapLegendSets.length; i++) {
                                 if (ln == mapLegendSets[i].name) {
-                                    Ext.messageRed.msg('New legend set', 'A legend set called ' + msg_highlight_start + ln + msg_highlight_end + ' already exists.');
+                                    Ext.messageRed.msg('New legend set', 'A legend set called <span class="x-msg-hl">' + ln + '</span> already exists.');
                                     return;
                                 }
                             }
@@ -810,7 +809,7 @@
                                 params: { name: ln, method: 2, classes: lc, colorLow: llc, colorHigh: lhc },
 
                                 success: function( responseObject ) {
-                                    Ext.messageBlack.msg('New legend set', 'The legend set ' + msg_highlight_start + ln + msg_highlight_end + ' was registered.');
+                                    Ext.messageBlack.msg('New legend set', 'The legend set <span class="x-msg-hl">' + ln + '</span> was registered.');
                                     Ext.getCmp('legendset_cb').getStore().reload();
                                     Ext.getCmp('legendset2_cb').getStore().reload();
                                     Ext.getCmp('legendsetname_tf').reset();
@@ -878,7 +877,7 @@
                         params: { id: ls },
 
                         success: function( responseObject ) {
-                            Ext.messageBlack.msg('Assign to indicators', 'The legend set ' + msg_highlight_start + lsrw + msg_highlight_end + ' was updated.');
+                            Ext.messageBlack.msg('Assign to indicators', 'The legend set <span class="x-msg-hl">' + lsrw + '</span> was updated.');
                             Ext.getCmp('legendset_cb').getStore().reload();
                         },
                         failure: function() {
@@ -917,7 +916,7 @@
                         params: { id: ls },
 
                         success: function( responseObject ) {
-                            Ext.messageBlack.msg('Delete legend set', 'The legend set ' + msg_highlight_start + lsrw + msg_highlight_end + ' was deleted.');
+                            Ext.messageBlack.msg('Delete legend set', 'The legend set <span class="x-msg-hl">' + lsrw + '</span> was deleted.');
                             
                             Ext.getCmp('legendset2_cb').getStore().reload();
                             Ext.getCmp('legendset2_cb').reset();
@@ -1550,28 +1549,28 @@
                     }
                     
                     if (validateInput(nn) == false) {
-                        Ext.messageRed.msg('New map', msg_highlight_start + 'Map name' + msg_highlight_end + ' cannot have more than 25 characters.');
+                        Ext.messageRed.msg('New map', '<span class="x-msg-hl">' + 'Map name' + '</span> cannot have more than 25 characters.');
                         return;
                     }
                     
                     if (!Ext.num(parseFloat(lon), false)) {
-                        Ext.messageRed.msg('New map', msg_highlight_start + 'Longitude' + msg_highlight_end + ' must be a number.');
+                        Ext.messageRed.msg('New map', '<span class="x-msg-hl">' + 'Longitude' + '</span> must be a number.');
                         return;
                     }
                     else {
                         if (lon < -180 || lon > 180) {
-                            Ext.messageRed.msg('New map', msg_highlight_start + 'Longitude' + msg_highlight_end + ' must be between -180 and 180.');
+                            Ext.messageRed.msg('New map', '<span class="x-msg-hl">' + 'Longitude' + '</span> must be between -180 and 180.');
                             return;
                         }
                     }
                     
                     if (!Ext.num(parseFloat(lat), false)) {
-                        Ext.messageRed.msg('New map', msg_highlight_start + 'Latitude' + msg_highlight_end + ' must be a number.');
+                        Ext.messageRed.msg('New map', '<span class="x-msg-hl">' + 'Latitude' + '</span> must be a number.');
                         return;
                     }
                     else {
                         if (lat < -90 || lat > 90) {
-                            Ext.messageRed.msg('New map', msg_highlight_start + 'Latitude' + msg_highlight_end + ' must be between -90 and 90.');
+                            Ext.messageRed.msg('New map', '<span class="x-msg-hl">' + 'Latitude' + '</span> must be between -90 and 90.');
                             return;
                         }
                     }
@@ -1583,11 +1582,11 @@
                             var maps = Ext.util.JSON.decode(responseObject.responseText).maps;
                             for (var i = 0; i < maps.length; i++) {
                                 if (maps[i].name == nn) {
-                                    Ext.messageRed.msg('New map', 'There is already a map called ' + msg_highlight_start + nn + msg_highlight_end + '.');
+                                    Ext.messageRed.msg('New map', 'There is already a map called <span class="x-msg-hl">' + nn + '</span>.');
                                     return;
                                 }
                                 else if (maps[i].mapLayerPath == mlp) {
-                                    Ext.messageRed.msg('New map', 'The source file ' + msg_highlight_start + mlp + msg_highlight_end + ' is already registered.');
+                                    Ext.messageRed.msg('New map', 'The source file <span class="x-msg-hl">' + mlp + '</span> is already registered.');
                                     return;
                                 }
                             }
@@ -1599,7 +1598,7 @@
                                 method: 'POST',
                                 params: { name: nn, mapLayerPath: source, type: t, sourceType: MAPSOURCE, organisationUnitId: oui, organisationUnitLevelId: ouli, nameColumn: nc, longitude: lon, latitude: lat, zoom: zoom},
                                 success: function( responseObject ) {
-                                    Ext.messageBlack.msg('New map', 'The map ' + msg_highlight_start + nn + msg_highlight_end + ' (' + msg_highlight_start + source + msg_highlight_end + ') was registered.');
+                                    Ext.messageBlack.msg('New map', 'The map <span class="x-msg-hl">' + nn + '</span> (<span class="x-msg-hl">' + source + '</span>) was registered.');
                                     
                                     Ext.getCmp('map_cb').getStore().reload();
                                     Ext.getCmp('maps_cb').getStore().reload();
@@ -1660,7 +1659,7 @@
                 params: { name: en, mapLayerPath: em, nameColumn: nc, longitude: lon, latitude: lat, zoom: zoom },
 
                 success: function( responseObject ) {
-                    Ext.messageBlack.msg('Edit map', 'The map ' + msg_highlight_start + en + msg_highlight_end + ' (' + msg_highlight_start + em + msg_highlight_end + ') was updated.');
+                    Ext.messageBlack.msg('Edit map', 'The map <span class="x-msg-hl">' + en + '</span> (<span class="x-msg-hl">' + em + '</span>) was updated.');
                     
                     Ext.getCmp('map_cb').getStore().reload();
                     Ext.getCmp('maps_cb').getStore().reload();
@@ -1702,7 +1701,7 @@
                 params: { mapLayerPath: mlp },
 
                 success: function( responseObject ) {
-                    Ext.messageBlack.msg('Edit map', 'The map ' + msg_highlight_start + mn + msg_highlight_end + ' (' + msg_highlight_start + mlp + msg_highlight_end + ') was deleted.');
+                    Ext.messageBlack.msg('Edit map', 'The map <span class="x-msg-hl">' + mn + '</span> (<span class="x-msg-hl">' + mlp + '</span>) was deleted.');
                     
                     
                     
@@ -1793,7 +1792,7 @@
                         } 
                     });
 					
-					if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
+					if (MAPSOURCE == map_source_type_geojson) {
 						Ext.Ajax.request({
 							url: path + 'getGeoJson' + type,
 							method: 'POST',
@@ -1822,7 +1821,7 @@
 							failure: function() {}
 						});
 					}
-					else if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+					else if (MAPSOURCE == map_source_type_shapefile) {
 						Ext.Ajax.request({
 							url: path_geoserver + wfs + mlp + output,
 							method: 'POST',
@@ -1988,7 +1987,7 @@
 		listeners: {
 			expand: {
 				fn: function() {
-					if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+					if (MAPSOURCE == map_source_type_shapefile) {
 						mapLayerPathComboBox.hide();
 						mapLayerPathWMSTextField.show();						
 					}
@@ -2236,22 +2235,22 @@
 					
 					for (i in mapLayers) {
 						if (mapLayers[i].name == mln) {
-							Ext.messageRed.msg('New overlay', 'The name ' + msg_highlight_start + mln + msg_highlight_end + ' is already in use.');
+							Ext.messageRed.msg('New overlay', 'The name <span class="x-msg-hl">' + mln + '</span> is already in use.');
 							return;
 						}
 					}
 			
-					var ms = MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON ? mlmsf : mlwmso;
+					var ms = MAPSOURCE == map_source_type_geojson ? mlmsf : mlwmso;
 					
 					Ext.Ajax.request({
 						url: path + 'addOrUpdateMapLayer' + type,
 						method: 'POST',
 						params: { name: mln, type: 'overlay', mapSource: ms, fillColor: mlfc, fillOpacity: mlfo, strokeColor: mlsc, strokeWidth: mlsw },
 						success: function( responseObject ) {
-							Ext.messageBlack.msg('New overlay', 'The overlay ' + msg_highlight_start + mln + msg_highlight_end + ' was registered.');
+							Ext.messageBlack.msg('New overlay', 'The overlay <span class="x-msg-hl">' + mln + '</span> was registered.');
 							Ext.getCmp('maplayer_cb').getStore().reload();
 					
-							var mapurl = MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON ? path + 'getGeoJson.action?name=' + mlmsf : path_geoserver + wfs + mlwmso + output;
+							var mapurl = MAPSOURCE == map_source_type_geojson ? path + 'getGeoJson.action?name=' + mlmsf : path_geoserver + wfs + mlwmso + output;
 							
 							MAP.addLayer(
 								new OpenLayers.Layer.Vector(mln, {
@@ -2303,7 +2302,7 @@
                 params: { id: ml },
 
                 success: function( responseObject ) {
-                    Ext.messageBlack.msg('Delete overlay', 'The overlay ' + msg_highlight_start + mln + msg_highlight_end + ' was deleted.');
+                    Ext.messageBlack.msg('Delete overlay', 'The overlay <span class="x-msg-hl">' + mln + '</span> was deleted.');
                     Ext.getCmp('maplayer_cb').getStore().reload();
                     Ext.getCmp('maplayer_cb').reset();
                 },
@@ -2394,11 +2393,11 @@
 		listeners: {
 			expand: {
 				fn: function() {
-					if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
+					if (MAPSOURCE == map_source_type_geojson) {
 						mapLayerMapSourceFileComboBox.show();
 						mapLayerPathWMSOverlayTextField.hide();
 					}
-					else if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+					else if (MAPSOURCE == map_source_type_shapefile) {
 						mapLayerMapSourceFileComboBox.hide();
 						mapLayerPathWMSOverlayTextField.show();
 					}
@@ -2446,7 +2445,7 @@
 						value: MAPSOURCE,
 						store: new Ext.data.SimpleStore({
 							fields: ['id', 'text'],
-							data: [[MAP_SOURCE_TYPE_GEOJSON, 'GeoJSON files'], [MAP_SOURCE_TYPE_SHAPEFILE, 'Shapefiles'], [MAP_SOURCE_TYPE_DATABASE, 'DHIS database']]
+							data: [[map_source_type_geojson, 'GeoJSON files'], [map_source_type_shapefile, 'Shapefiles'], [map_source_type_database, 'DHIS database']]
 						}),
 						listeners:{
 							'select': {
@@ -2455,7 +2454,7 @@
 									var msrw = Ext.getCmp('mapsource_cb').getRawValue();
 									
 									if (MAPSOURCE == msv) {
-										Ext.messageRed.msg('Map source', msg_highlight_start + msrw + msg_highlight_end + ' is already selected.');
+										Ext.messageRed.msg('Map source', '<span class="x-msg-hl">' + msrw + '</span> is already selected.');
 									}
 									else {
 										Ext.Ajax.request({
@@ -2475,25 +2474,25 @@
 												Ext.getCmp('map_cb').reset();
 												Ext.getCmp('mapview_cb').reset();
 												
-												if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
-													Ext.getCmp('register_chb').enable();
-													
-													if (Ext.getCmp('register_chb').checked) {
-														mapping.show();
-														shapefilePanel.show();
-														mapLayerPanel.show();
-													}
-												}
-												else if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
-													Ext.getCmp('register_chb').enable();
-													
-													if (Ext.getCmp('register_chb').checked) {
-														mapping.show();
-														shapefilePanel.show();
-														mapLayerPanel.show();
-													}
-												}
-												else if (MAPSOURCE == MAP_SOURCE_TYPE_DATABASE) {
+												if (MAPSOURCE == map_source_type_geojson) {
+													Ext.getCmp('register_chb').enable();
+													
+													if (Ext.getCmp('register_chb').checked) {
+														mapping.show();
+														shapefilePanel.show();
+														mapLayerPanel.show();
+													}
+												}
+												else if (MAPSOURCE == map_source_type_shapefile) {
+													Ext.getCmp('register_chb').enable();
+													
+													if (Ext.getCmp('register_chb').checked) {
+														mapping.show();
+														shapefilePanel.show();
+														mapLayerPanel.show();
+													}
+												}
+												else if (MAPSOURCE == map_source_type_database) {
 													Ext.getCmp('register_chb').disable();
 													
 													mapping.hide();
@@ -2508,7 +2507,7 @@
 												}
 												addOverlaysToMap();
 												
-												Ext.messageBlack.msg('Map source', msg_highlight_start + msrw + msg_highlight_end + ' is saved as map source.');
+												Ext.messageBlack.msg('Map source', '<span class="x-msg-hl">' + msrw + '</span> is saved as map source.');
 											},
 											failure: function() {
 												alert( 'Status', 'Error while saving data' );
@@ -2607,7 +2606,7 @@
 								
 								success: function() {
 									BASECOORDINATE = {longitude:blo, latitude:bla};
-									Ext.messageBlack.msg('Base coordinate','Longitude ' + msg_highlight_start + blo + msg_highlight_end + ' and latitude ' + msg_highlight_start + bla + msg_highlight_end + ' was saved as base coordinate');
+									Ext.messageBlack.msg('Base coordinate','Longitude <span class="x-msg-hl">' + blo + '</span> and latitude <span class="x-msg-hl">' + bla + '</span> was saved as base coordinate');
 									Ext.getCmp('newlongitude_cb').getStore().reload();
 									Ext.getCmp('newlongitude_cb').setValue(blo);
 									Ext.getCmp('newlatitude_cb').setValue(bla);
@@ -2627,10 +2626,10 @@
         listeners: {
             expand: {
                 fn: function() {
-                    if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
+                    if (MAPSOURCE == map_source_type_geojson) {
                         Ext.getCmp('register_chb').enable();
                     }
-                    else if (MAPSOURCE == MAP_SOURCE_TYPE_DATABASE) {
+                    else if (MAPSOURCE == map_source_type_database) {
                         Ext.getCmp('register_chb').disable();
                     }
 					
@@ -2680,7 +2679,7 @@
 				var mapLayers = Ext.util.JSON.decode(responseObject.responseText).mapLayers;
 				
 				for (var i = 0; i < mapLayers.length; i++) {
-					var mapurl = MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON ? path + 'getGeoJson.action?name=' + mapLayers[i].mapSource : path_geoserver + wfs + mapLayers[i].mapSource + output;
+					var mapurl = MAPSOURCE == map_source_type_geojson ? path + 'getGeoJson.action?name=' + mapLayers[i].mapSource : path_geoserver + wfs + mapLayers[i].mapSource + output;
 					var fillColor = mapLayers[i].fillColor;
 					var fillOpacity = parseFloat(mapLayers[i].fillOpacity);
 					var strokeColor = mapLayers[i].strokeColor;
@@ -3210,7 +3209,7 @@
 		
             MAPDATA = Ext.util.JSON.decode(responseObject.responseText).map[0];
             
-            if (MAPSOURCE == MAP_SOURCE_TYPE_DATABASE) {
+            if (MAPSOURCE == map_source_type_database) {
                 MAPDATA.name = Ext.getCmp('map_cb').getRawValue();
                 MAPDATA.organisationUnit = 'Country';
                 MAPDATA.organisationUnitLevel = Ext.getCmp('map_cb').getValue();
@@ -3219,7 +3218,7 @@
                 MAPDATA.latitude = BASECOORDINATE.latitude;
                 MAPDATA.zoom = 7;
             }
-            else if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON || MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+            else if (MAPSOURCE == map_source_type_geojson || MAPSOURCE == map_source_type_shapefile) {
                 MAPDATA.organisationUnitLevel = parseFloat(MAPDATA.organisationUnitLevel);
                 MAPDATA.longitude = parseFloat(MAPDATA.longitude);
                 MAPDATA.latitude = parseFloat(MAPDATA.latitude);
@@ -3259,8 +3258,8 @@
     var periodId = Ext.getCmp('period_cb').getValue();
     var mapLayerPath = MAPDATA.mapLayerPath;
 	
-	var url = MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON || MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE ? 'getMapValuesByMap' : 'getMapValuesByLevel';
-	var params = MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON || MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE ? { indicatorId: indicatorId, periodId: periodId, mapLayerPath: mapLayerPath } : { indicatorId: indicatorId, periodId: periodId, level: URL };
+	var url = MAPSOURCE == map_source_type_geojson || MAPSOURCE == map_source_type_shapefile ? 'getMapValuesByMap' : 'getMapValuesByLevel';
+	var params = MAPSOURCE == map_source_type_geojson || MAPSOURCE == map_source_type_shapefile ? { indicatorId: indicatorId, periodId: periodId, mapLayerPath: mapLayerPath } : { indicatorId: indicatorId, periodId: periodId, level: URL };
 
     Ext.Ajax.request({
         url: path + url + type,
@@ -3296,13 +3295,13 @@
 		}
 	}
 	
-	if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON || MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+	if (MAPSOURCE == map_source_type_geojson || MAPSOURCE == map_source_type_shapefile) {
 		for (var j = 0; j < features.length; j++) {
 			var featureId = features[j].attributes[nameColumn];
 			features[j].attributes.value = mv[featureId] ? mv[featureId] : 0;
 		}
 	}
-	else if (MAPSOURCE == MAP_SOURCE_TYPE_DATABASE) {
+	else if (MAPSOURCE == map_source_type_database) {
 		for (var i = 0; i < mapvalues.length; i++) {
 			for (var j = 0; j < features.length; j++) {
 				if (mapvalues[i].orgUnitName == features[j].attributes.name) {
@@ -3476,7 +3475,7 @@
 			MASK.msg = 'Applying organisation units relations...';
 			MASK.show();
 			
-            Ext.messageBlack.msg('Assign organisation units', '' + msg_highlight_start + count_match + msg_highlight_end + ' organisation units assigned.<br><br>Database: ' + msg_highlight_start + organisationUnits.length + msg_highlight_end + '<br>Shapefile: ' + msg_highlight_start + features.length + msg_highlight_end);
+            Ext.messageBlack.msg('Assign organisation units', '<span class="x-msg-hl">' + count_match + '</span> organisation units assigned.<br><br>Database: <span class="x-msg-hl">' + organisationUnits.length + '</span><br>Shapefile: <span class="x-msg-hl">' + features.length + '</span>');
             
             Ext.getCmp('grid_gp').getStore().reload();
             loadMapData(organisationUnitAssignment, position);

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css	2010-03-08 16:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css	2010-03-10 14:41:28 +0000
@@ -23,7 +23,7 @@
     margin:10px 0;
 }
 h3 {
-    font-size:16px;
+    font:16px;
     color:#111111;
     letter-spacing:1px;
 }
@@ -54,6 +54,7 @@
 }
 .msg .x-box-mc {
     font-size:14px;
+    color:#222;
     letter-spacing:1px;
 }
 #msg-div {

=== 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	2010-03-02 16:32:27 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-03-10 14:41:28 +0000
@@ -1,4 +1,4 @@
-    /*
+/*
  * Copyright (C) 2007-2008  Camptocamp
  *
  * This file is part of MapFish Client
@@ -714,7 +714,7 @@
             URL = this.newUrl;
             this.newUrl = false;
 				
-            if (MAPSOURCE == MAP_SOURCE_TYPE_DATABASE) {
+            if (MAPSOURCE == map_source_type_database) {
                 if (URL == FACILITY_LEVEL) {
                     this.setUrl(path + 'getPointShapefile.action?level=' + URL);
                 }
@@ -722,10 +722,10 @@
                     this.setUrl(path + 'getPolygonShapefile.action?level=' + URL);
                 }
             }
-            else if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
+            else if (MAPSOURCE == map_source_type_geojson) {
                 this.setUrl(path + 'getGeoJson.action?name=' + URL);
             }
-			else if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+			else if (MAPSOURCE == map_source_type_shapefile) {
 				this.setUrl(path_geoserver + wfs + URL + output);
 			}
         }

=== 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-03-09 17:15:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Mapping.js	2010-03-10 14:41:28 +0000
@@ -257,7 +257,7 @@
                             xtype: 'button',
                             id: 'autoassign_be',
                             text: 'Assign all',
-							cls: 'aa_dark',
+							cls: 'aa_med',
                             isVisible: false,
                             handler: function()
                             {
@@ -294,7 +294,7 @@
                                         Ext.getCmp('grid_gp').getStore().baseParams = { mapLayerPath: mlp, format: 'json' };
                                         Ext.getCmp('grid_gp').getStore().reload();
                                         
-                                        Ext.messageBlack.msg('Remove all relations', 'All relations for the map ' + msg_highlight_start + Ext.getCmp('maps_cb').getRawValue() + msg_highlight_end + ' removed.');
+                                        Ext.messageBlack.msg('Remove all relations', 'All relations for the map <span class="x-msg-hl">' + Ext.getCmp('maps_cb').getRawValue() + '</span> removed.');
                                         
                                         mapping.classify(true, true);
                                     },
@@ -336,7 +336,7 @@
 									msg = 'Selected relations removed.';
 								}
 								else {
-									msg = msg_highlight_start + selection[0].data['organisationUnit'] + msg_highlight_end + ' relation removed.'
+									msg = '<span class="x-msg-hl">' + selection[0].data['organisationUnit'] + '</span> relation removed.'
 								}
 								
 								params += '&mapLayerPath=' + mlp;
@@ -381,7 +381,7 @@
 												method: 'POST',
 												params: { mapLayerPath:mlp, organisationUnitId:id, featureId:mapping.relation },
 												success: function( responseObject ) {
-													Ext.messageBlack.msg('Assign organisation units', msg_highlight_start + mapping.relation + msg_highlight_end + ' (map) assigned to ' + msg_highlight_start + name + msg_highlight_end + ' (database).');
+													Ext.messageBlack.msg('Assign organisation units', '<span class="x-msg-hl">' + mapping.relation + '</span> (map) assigned to <span class="x-msg-hl">' + name + '</span> (database).');
 													Ext.getCmp('grid_gp').getStore().reload();
 													popup.hide();
 													loadMapData(organisationUnitAssignment, true);
@@ -392,7 +392,7 @@
 											});
 										}
 										else {
-											Ext.messageRed.msg('Assign organisation units', msg_highlight_start + name + msg_highlight_end + ' is already assigned.');
+											Ext.messageRed.msg('Assign organisation units', '<span class="x-msg-hl">' + name + '</span> is already assigned.');
 										}
 									}
 								});
@@ -468,10 +468,10 @@
             URL = this.newUrl;
             this.newUrl = false;
 			
-			if (MAPSOURCE == MAP_SOURCE_TYPE_GEOJSON) {
+			if (MAPSOURCE == map_source_type_geojson) {
 				this.setUrl(path + 'getGeoJson.action?name=' + URL);
 			}
-			else if (MAPSOURCE == MAP_SOURCE_TYPE_SHAPEFILE) {
+			else if (MAPSOURCE == map_source_type_shapefile) {
 				this.setUrl(path_geoserver + wfs + URL + output);
 			}
         }