=== 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 @@
=== 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: '
' + G.i18n.overview_map + '',
- html:'
'
+ contentEl: 'overviewmap',
+ anchor: '100%'
},
{
title: '
'+ G.i18n.cursor_position +'',
contentEl: 'mouseposition',
- anchor: '100%'
+ anchor: '100%'
},
{
- xtype: 'panel',
title: '
' + G.i18n.feature_data + '',
- 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: '
' + G.i18n.map_legend_polygon + '',
- minHeight: 65,
- autoHeight: true,
contentEl: 'polygonlegendpanel',
anchor: '100%',
+ minHeight: 65,
+ autoHeight: true,
bodyStyle: 'padding-left: 4px;'
},
{
title: '
' + G.i18n.map_legend_point + '',
- 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('
' + feature.attributes.name + '
' + feature.attributes.value + '
', false);
+ document.getElementById('featuredatatext').innerHTML = '
' + feature.attributes.name + '
' + feature.attributes.value + '
';
}
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('
' + G.i18n.no_feature_selected + '', false);
+ document.getElementById('featuredatatext').innerHTML = '
' + G.i18n.no_feature_selected + '
';
}
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('
' + feature.attributes.name + '
' + feature.attributes.value + '
', false);
+ document.getElementById('featuredatatext').innerHTML = '
' + feature.attributes.name + '
' + feature.attributes.value + '
';
}
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('
' + G.i18n.no_feature_selected + '', false);
+ document.getElementById('featuredatatext').innerHTML = '
' + G.i18n.no_feature_selected + '';
}
else {
- Ext.getCmp('featureinfo_l').setText('', false);
+ document.getElementById('featuredatatext').innerHTML = '';
}
};