[Commits] r853 - in apps/opengeo/geoexplorer/trunk: . lib lib/GeoExplorer/Embed lib/GeoExplorer/Full theme theme/img/silk

[commits at geoext.org]

Author: dwins
Date: 2009-05-22 22:33:48 +0200 (Fri, 22 May 2009)
New Revision: 853

Added:
   apps/opengeo/geoexplorer/trunk/theme/img/silk/help.png
Removed:
   apps/opengeo/geoexplorer/trunk/.project
Modified:
   apps/opengeo/geoexplorer/trunk/debug.html
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed/Embed.js
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js
   apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
Log:
More toolbar rearrangement for Full and Embedded explorers


Deleted: apps/opengeo/geoexplorer/trunk/.project
===================================================================
--- apps/opengeo/geoexplorer/trunk/.project	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/.project	2009-05-22 20:33:48 UTC (rev 853)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>geoexplorer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

Modified: apps/opengeo/geoexplorer/trunk/debug.html
===================================================================
--- apps/opengeo/geoexplorer/trunk/debug.html	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/debug.html	2009-05-22 20:33:48 UTC (rev 853)
@@ -28,7 +28,7 @@
 
         <script>
             Ext.BLANK_IMAGE_URL = "theme/img/blank.gif";
-            var app = new GeoExplorer({
+            var app = new GeoExplorer.Full({
                 ows: "/geoserver/ows",
                 map: {
                     layers: [{

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed/Embed.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed/Embed.js	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Embed/Embed.js	2009-05-22 20:33:48 UTC (rev 853)
@@ -124,7 +124,7 @@
         var updateLayerSwitcher = function() {
             menu.removeAll();
             menu.addItem(new Ext.menu.TextItem({
-            text: '<h3> <img height="24" width="48" src="http://www.google.com/logos/us_doodle4google09.gif"></img> Layers </h3>'
+            text: '<h3> Layers </h3>'
             }));
             this.mapPanel.layers.each(function(x) {
                 if (x.get("layer").displayInLayerSwitcher) {
@@ -145,7 +145,25 @@
             menu: menu
         });
 
+        tools.unshift("-");
         tools.unshift(layerChooser);
+
+        var aboutButton = new Ext.Button({
+            tooltip: "About this map",
+            iconCls: "icon-about",
+            handler: this.displayAppInfo
+        });
+
+        tools.push("->");
+        tools.push(new Ext.Button({
+            tooltip: "Bookmark",
+            handler: this.bookmark,
+            scope: this,
+            iconCls: "icon-save"
+        }));
+        // tools.push("-");
+        tools.push(aboutButton);
+
         return tools;
     }
 });

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer/Full/Full.js	2009-05-22 20:33:48 UTC (rev 853)
@@ -14,6 +14,13 @@
         });
 
         tools.unshift("-");
+        tools.unshift(new Ext.Button({
+            tooltip: "Bookmark",
+            handler: this.bookmark,
+            scope: this,
+            iconCls: "icon-save"
+        }));
+        tools.unshift("-");
         tools.unshift(aboutButton);
         return tools;
     }

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-22 20:33:48 UTC (rev 853)
@@ -657,13 +657,6 @@
 
         var tools = [
             new Ext.Button({
-                tooltip: "Bookmark",
-                handler: this.bookmark,
-                scope: this,
-                iconCls: "icon-save"
-            }),
-            "-",
-            new Ext.Button({
                 tooltip: "Pan Map",
                 iconCls: "icon-pan",
                 enableToggle: true,

Modified: apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-05-22 20:15:48 UTC (rev 852)
+++ apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-05-22 20:33:48 UTC (rev 853)
@@ -23,6 +23,10 @@
     background-image: url(img/geoexplorer.png);
 }
 
+.x-btn .icon-about {
+    background-image: url(img/silk/help.png);
+}
+
 .x-btn .icon-addlayers {
     background-image: url(img/silk/add.png);
 }

Added: apps/opengeo/geoexplorer/trunk/theme/img/silk/help.png
===================================================================
(Binary files differ)


Property changes on: apps/opengeo/geoexplorer/trunk/theme/img/silk/help.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream