dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11129
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3127: (GIS) Layout improvements.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3127 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-22 17:16:49 +0100
message:
(GIS) 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
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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:09:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-03-22 16:15:33 +0000
@@ -446,3 +446,8 @@
padding:0px 4px;
height:31px;
}
+#featuredatatext {
+ 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 16:09:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html 2011-03-22 16:15:33 +0000
@@ -32,9 +32,11 @@
<div id="south"></div>
-
- <div id="mouseposition"></div>
-
+ <div id="overviewmap"></div>
+
+ <div id="mouseposition"></div>
+
+ <div id="featuredatatext"></div>
<div id="polygonlegendpanel">
<div id="polygonlegend"></div>
=== 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:09:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-03-22 16:15:33 +0000
@@ -2552,41 +2552,33 @@
layerTree,
{
title: '<span class="panel-title">' + G.i18n.overview_map + '</span>',
- html:'<div id="overviewmap"></div>'
+ contentEl: 'overviewmap',
+ anchor: '100%'
},
{
title: '<span class="panel-title">'+ G.i18n.cursor_position +'</span>',
contentEl: 'mouseposition',
- anchor: '100%'
+ anchor: '100%'
},
{
- xtype: 'panel',
title: '<span class="panel-title">' + G.i18n.feature_data + '</span>',
- height: 65,
- anchor: '100%',
- bodyStyle: 'padding-left: 4px;',
- items: [
- new Ext.form.Label({
- id: 'featureinfo_l',
- text: G.i18n.no_feature_selected,
- style: 'color:#666666'
- })
- ]
+ contentEl: 'featuredatatext',
+ anchor: '100%'
},
{
title: '<span class="panel-title">' + G.i18n.map_legend_polygon + '</span>',
- minHeight: 65,
- autoHeight: true,
contentEl: 'polygonlegendpanel',
anchor: '100%',
+ minHeight: 65,
+ autoHeight: true,
bodyStyle: 'padding-left: 4px;'
},
{
title: '<span class="panel-title">' + G.i18n.map_legend_point + '</span>',
- minHeight: 65,
- autoHeight: true,
contentEl: 'pointlegendpanel',
anchor: '100%',
+ minHeight: 65,
+ autoHeight: true,
bodyStyle: 'padding-left: 4px;'
}
]
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-03-16 12:23:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-03-22 16:15:33 +0000
@@ -974,19 +974,19 @@
var onHoverSelect = function onHoverSelect(feature) {
if (feature.attributes.name) {
- Ext.getCmp('featureinfo_l').setText('<div style="color:black">' + feature.attributes.name + '</div><div style="color:#555">' + feature.attributes.value + '</div>', false);
+ document.getElementById('featuredatatext').innerHTML = '<div style="color:black">' + feature.attributes.name + '</div><div style="color:#555">' + feature.attributes.value + '</div>';
}
else {
- Ext.getCmp('featureinfo_l').setText('', false);
+ document.getElementById('featuredatatext').innerHTML = '';
}
};
var onHoverUnselect = function onHoverUnselect(feature) {
if (feature.attributes.name) {
- Ext.getCmp('featureinfo_l').setText('<span style="color:#666">' + G.i18n.no_feature_selected + '</span>', false);
+ document.getElementById('featuredatatext').innerHTML = '<div style="color:#666">' + G.i18n.no_feature_selected + '</div>';
}
else {
- Ext.getCmp('featureinfo_l').setText('', false);
+ document.getElementById('featuredatatext').innerHTML = '';
}
};
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-03-16 12:23:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-03-22 16:15:33 +0000
@@ -952,19 +952,19 @@
var onHoverSelect = function onHoverSelect(feature) {
if (feature.attributes.name) {
- Ext.getCmp('featureinfo_l').setText('<div style="color:black">' + feature.attributes.name + '</div><div style="color:#555">' + feature.attributes.value + '</div>', false);
+ document.getElementById('featuredatatext').innerHTML = '<div style="color:black">' + feature.attributes.name + '</div><div style="color:#555">' + feature.attributes.value + '</div>';
}
else {
- Ext.getCmp('featureinfo_l').setText('', false);
+ document.getElementById('featuredatatext').innerHTML = '';
}
};
var onHoverUnselect = function onHoverUnselect(feature) {
if (feature.attributes.name) {
- Ext.getCmp('featureinfo_l').setText('<span style="color:#666">' + G.i18n.no_feature_selected + '</span>', false);
+ document.getElementById('featuredatatext').innerHTML = '<span style="color:#666">' + G.i18n.no_feature_selected + '</span>';
}
else {
- Ext.getCmp('featureinfo_l').setText('', false);
+ document.getElementById('featuredatatext').innerHTML = '';
}
};
