dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01871
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 588: (GIS) Menu GUI make over. Panel names rephrased.
------------------------------------------------------------
revno: 588
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Sat 2009-09-05 17:12:07 +0700
message:
(GIS) Menu GUI make over. Panel names rephrased.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/config.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/index.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Mapping.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/mapping/script/config.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/config.js 2009-09-01 09:44:10 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/config.js 2009-09-05 10:12:07 +0000
@@ -37,9 +37,12 @@
gridpanel_height = 700;
combo_width = 150;
- MENU_TEXTCOLOR = '#686b72';
- MENU_TITLECOLOR = '#222';
- MENU_TITLECOLOR_ADMIN = '#666';
+ MENU_TEXTCOLOR = '#999';
+ MENU_TEXTCOLOR_INFO = '#555555';
+ MENU_TITLECOLOR_LIGHT = '#666';
+ MENU_TITLECOLOR_ADMIN = '#333';
+ MENU_EMPTYTEXT = '';
+ MENU_LABELSEPARATOR = '';
// Ext.message
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/index.js 2009-09-05 08:02:31 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/mapping/script/index.js 2009-09-05 10:12:07 +0000
@@ -230,7 +230,7 @@
return 530;
}
else {
- return 900;
+ return 850;
}
}
@@ -368,7 +368,7 @@
editable: false,
valueField: 'id',
displayField: 'name',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
@@ -385,7 +385,7 @@
editable: false,
valueField: 'id',
displayField: 'name',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
@@ -413,19 +413,19 @@
var newNameTextField = new Ext.form.TextField({
id: 'newname_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var editNameTextField = new Ext.form.TextField({
id: 'editname_tf',
- emptyText: '',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var mapLayerPathTextField = new Ext.form.TextField({
id: 'maplayerpath_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
@@ -434,6 +434,7 @@
editable: false,
displayField: 'name',
valueField: 'name',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width,
minListWidth: combo_width + 26,
triggerAction: 'all',
@@ -447,49 +448,49 @@
var newUniqueColumnTextField = new Ext.form.TextField({
id: 'newuniquecolumn_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var editUniqueColumnTextField = new Ext.form.TextField({
id: 'edituniquecolumn_tf',
- emptyText: '',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var newNameColumnTextField = new Ext.form.TextField({
id: 'newnamecolumn_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var editNameColumnTextField = new Ext.form.TextField({
id: 'editnamecolumn_tf',
- emptyText: '',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var newLongitudeTextField = new Ext.form.TextField({
id: 'newlongitude_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var editLongitudeTextField = new Ext.form.TextField({
id: 'editlongitude_tf',
- emptyText: '',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var newLatitudeTextField = new Ext.form.TextField({
id: 'newlatitude_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var editLatitudeTextField = new Ext.form.TextField({
id: 'editlatitude_tf',
- emptyText: '',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
@@ -732,7 +733,7 @@
editable: false,
valueField: 'level',
displayField: 'name',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
@@ -758,7 +759,7 @@
editable: false,
valueField: 'mapLayerPath',
displayField: 'name',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
@@ -803,7 +804,7 @@
editable: false,
valueField: 'mapLayerPath',
displayField: 'name',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
@@ -817,43 +818,43 @@
id: 'newmap_p',
items:
[
- /*{ html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Map type:</p>' }, typeComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Organisation unit level:</p>' }, newMapComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Organisation unit:</p>' }, multi, { html: '<br>' },*/
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Organisation unit level:</p>' }, organisationUnitLevelComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Map source file:</p>' }, mapLayerPathTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Display name:</p>' }, newNameTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Unique column:</p>' }, newUniqueColumnTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Name column:</p>' }, newNameColumnTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Longitude (x):</p>' }, newLongitudeTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Latitude (y):</p>' }, newLatitudeTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Zoom:</p>' }, newZoomComboBox
+ /*{ html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map type</p>' }, typeComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Organisation unit level</p>' }, newMapComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Organisation unit</p>' }, multi, { html: '<br>' },*/
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Organisation unit level</p>' }, organisationUnitLevelComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map source file</p>' }, mapLayerPathTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Display name</p>' }, newNameTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Unique column</p>' }, newUniqueColumnTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Name column</p>' }, newNameColumnTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Longitude (x)</p>' }, newLongitudeTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Latitude (y)</p>' }, newLatitudeTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Zoom</p>' }, newZoomComboBox
]
});
var editMapPanel = new Ext.Panel({
id: 'editmap_p',
items: [
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Choose a map:</p>' }, editMapComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Map name:</p>' }, editNameTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Unique column:</p>' }, editUniqueColumnTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Name column:</p>' }, editNameColumnTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Longitude:</p>' }, editLongitudeTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Latitude:</p>' }, editLatitudeTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Zoom:</p>' }, editZoomComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map</p>' }, editMapComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map name</p>' }, editNameTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Unique column</p>' }, editUniqueColumnTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Name column</p>' }, editNameColumnTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Longitude</p>' }, editLongitudeTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Latitude</p>' }, editLatitudeTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Zoom</p>' }, editZoomComboBox
]
});
var deleteMapPanel = new Ext.Panel({
id: 'deletemap_p',
items: [
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Choose a map:</p>' }, deleteMapComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map</p>' }, deleteMapComboBox
]
});
shapefilePanel = new Ext.Panel({
id: 'shapefile_p',
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_ADMIN + ';">Register shapefiles</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Register maps</font>',
items:
[
{
@@ -932,7 +933,7 @@
var legendSetNameTextField = new Ext.form.TextField({
id: 'legendsetname_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
@@ -942,7 +943,7 @@
valueField: 'value',
displayField: 'text',
mode: 'local',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
triggerAction: 'all',
width: combo_width,
minListWidth: combo_width + 26,
@@ -958,7 +959,7 @@
valueField: 'value',
displayField: 'value',
mode: 'local',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
triggerAction: 'all',
width: combo_width,
minListWidth: combo_width + 26,
@@ -1019,7 +1020,7 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
selectOnFocus: true,
width: combo_width,
minListWidth: combo_width + 26,
@@ -1107,14 +1108,14 @@
id: 'newlegendset_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Name:</p>' }, legendSetNameTextField, { html: '<br>' },
-/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Method:</p>' }, legendSetMethodComboBox, { html: '<br>' },*/
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Classes:</p>' }, legendSetClassesComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Lowest value color:</p>' }, legendSetLowColorColorPalette, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Highest value color:</p>' }, legendSetHighColorColorPalette, { html: '<br>' },
-/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Indicator group:</p>' }, legendSetIndicatorGroupComboBox, { html: '<br>' },*/
-/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Indicator:</p>' }, legendSetIndicatorComboBox*/
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Indicators:</p>' }, legendSetIndicatorMultiSelect
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Display name</p>' }, legendSetNameTextField, { html: '<br>' },
+/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Method</p>' }, legendSetMethodComboBox, { html: '<br>' },*/
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Classes</p>' }, legendSetClassesComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Lowest value color</p>' }, legendSetLowColorColorPalette, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Highest value color</p>' }, legendSetHighColorColorPalette, { html: '<br>' },
+/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Indicator group</p>' }, legendSetIndicatorGroupComboBox, { html: '<br>' },*/
+/* { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Indicator</p>' }, legendSetIndicatorComboBox*/
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Indicators</p>' }, legendSetIndicatorMultiSelect
]
});
@@ -1122,13 +1123,13 @@
id: 'deletelegendset_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Legend set:</p>' }, legendSetComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Legend set</p>' }, legendSetComboBox
]
});
var legendsetPanel = new Ext.Panel({
id: 'legendset_p',
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR + ';">Map legend sets</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Register legend sets</font>',
items:
[
{
@@ -1184,7 +1185,7 @@
var viewNameTextField = new Ext.form.TextField({
id: 'viewname_tf',
- emptyText: 'Required',
+ emptyText: '',
width: combo_width
});
@@ -1206,7 +1207,7 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
selectOnFocus: true,
width: combo_width,
minListWidth: combo_width + 26,
@@ -1222,7 +1223,7 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
selectOnFocus: true,
width: combo_width,
minListWidth: combo_width + 26,
@@ -1354,8 +1355,8 @@
id: 'newview_p',
items:
[
- { html: '<font color="' + MENU_TEXTCOLOR + '">Saving current thematic map selection.</font>' }, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Name:</p>' }, viewNameTextField
+ { html: '<font color="' + MENU_TEXTCOLOR_INFO + '">Saving current thematic map selection.</font>' }, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Display name</p>' }, viewNameTextField
]
});
@@ -1363,7 +1364,7 @@
id: 'deleteview_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">View:</p>' }, viewComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> View</p>' }, viewComboBox
]
});
@@ -1371,13 +1372,13 @@
id: 'dashboardview_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">View:</p>' }, view2ComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> View</p>' }, view2ComboBox
]
});
var viewPanel = new Ext.Panel({
id: 'view_p',
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR + ';">Map views</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Register views</font>',
items:
[
{
@@ -1456,17 +1457,17 @@
]
});
- /*MAP LAYER PANEL*/
+ /*OVERLAY PANEL*/
var mapLayerNameTextField = new Ext.form.TextField({
id: 'maplayername_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
var mapLayerMapSourceFileTextField = new Ext.form.TextField({
id: 'maplayermapsourcefile_tf',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
width: combo_width
});
@@ -1483,7 +1484,6 @@
valueField: 'value',
displayField: 'value',
mode: 'local',
- emptyText: 'Required',
triggerAction: 'all',
width: combo_width,
minListWidth: combo_width + 26,
@@ -1507,7 +1507,6 @@
valueField: 'value',
displayField: 'value',
mode: 'local',
- emptyText: 'Required',
triggerAction: 'all',
width: combo_width,
minListWidth: combo_width + 26,
@@ -1535,7 +1534,7 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
selectOnFocus: true,
width: combo_width,
minListWidth: combo_width + 26,
@@ -1544,7 +1543,7 @@
var newMapLayerButton = new Ext.Button({
id: 'newmaplayer_b',
- text: 'Register new map layer',
+ text: 'Register new overlay',
handler: function() {
var mln = Ext.getCmp('maplayername_tf').getRawValue();
var mlmsf = Ext.getCmp('maplayermapsourcefile_tf').getValue();
@@ -1554,12 +1553,12 @@
var mlsw = Ext.getCmp('maplayerstrokewidth_cb').getValue();
if (!mln || !mlmsf ) {
- Ext.messageRed.msg('New map layer', 'Map layer form is not complete.');
+ Ext.messageRed.msg('New overlay', 'Overlay form is not complete.');
return;
}
if (validateInput(mln) == false) {
- Ext.messageRed.msg('New map layer', 'Map layer name cannot be longer than 25 characters.');
+ Ext.messageRed.msg('New overlay', 'Overlay name cannot be longer than 25 characters.');
return;
}
@@ -1569,7 +1568,7 @@
params: { name: mln, type: 'overlay', mapSource: mlmsf, fillColor: mlfc, fillOpacity: mlfo, strokeColor: mlsc, strokeWidth: mlsw },
success: function( responseObject ) {
- Ext.messageBlack.msg('New map layer', 'The map layer ' + msg_highlight_start + mln + msg_highlight_end + ' was registered.');
+ Ext.messageBlack.msg('New overlay', 'The overlay ' + msg_highlight_start + mln + msg_highlight_end + ' was registered.');
Ext.getCmp('maplayer_cb').getStore().reload();
},
failure: function() {
@@ -1603,13 +1602,13 @@
var deleteMapLayerButton = new Ext.Button({
id: 'deletemaplayer_b',
- text: 'Delete map layer',
+ text: 'Delete overlay',
handler: function() {
var ml = Ext.getCmp('maplayer_cb').getValue();
var mln = Ext.getCmp('maplayer_cb').getRawValue();
if (!ml) {
- Ext.messageRed.msg('Delete map layer', 'Please select a map layer.');
+ Ext.messageRed.msg('Delete overlay', 'Please select an overlay.');
return;
}
@@ -1619,7 +1618,7 @@
params: { id: ml },
success: function( responseObject ) {
- Ext.messageBlack.msg('Delete map layer', 'The map layer ' + msg_highlight_start + mln + msg_highlight_end + ' was deleted.');
+ Ext.messageBlack.msg('Delete overlay', 'The overlay ' + msg_highlight_start + mln + msg_highlight_end + ' was deleted.');
Ext.getCmp('maplayer_cb').getStore().reload();
Ext.getCmp('maplayer_cb').reset();
},
@@ -1629,7 +1628,6 @@
});
map.getLayersByName(mln)[0].destroy();
- //map.removeLayer('Main roads');
}
});
@@ -1637,12 +1635,12 @@
id: 'newmaplayer_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Name:</p>' }, mapLayerNameTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Map source file:</p>' }, mapLayerMapSourceFileTextField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Fill color:</p>' }, mapLayerFillColorColorField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Fill opacity:</p>' }, mapLayerFillOpacityComboBox, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Stroke color:</p>' }, mapLayerStrokeColorColorField, { html: '<br>' },
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Stroke width:</p>' }, mapLayerStrokeWidthComboBox, { html: '<br>' }
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Display name</p>' }, mapLayerNameTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Map source file</p>' }, mapLayerMapSourceFileTextField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Fill color</p>' }, mapLayerFillColorColorField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Fill opacity</p>' }, mapLayerFillOpacityComboBox, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Stroke color</p>' }, mapLayerStrokeColorColorField, { html: '<br>' },
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Stroke width</p>' }, mapLayerStrokeWidthComboBox, { html: '<br>' }
]
});
@@ -1650,13 +1648,13 @@
id: 'deletemaplayer_p',
items:
[
- { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';">Map layer:</p>' }, mapLayerComboBox
+ { html: '<p style="padding-bottom:4px; color:' + MENU_TEXTCOLOR + ';"> Overlay</p>' }, mapLayerComboBox
]
});
var mapLayerPanel = new Ext.Panel({
id: 'maplayer_p',
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_ADMIN + ';">Map layers</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Register overlays</font>',
items:
[
{
@@ -1684,7 +1682,7 @@
items:
[
{
- title:'New map layer',
+ title:'New overlay',
id: 'maplayer0',
items:
[
@@ -1692,7 +1690,7 @@
]
},
{
- title:'Delete map layer',
+ title:'Delete overlay',
id: 'maplayer1',
items:
[
@@ -1720,12 +1718,12 @@
{
xtype: 'combo',
fieldLabel: 'Map source',
+ labelSeparator: MENU_LABELSEPARATOR,
id: 'mapsource_cb',
editable: false,
valueField: 'id',
displayField: 'text',
mode: 'local',
- emptyText: 'Required',
triggerAction: 'all',
width: 133,
minListWidth: combo_width,
@@ -1790,6 +1788,7 @@
xtype: 'checkbox',
id: 'register_chb',
fieldLabel: 'Admin panels',
+ labelSeparator: MENU_LABELSEPARATOR,
isFormField: true,
listeners: {
'check': {
@@ -1834,7 +1833,7 @@
id: 'choropleth',
map: map,
layer: choroplethLayer,
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR + ';">Thematic map</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Thematic map </font>',
//nameAttribute: 'NAME',
//indicators: [['value', 'Indicator']],
url: INIT_URL,
@@ -1858,7 +1857,7 @@
id: 'mapping',
map: map,
layer: choroplethLayer,
- title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_ADMIN + ';">Assign organisation units</font>',
+ title: '<font style="font-family:tahoma; font-weight:normal; font-size:11px; color:' + MENU_TITLECOLOR_LIGHT + ';">Link organisation units to map</font>',
//nameAttribute: 'NAME',
//indicators: [['value', 'Indicator']],
url: INIT_URL,
@@ -1919,7 +1918,7 @@
});
var zoomInButton = new Ext.Button({
- text: 'Zoom In',
+ text: 'Zoom in',
cls: 'x-btn-text-icon',
icon: '../images/zoom_in.png',
handler:function() {
@@ -1929,7 +1928,7 @@
});
var zoomOutButton = new Ext.Button({
- text: 'Zoom Out',
+ text: 'Zoom out',
cls: 'x-btn-text-icon',
icon: '../images/zoom_out.png',
handler:function() {
@@ -2197,8 +2196,12 @@
MAPDATA.latitude = parseFloat(MAPDATA.latitude);
MAPDATA.zoom = parseFloat(MAPDATA.zoom);
}
-
- map.panTo(new OpenLayers.LonLat(MAPDATA.longitude, MAPDATA.latitude), MAPDATA.zoom);
+
+ map.panTo(new OpenLayers.LonLat(MAPDATA.longitude, MAPDATA.latitude));
+
+ if (MAPDATA.zoom != map.getZoom()) {
+ map.zoomTo(MAPDATA.zoom);
+ }
if (redirect == 'choropleth') {
getChoroplethData(); }
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Choropleth.js 2009-08-26 18:59:56 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Choropleth.js 2009-09-05 10:12:07 +0000
@@ -318,6 +318,7 @@
triggerAction: 'all',
emptyText: 'Optional',
selectOnFocus: true,
+ labelSeparator: MENU_LABELSEPARATOR,
width: combo_width,
store: mapViewStore,
listeners: {
@@ -368,7 +369,8 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
selectOnFocus: true,
width: combo_width,
store: indicatorGroupStore,
@@ -400,7 +402,8 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
selectOnFocus: true,
width: combo_width,
store: indicatorStore,
@@ -453,7 +456,8 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
selectOnFocus: true,
width: combo_width,
store: periodTypeStore,
@@ -484,7 +488,8 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
selectOnFocus: true,
width: combo_width,
store: periodStore,
@@ -513,7 +518,8 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
selectOnFocus: true,
width: combo_width,
store: mapStore,
@@ -542,13 +548,14 @@
valueField: 'value',
displayField: 'text',
mode: 'local',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
+ labelSeparator: MENU_LABELSEPARATOR,
value: 1,
triggerAction: 'all',
width: combo_width,
store: new Ext.data.SimpleStore({
fields: ['value', 'text'],
- data: [[2, 'Distributed values'], [1, 'Equal intervals'], [0, 'Fixed bounds']]
+ data: [[1, 'Equal intervals'], [2, 'Distributed values'], [0, 'Fixed bounds']]
}),
listeners: {
'select': {
@@ -573,6 +580,7 @@
xtype: 'textfield',
id: 'bounds',
fieldLabel: 'Bounds',
+ labelSeparator: MENU_LABELSEPARATOR,
emptyText: 'Comma separated values',
isFormField: true,
width: combo_width,
@@ -582,6 +590,7 @@
{
xtype: 'combo',
fieldLabel: 'Classes',
+ labelSeparator: MENU_LABELSEPARATOR,
id: 'numClasses',
editable: false,
valueField: 'value',
@@ -611,6 +620,7 @@
{
xtype: 'colorfield',
fieldLabel: 'Low color',
+ labelSeparator: MENU_LABELSEPARATOR,
id: 'colorA_cf',
allowBlank: false,
isFormField: true,
@@ -621,6 +631,7 @@
{
xtype: 'colorfield',
fieldLabel: 'High color',
+ labelSeparator: MENU_LABELSEPARATOR,
id: 'colorB_cf',
allowBlank: false,
isFormField: true,
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Mapping.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Mapping.js 2009-09-05 08:02:31 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/resources/mapfish/widgets/geostat/Mapping.js 2009-09-05 10:12:07 +0000
@@ -201,8 +201,9 @@
mode: 'remote',
forceSelection: true,
triggerAction: 'all',
- emptyText: 'Required',
+ emptyText: MENU_EMPTYTEXT,
selectOnFocus: true,
+ labelSeparator: MENU_LABELSEPARATOR,
width: 133,
minListWidth: combo_width,
store: mapStore,
