dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07415
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2107: (GIS) Layer options menu item order changed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2107 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-14 16:56:01 +0200
message:
(GIS) Layer options menu item order changed.
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/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 2010-09-14 14:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2010-09-14 14:54:37 +0000
@@ -112,7 +112,7 @@
background-image:url(../../../images/transparency.png);
}
.menu-layeroptions-labels {
- background-image:url(../../../images/labels3.png);
+ background-image:url(../../../images/labels.png);
}
.menu-layeroptions-wmslegend {
background-image:url(../../../images/wmslegend.png);
=== 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 2010-09-14 14:18:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-09-14 14:54:37 +0000
@@ -3034,7 +3034,6 @@
text: 'Opacity',
iconCls: 'menu-layeroptions-opacity',
menu: {
- iconCls: 'no-icon-menu',
items: [
{
text: '0.1',
@@ -3215,64 +3214,24 @@
floating: false,
items: [
{
- text: 'Opacity',
- iconCls: 'menu-layeroptions-opacity',
- menu: {
- iconCls: 'no-icon-menu',
- items: [
- {
- text: '0.1',
- iconCls: 'menu-layeroptions-opacity-10',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.1); } } }
- },
- {
- text: '0.2',
- iconCls: 'menu-layeroptions-opacity-20',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.2); } } }
- },
- {
- text: '0.3',
- iconCls: 'menu-layeroptions-opacity-30',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.3); } } }
- },
- {
- text: '0.4',
- iconCls: 'menu-layeroptions-opacity-40',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.4); } } }
- },
- {
- text: '0.5',
- iconCls: 'menu-layeroptions-opacity-50',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.5); } } }
- },
- {
- text: '0.6',
- iconCls: 'menu-layeroptions-opacity-60',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.6); } } }
- },
- {
- text: '0.7',
- iconCls: 'menu-layeroptions-opacity-70',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.7); } } }
- },
- {
- text: '0.8',
- iconCls: 'menu-layeroptions-opacity-80',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.8); } } }
- },
- {
- text: '0.9',
- iconCls: 'menu-layeroptions-opacity-90',
- listeners: { 'click': { fn: function() { layer.setOpacity(0.9); } } }
- },
- {
- text: '1.0',
- iconCls: 'menu-layeroptions-opacity-100',
- listeners: { 'click': { fn: function() { layer.setOpacity(1.0); } } }
+ text: 'Locate feature',
+ iconCls: 'menu-layeroptions-locate',
+ listeners: {
+ 'click': {
+ fn: function() {
+ if (layer.features.length > 0) {
+ locateFeatureWindow.setPagePosition(Ext.getCmp('east').x - 272, Ext.getCmp('center').y + 50);
+ locateFeatureWindow.show();
+ vectorLayerOptionsWindow.hide();
+ }
+ else {
+ Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
+ }
}
- ]
+ }
}
},
+
{
text: 'Show/hide labels',
iconCls: 'menu-layeroptions-labels',
@@ -3299,24 +3258,65 @@
}
}
},
+
{
- text: 'Locate feature',
- iconCls: 'menu-layeroptions-locate',
- listeners: {
- 'click': {
- fn: function() {
- if (layer.features.length > 0) {
- locateFeatureWindow.setPagePosition(Ext.getCmp('east').x - 272, Ext.getCmp('center').y + 50);
- locateFeatureWindow.show();
- vectorLayerOptionsWindow.hide();
- }
- else {
- Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
- }
+ text: 'Opacity',
+ iconCls: 'menu-layeroptions-opacity',
+ menu: {
+ items: [
+ {
+ text: '0.1',
+ iconCls: 'menu-layeroptions-opacity-10',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.1); } } }
+ },
+ {
+ text: '0.2',
+ iconCls: 'menu-layeroptions-opacity-20',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.2); } } }
+ },
+ {
+ text: '0.3',
+ iconCls: 'menu-layeroptions-opacity-30',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.3); } } }
+ },
+ {
+ text: '0.4',
+ iconCls: 'menu-layeroptions-opacity-40',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.4); } } }
+ },
+ {
+ text: '0.5',
+ iconCls: 'menu-layeroptions-opacity-50',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.5); } } }
+ },
+ {
+ text: '0.6',
+ iconCls: 'menu-layeroptions-opacity-60',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.6); } } }
+ },
+ {
+ text: '0.7',
+ iconCls: 'menu-layeroptions-opacity-70',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.7); } } }
+ },
+ {
+ text: '0.8',
+ iconCls: 'menu-layeroptions-opacity-80',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.8); } } }
+ },
+ {
+ text: '0.9',
+ iconCls: 'menu-layeroptions-opacity-90',
+ listeners: { 'click': { fn: function() { layer.setOpacity(0.9); } } }
+ },
+ {
+ text: '1.0',
+ iconCls: 'menu-layeroptions-opacity-100',
+ listeners: { 'click': { fn: function() { layer.setOpacity(1.0); } } }
}
- }
+ ]
}
- }
+ }
]
}
]
