[Commits] r954 - in apps/opengeo/geoexplorer/trunk/lib: . GeoExplorer/Full

[commits at geoext.org]

Author: dwins
Date: 2009-06-02 21:31:59 +0200 (Tue, 02 Jun 2009)
New Revision: 954

Modified:
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js
Log:
extractConfiguration update to handle the new style of basemap, textual UI changes.


Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js	2009-06-02 19:20:07 UTC (rev 953)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js	2009-06-02 19:31:59 UTC (rev 954)
@@ -190,7 +190,7 @@
         var basemaps = [];
 
         for (var i = 0, len = config.map.layers.length; i < len; i++) {
-            if (config.map.layers[i].isBaseLayer) {
+            if (config.map.layers[i].background) {
                 basemaps.push(config.map.layers[i]);
             } else {
                 datalayers.push(config.map.layers[i]);
@@ -207,7 +207,14 @@
             data: basemaps
         });
 
-        cbRenderer = function(value) {
+        var titleRenderer = function(value) {
+            var record = layerStore.getAt(layerStore.find("name", value));
+            console.log(record);
+            return record.get('title') || value;
+        };
+
+
+        var cbRenderer = function(value) {
             return '<input type="checkbox"' +
                 (value ? ' checked="checked"' : '') +
                 '></input>';
@@ -227,7 +234,8 @@
                 },{
                     header: 'Layer Name',
                     id: 'layer',
-                    dataIndex: 'name'
+                    dataIndex: 'name',
+                    renderer: titleRenderer
                 }
             ],
             autoExpandColumn:'layer',
@@ -240,12 +248,14 @@
             }
         });
 
-        radioRenderer = function(value) {
+        var radioRenderer = function(value) {
             return '<input type="radio"' +
                 (value ? ' checked="checked"' : '') +
                 '></input>';
         };
 
+        var layerStore = this.mapPanel.layers;
+
         var basegrid = new Ext.grid.GridPanel({
             store: basemapstore,
             region: 'east',
@@ -262,11 +272,12 @@
                 }, {
                     header: 'Layer Name',
                     id: 'layer',
-                    dataIndex: 'name'
+                    dataIndex: 'name',
+                    renderer: titleRenderer
                 }
             ],
             autoExpandColumn:'layer',
-            title: "Base",
+            title: "Base Layers",
             listeners: {
                 rowclick: function(grid, index, evt) {
                     var record = grid.getStore().getAt(index);
@@ -287,7 +298,7 @@
                     region: 'north',
                     cls: "gx-wizard-description",
                     border: false,
-                    html:'<p>Next, choose layers to include in the map:</p>'
+                    html:'<p>Choose layers to include in the map:</p>'
                 },
                 datagrid, 
                 basegrid

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-06-02 19:20:07 UTC (rev 953)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-06-02 19:31:59 UTC (rev 954)
@@ -1259,7 +1259,7 @@
                 var c = {
                     name: layerRecord.get("name"),
                     visibility: layer.getVisibility(),
-                    isBaseLayer: layer.isBaseLayer,
+                    background: layerRecord.get('background'),
                     ows: source.data.identifier
                 };