dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3126 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-22 17:10:53 +0100
message:
  (GIS) Minor layout improvements.
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/index.html
  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	2011-03-22 13:49:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-22 16:09:51 +0000
@@ -35,6 +35,7 @@
 .x-tree-node-leaf .x-tree-node-icon {
     background-image:url("../../../images/settings_small.png");
     background-position:center center;
+    padding-right:1px;
 }
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc {
 	background-image:url(../../resources/ext-ux/theme/gray-extend-ux/btn.gif);
@@ -436,6 +437,12 @@
     color:#111;
     margin-right:6px;
 }
+#overviewmap {
+    height:97px;
+    padding-top:0px;
+}
 #mouseposition {
     line-height:12px;
+    padding:0px 4px;
+    height:31px;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-03-22 13:49:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-03-22 16:09:51 +0000
@@ -32,6 +32,10 @@
     
     <div id="south"></div>
     
+    
+        <div id="mouseposition"></div>
+    
+    
     <div id="polygonlegendpanel">
         <div id="polygonlegend"></div>
     </div>
@@ -39,10 +43,6 @@
     <div id="pointlegendpanel">
         <div id="pointlegend"></div>
     </div>
-    
-    <div id="position">
-        <div id="mouseposition"></div>
-    </div>
 	
     <form id="exportForm" method="post">
         <input type="hidden" id="titleField" name="title"/>

=== 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	2011-03-22 13:49:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-22 16:09:51 +0000
@@ -2552,14 +2552,12 @@
                     layerTree,
                     {
                         title: '<span class="panel-title">' + G.i18n.overview_map + '</span>',
-                        html:'<div id="overviewmap" style="height:97px; padding-top:0px;"></div>'
+                        html:'<div id="overviewmap"></div>'
                     },
                     {
                         title: '<span class="panel-title">'+ G.i18n.cursor_position +'</span>',
-                        height: 65,
-                        contentEl: 'position',
-                        anchor: '100%',
-                        bodyStyle: 'padding-left: 4px;'
+                        contentEl: 'mouseposition',
+                        anchor: '100%'
                     },
 					{
 						xtype: 'panel',
@@ -2672,6 +2670,7 @@
     }));
     
     G.vars.map.addControl(new OpenLayers.Control.OverviewMap({
+        autoActivate: true,
         div: $('overviewmap'),
         size: new OpenLayers.Size(188, 97),
         minRectSize: 0,