=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png	2011-05-25 10:07:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java	2011-02-01 13:27:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/export/SVGDocument.java	2011-05-24 11:16:04 +0000
@@ -101,7 +101,7 @@
         else if ( this.layer == 3 ) // Both layers
         {
             String heading = "<g id=\"heading\" style=\"display: block; visibility: visible;\"><text id=\"heading\" x=\"30\" y=\"50\" font-size=\"12\" font-weight=\"bold\"><tspan>"
-                + "Polygons</tspan></text></g>";
+                + "Layer 1</tspan></text></g>";
             
             String indicator_ = "<g id=\"indicator\" style=\"display: block; visibility: visible;\"><text id=\"indicator\" x=\"30\" y=\"65\" font-size=\"12\"><tspan>"
                 + StringEscapeUtils.escapeXml( this.indicator ) + "</tspan></text></g>";
@@ -117,7 +117,7 @@
             }
             
             String heading2 = "<g id=\"heading2\" style=\"display: block; visibility: visible;\"><text id=\"heading2\" x=\"30\" y=\"" + (120 + 15 * this.imageLegendRows) + "\" font-size=\"12\" font-weight=\"bold\"><tspan>"
-                + "Points</tspan></text></g>";
+                + "Layer 2</tspan></text></g>";
             
             String indicator2_ = "<g id=\"indicator2\" style=\"display: block; visibility: visible;\"><text id=\"indicator2\" x=\"30\" y=\"" + (135 + 15 * this.imageLegendRows) + "\" font-size=\"12\"><tspan>"
                 + StringEscapeUtils.escapeXml( this.indicator2 ) + "</tspan></text></g>";

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm	2011-05-24 09:49:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm	2011-05-25 10:34:19 +0000
@@ -3,7 +3,8 @@
 #foreach( $periodType in $object )
   {
     "id": "$!{periodType.id}",
-    "name": "$!encoder.jsonEncode( $i18n.getString($periodType.name) )"
+    "name": "$!encoder.jsonEncode( $periodType.name )",
+    "displayName": "$!encoder.jsonEncode( $i18n.getString($periodType.name) )"
   }#if( $velocityCount < $size ),#end
 #end
 ] }

=== 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	2011-05-19 12:31:31 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-05-25 10:07:22 +0000
@@ -209,7 +209,7 @@
 	background-image:url('../../../images/legendset.png');
 }
 .x-btn .icon-image {
-	background-image:url('../../../images/image2.png');
+	background-image:url('../../../images/export3.png');
 }
 .x-btn .icon-admin {
 	background-image:url('../../../images/gear.png');

=== 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	2011-05-24 09:49:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-05-25 10:34:19 +0000
@@ -137,7 +137,7 @@
     var periodTypeStore = new Ext.data.JsonStore({
         url: G.conf.path_mapping + 'getAllPeriodTypes' + G.conf.type,
         root: 'periodTypes',
-        fields: ['name'],
+        fields: ['name', 'displayName'],
         autoLoad: false,
         isLoaded: false,
         listeners: {
@@ -702,7 +702,7 @@
                             svg = document.getElementById(polygonLayer.svgId).parentNode.innerHTML;
                         }
                         else {
-                            Ext.message.msg(false, 'Polygon layer not rendered');
+                            Ext.message.msg(false, G.conf.thematic_layer_1 + ' not rendered');
                             return;
                         }
                     }
@@ -716,7 +716,7 @@
                             svg = document.getElementById(pointLayer.svgId).parentNode.innerHTML;
                         }
                         else {
-                            Ext.message.msg(false, 'Point layer not rendered');
+                            Ext.message.msg(false, G.conf.thematic_layer_2 + ' not rendered');
                             return;
                         }
                     }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js	2011-05-20 14:47:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js	2011-05-25 10:07:22 +0000
@@ -63,19 +63,13 @@
     createColorInterpolation: function() {
         var numColors = this.classification.bins.length;
 		var mapLegendType = this.widget.form.findField('maplegendtype').getValue();
-		
-		if (mapLegendType == G.conf.map_legend_type_automatic) {
-			this.colorInterpolation = mapfish.ColorRgb.getColorsArrayByRgbInterpolation(this.colors[0], this.colors[1], numColors);
-			for (var i = 0; i < this.widget.imageLegend.length && i < this.colorInterpolation.length; i++) {
-				this.widget.imageLegend[i].color = this.colorInterpolation[i].toHexString();
-			}
-		}
-		else if (mapLegendType == G.conf.map_legend_type_predefined) {
-			this.colorInterpolation = this.widget.colorInterpolation;
-			for (var j = 0; j < this.widget.imageLegend.length && j < this.colorInterpolation.length; j++) {
-				this.widget.imageLegend[j].color = this.colorInterpolation[j].toHexString();
-			}
-		}
+        
+        this.colorInterpolation = mapLegendType == G.conf.map_legend_type_automatic ?
+            mapfish.ColorRgb.getColorsArrayByRgbInterpolation(this.colors[0], this.colors[1], numColors) : this.widget.colorInterpolation;
+        
+        for (var i = 0; i < this.widget.imageLegend.length && i < this.colorInterpolation.length; i++) {
+            this.widget.imageLegend[i].color = this.colorInterpolation[i].toHexString();
+        }
     },
 
     setClassification: function() {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Point.js	2011-05-20 14:47:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Point.js	2011-05-25 10:13:10 +0000
@@ -63,19 +63,13 @@
     createColorInterpolation: function() {
         var numColors = this.classification.bins.length;
 		var mapLegendType = this.widget.form.findField('maplegendtype').getValue();
-		
-		if (mapLegendType == G.conf.map_legend_type_automatic) {
-			this.colorInterpolation = mapfish.ColorRgb.getColorsArrayByRgbInterpolation(this.colors[0], this.colors[1], numColors);
-			for (var i = 0; i < this.widget.imageLegend.length && i < this.colorInterpolation.length; i++) {
-				this.widget.imageLegend[i].color = this.colorInterpolation[i].toHexString();
-			}
-		}
-		else if (mapLegendType == G.conf.map_legend_type_predefined) {
-			this.colorInterpolation = this.widget.colorInterpolation;
-			for (var j = 0; j < this.widget.imageLegend.length && j < this.colorInterpolation.length; j++) {
-				this.widget.imageLegend[j].color = this.colorInterpolation[j].toHexString();
-			}
-		}
+        
+        this.colorInterpolation = mapLegendType == G.conf.map_legend_type_automatic ?
+            mapfish.ColorRgb.getColorsArrayByRgbInterpolation(this.colors[0], this.colors[1], numColors) : this.widget.colorInterpolation;
+        
+        for (var i = 0; i < this.widget.imageLegend.length && i < this.colorInterpolation.length; i++) {
+            this.widget.imageLegend[i].color = this.colorInterpolation[i].toHexString();
+        }
     },
 
     setClassification: function() {

=== 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	2011-05-24 09:49:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-05-25 10:34:19 +0000
@@ -476,7 +476,7 @@
             typeAhead: true,
             editable: false,
             valueField: 'name',
-            displayField: 'name',
+            displayField: 'displayName',
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',

=== 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	2011-05-20 15:38:01 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-05-25 10:34:19 +0000
@@ -447,7 +447,7 @@
             typeAhead: true,
             editable: false,
             valueField: 'name',
-            displayField: 'name',
+            displayField: 'displayName',
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',