dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3686 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-20 14:10:39 +0200
message:
  Outdated code removed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.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/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-05-19 12:57:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-05-20 11:27:09 +0000
@@ -203,7 +203,7 @@
     please_select_a_legend: '$encoder.jsEscape($i18n.getString( 'please_select_a_legend' ) , "'")',
     legends: '$encoder.jsEscape($i18n.getString( 'legends' ) , "'")',
     overlapping_legends_are_not_allowed: '$encoder.jsEscape($i18n.getString( 'overlapping_legends_are_not_allowed' ) , "'")',
-    please_select_at_least_one_legend	: '$encoder.jsEscape($i18n.getString( 'please_select_at_least_one_legend' ) , "'")',
+    please_select_at_least_one_legend: '$encoder.jsEscape($i18n.getString( 'please_select_at_least_one_legend' ) , "'")',
     predefined_legend_sets: '$encoder.jsEscape($i18n.getString( 'predefined_legend_sets' ) , "'")',	
     assignment: '$encoder.jsEscape($i18n.getString( 'assignment' ) , "'")',	
     geoserver_shapefiles: '$encoder.jsEscape($i18n.getString( 'geoserver_shapefiles' ) , "'")',

=== 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-19 13:50:28 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-05-20 11:27:09 +0000
@@ -249,15 +249,6 @@
         }
     });
     
-	var wmsCapabilitiesStore = new GeoExt.data.WMSCapabilitiesStore({
-        url: G.conf.path_geoserver + G.conf.ows,
-        autoLoad: false,
-        isLoaded: false,
-        listeners: {
-            'load': G.func.storeLoadListener
-        }
-    });
-    
     var overlayStore = new Ext.data.JsonStore({
         url: G.conf.path_mapping + 'getMapLayersByType' + G.conf.type,
         baseParams: {type: G.conf.map_layer_type_overlay},
@@ -312,7 +303,6 @@
         organisationUnitLevel: organisationUnitLevelStore,
         organisationUnitsAtLevel: organisationUnitsAtLevelStore,
         geojsonFiles: geojsonFilesStore,
-        wmsCapabilities: wmsCapabilitiesStore,
         overlay: overlayStore,
         groupSet: groupSetStore,
         groupsByGroupSet: groupsByGroupSetStore