[Commits] r478 - in apps/opengeo/geoexplorer/trunk: . lib theme

[commits at geoext.org]

Author: dwins
Date: 2009-04-27 18:53:35 +0200 (Mon, 27 Apr 2009)
New Revision: 478

Added:
   apps/opengeo/geoexplorer/trunk/theme/ie.css
Modified:
   apps/opengeo/geoexplorer/trunk/debug.html
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
   apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
Log:
Fix up the scale overlay in IE


Modified: apps/opengeo/geoexplorer/trunk/debug.html
===================================================================
--- apps/opengeo/geoexplorer/trunk/debug.html	2009-04-27 15:52:09 UTC (rev 477)
+++ apps/opengeo/geoexplorer/trunk/debug.html	2009-04-27 16:53:35 UTC (rev 478)
@@ -18,6 +18,8 @@
 
         <!-- GeoExplorer resources -->
         <link rel="stylesheet" type="text/css" href="theme/geoexplorer.css" />
+        <!--[if IE]>
+        <link rel="stylesheet" type="text/css" href="theme/ie.css"/><![endif]-->
 
         <script type="text/javascript" src="lib/RowExpander.js"></script> 
         <script type="text/javascript" src="lib/CapabilitiesGrid.js"></script> 

Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-04-27 15:52:09 UTC (rev 477)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-04-27 16:53:35 UTC (rev 478)
@@ -420,9 +420,8 @@
 
     createMapOverlay: function() {
         var scaleLinePanel = new Ext.Panel({
-            cls: 'olControlScaleLine x-menu-list-item',
-            border: false,
-            bodyStyle: 'position: relative'
+            cls: 'olControlScaleLine overlay-element overlay-scaleline',
+            border: false
         });
 
         scaleLinePanel.on('render', function(){
@@ -445,7 +444,7 @@
             triggerAction: 'all',
             mode: 'local',
             store: zoomStore,
-            width: 90
+            width: 110
         });
 
         zoomSelector.on('select', function(combo, record, index) {
@@ -454,6 +453,11 @@
             this
         );
 
+        var zoomSelectorWrapper = new Ext.Panel({
+            items: [zoomSelector],
+            cls: 'overlay-element overlay-scalechooser',
+            border: false });
+
         this.map.events.register('zoomend', this, function() {
             var scale = zoomStore.queryBy(function(record){
                 return this.map.getZoom() == record.data.level;
@@ -471,15 +475,9 @@
         var mapOverlay = new Ext.Panel({
             // title: "Overlay",
             cls: 'map-overlay',
-            style: {
-                'z-index': 1000, 
-                position: 'absolute', 
-                right: 10, 
-                bottom: 10
-            },
             items: [
                 scaleLinePanel,
-                zoomSelector
+                zoomSelectorWrapper
             ]
         });
 

Modified: apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-04-27 15:52:09 UTC (rev 477)
+++ apps/opengeo/geoexplorer/trunk/theme/geoexplorer.css	2009-04-27 16:53:35 UTC (rev 478)
@@ -70,12 +70,25 @@
     font-weight: bold;
 }
 
-.map-overlay>div.x-panel-bwrap>div.x-panel-body>div {
+div.map-overlay {
+    z-index: 1000; 
+    position: absolute; 
+    right: 10px; 
+    bottom: 10px;
+}
+
+div.map-overlay div.overlay-element {
     display:inline;
-    float:left;
+    float: left;
     margin: 5px;
 }
 
+.overlay-scaleline {
+    bottom: 0px;
+    left: 0px;
+    margin-top: 0px;
+}
+
 /* Pan- and Zoom- Panel Styles*/
 
 .olControlPanPanel div {

Added: apps/opengeo/geoexplorer/trunk/theme/ie.css
===================================================================
--- apps/opengeo/geoexplorer/trunk/theme/ie.css	                        (rev 0)
+++ apps/opengeo/geoexplorer/trunk/theme/ie.css	2009-04-27 16:53:35 UTC (rev 478)
@@ -0,0 +1,12 @@
+div.map-overlay {
+    width: 240px;
+}
+
+.overlay-scalechooser {
+    width: 110px;
+}
+
+.overlay-scaleline {
+    width: 100px;
+    padding-bottom: 5px;
+}