dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1800
committer: Jan Henrik Øverland <janhov@janhov>
branch nick: gis
timestamp: Thu 2010-04-22 17:11:58 +0200
message:
  (GIS) Fixed bug when switching between legend types.
modified:
  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/resources/mapfish/widgets/geostat/Choropleth.js


--
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-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-04-19 15:50:11 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-04-22 15:11:58 +0000
@@ -1,4 +1,4 @@
-/* Gray-extend theme overrides */
+/* Gray-extend theme overrides */
 .ext-gecko .x-window-body .x-form-item {
 	overflow:hidden;
 }
@@ -156,7 +156,7 @@
 	padding:5px 11px 6px 32px;
 	background:#fbfbfb url('../../../images/loader.gif') no-repeat 5px 2px;
 	line-height:20px;
-	font:normal 10px lucida sans unicode;
+	font:normal 10px lucida sans unicode, arial;
 }
 
 /* Ext Window */

=== 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-04-19 15:34:23 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2010-04-22 15:11:58 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2007-2008  Camptocamp
  *
  * This file is part of MapFish Client
@@ -676,9 +676,15 @@
 							Ext.getCmp('maplegendset_cb').showField();
                         }
                         else if (Ext.getCmp('maplegendtype_cb').getValue() == map_legend_type_automatic) {
-                            Ext.getCmp('method').showField();
-							Ext.getCmp('bounds').hideField();
-                            Ext.getCmp('numClasses').showField();
+							Ext.getCmp('method').showField();
+							if (Ext.getCmp('method').getValue() == 0) {
+								Ext.getCmp('bounds').showField();
+								Ext.getCmp('numClasses').hideField();
+							}
+							else {
+								Ext.getCmp('bounds').hideField();
+								Ext.getCmp('numClasses').showField();
+							}
 							Ext.getCmp('colorA_cf').showField();
 							Ext.getCmp('colorB_cf').showField();
 							Ext.getCmp('maplegendset_cb').hideField();