dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2005 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-06-18 15:10:43 +0200
message:
  (GIS) Bugfix + CSS adjustments.
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/mapping/script/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/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-04-22 17:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-06-18 13:09:04 +0000
@@ -11,6 +11,9 @@
 .x-panel-body {
 	border:0px;
 }
+.x-panel-tl {
+    padding-left: 8px;
+}
 .x-form-field {
 	font:10px lucida sans unicode,arial,tahoma,helvetica,sans-serif;
 }
@@ -57,6 +60,12 @@
 	padding-left:21px;
 }
 
+/* OpenLayers overrides */
+
+div.olMapViewport {
+    border-top:1px solid #DDDDDD;
+}
+
 /* OpenLayers (include in lib)
 .olControlOverviewMapElement {
     -moz-border-radius:1em 0 0 0;

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-06-18 12:13:13 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-06-18 13:09:04 +0000
@@ -2849,7 +2849,12 @@
 	addOverlaysToMap();
     
     function showWMSLayerOptions(layer) {
+        if (Ext.getCmp('baselayeroptions_w')) {
+            Ext.getCmp('baselayeroptions_w').destroy();
+        }
+        
         var baseLayerOptionsWindow = new Ext.Window({
+            id: 'baselayeroptions_w',
             title: 'Options: <span style="font-weight:normal;">' + layer.name + '</span>',
             items: [
                 {
@@ -2947,7 +2952,12 @@
     }
     
     function showVectorLayerOptions(layer) {
+        if (Ext.getCmp('vectorlayeroptions_w')) {
+            Ext.getCmp('vectorlayeroptions_w').destroy();
+        }
+        
         var vectorLayerOptionsWindow = new Ext.Window({
+            id: 'vectorlayeroptions_w',
             title: 'Options: <span style="font-weight:normal;">' + layer.name + '</span>',
             items: [
                 {