dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3137 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-03-23 11:50:58 +0100
message:
  (GIS) Improved layout code.
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 16:15:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-23 10:04:21 +0000
@@ -451,3 +451,9 @@
     padding:0px 4px;
     height:31px;
 }
+#polygonlegend {
+    padding-left:4px;
+}
+#pointlegend {
+    padding-left:4px;
+}

=== 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 16:15:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2011-03-23 10:04:21 +0000
@@ -38,13 +38,9 @@
     
     <div id="featuredatatext"></div>
     
-    <div id="polygonlegendpanel">
-        <div id="polygonlegend"></div>
-    </div>
+    <div id="polygonlegend"></div>
     
-    <div id="pointlegendpanel">
-        <div id="pointlegend"></div>
-    </div>
+    <div id="pointlegend"></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 16:15:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-23 10:25:20 +0000
@@ -2567,19 +2567,13 @@
 					},
                     {
                         title: '<span class="panel-title">' + G.i18n.map_legend_polygon + '</span>',
-                        contentEl: 'polygonlegendpanel',
-                        anchor: '100%',
-                        minHeight: 65,
-                        autoHeight: true,
-						bodyStyle: 'padding-left: 4px;'
+                        contentEl: 'polygonlegend',
+                        anchor: '100%'
                     },
                     {
                         title: '<span class="panel-title">' + G.i18n.map_legend_point + '</span>',
-                        contentEl: 'pointlegendpanel',
-                        anchor: '100%',
-                        minHeight: 65,
-                        autoHeight: true,
-						bodyStyle: 'padding-left: 4px;'
+                        contentEl: 'pointlegend',
+                        anchor: '100%'
                     }
                 ]
             },
@@ -2647,7 +2641,9 @@
                 G.vars.map.events.register('addlayer', null, function(e) {
                     var svg = document.getElementsByTagName('svg');
                     e.layer.svgId = svg[svg.length-1].id;
-                });               
+                });
+                
+                document.getElementById('featuredatatext').innerHTML = '<div style="color:#666">' + G.i18n.no_feature_selected + '</div>';
             }
         }
     });