dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11152
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3140: (GIS) Cosmetic fixes. New icons added.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3140 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-03-23 17:21:17 +0100
message:
(GIS) Cosmetic fixes. New icons added.
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png
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
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png
--
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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png 2011-03-23 16:19:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png 2011-03-23 16:19:24 +0000 differ
=== 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-23 10:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-03-23 16:19:24 +0000
@@ -42,11 +42,13 @@
}
.x-toolbar .xtb-sep {
background-image:url(../../resources/ext-ux/theme/gray-extend-ux/grid-split.png);
- height:24px;
+ height:23px;
}
+
#map_tb .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar {
border:1px solid #bbbbbb;
border-bottom:1px solid #cccccc;
+ background-image:url(../../resources/ext-ux/theme/gray-extend-ux/bg2.png);;
}
.x-panel-tbar .x-toolbar {
padding:0;
@@ -188,46 +190,40 @@
font:normal 10px lucida sans unicode,ubuntu,arial;
}
.x-btn .icon-zoomin {
- background-image:url(../../../images/zoom_in.png);
+ background-image:url(../../../images/zoom_in2.png);
}
.x-btn .icon-zoomout {
- background-image:url(../../../images/zoom_out.png);
+ background-image:url(../../../images/zoom_out2.png);
}
.x-btn .icon-zoommin {
- background-image:url(../../../images/zoom_world.png);
-}
-.x-btn .icon-labels {
- background-image:url(../../../images/labels.png);
-}
-.x-btn .icon-image {
- background-image:url(../../../images/image.png);
-}
-.x-btn .icon-excel {
- background-image:url(../../../images/excel.gif);
-}
-.x-btn .icon-pdf {
- background-image:url(../../../images/pdf.png);
+ background-image:url(../../../images/zoom_world2.png);
+}
+.x-btn .icon-history {
+ background-image:url(../../../images/history2.png);
}
.x-btn .icon-favorite {
- background-image:url(../../../images/favorite_star.gif);
-}
-.x-btn .icon-automaticlegendset {
- background-image:url(../../../images/color_swatch2.png);
+ background-image:url(../../../images/favorite.png);
}
.x-btn .icon-predefinedlegendset {
- background-image:url(../../../images/color_swatch.png);
+ background-image:url(../../../images/legendset.png);
+}
+.x-btn .icon-image {
+ background-image:url(../../../images/image2.png);
+}
+.x-btn .icon-admin {
+ background-image:url(../../../images/gear.png);
}
.x-btn .icon-help {
- background-image:url(../../../images/help2.png);
-}
-.x-btn .icon-admin {
- background-image:url(../../../images/settings.png);
-}
-.x-btn .icon-history {
- background-image:url(../../../images/history.png);
+ background-image:url(../../../images/question.png);
}
.x-btn .icon-exit {
- background-image:url(../../../images/exit.png);
+ background-image:url(../../../images/exit2.png);
+}
+.x-btn .icon-overlay {
+ background-image:url(../../../images/overlay.png);
+}
+.x-btn .icon-labels {
+ background-image:url(../../../images/labels.png);
}
.x-btn .icon-add {
background-image:url(../../../images/add.png);
@@ -315,48 +311,37 @@
}
#window-favorites-title {
padding:0 0 3px 21px;
- background:url('../../../images/favorite_star.gif') no-repeat 0 0 transparent;
- font:bold 11px arial;
- color:#111;
-}
-#window-automaticlegendset-title {
- padding:0 0 3px 21px;
- background:url('../../../images/color_swatch2.png') no-repeat 0 0 transparent;
+ background:url('../../../images/favorite.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-predefinedlegendset-title {
padding:0 0 3px 21px;
- background:url('../../../images/color_swatch.png') no-repeat 0 0 transparent;
- font:bold 11px arial;
- color:#111;
-}
-#window-help-title {
- padding:0 0 3px 22px;
- background:url('../../../images/help.png') no-repeat 0 0 transparent;
+ background:url('../../../images/legendset.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-image-title {
padding:0 0 3px 21px;
- background:url('../../../images/image.png') no-repeat 0 0 transparent;
- font:bold 11px arial;
- color:#111;
-}
-#window-excel-title {
- padding:0 0 3px 21px;
- background:url('../../../images/excel.gif') no-repeat 0 0 transparent;
+ background:url('../../../images/image2.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-admin-title {
padding:0 0 3px 21px;
- background:url('../../../images/settings.png') no-repeat 0 0 transparent;
+ background:url('../../../images/gear.png') no-repeat 0 0 transparent;
+ font:bold 11px arial;
+ color:#111;
+}
+#window-help-title {
+ padding:0 0 3px 21px;
+ background:url('../../../images/question.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-maplayer-title {
- padding:0 0 3px 0px;
+ padding:0 0 3px 21px;
+ background:url('../../../images/overlay.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
=== 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-23 10:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-03-23 16:19:24 +0000
@@ -1982,8 +1982,8 @@
var layerTree = new Ext.tree.TreePanel({
title: '<span class="panel-title">' + G.i18n.map_layers + '</span>',
+ bodyStyle: 'padding-bottom:5px',
enableDD: false,
- bodyStyle: 'padding-bottom:5px;',
rootVisible: false,
collapsible: true,
root: {
@@ -2242,7 +2242,7 @@
xtype: 'button',
id: 'overlays_b',
text: 'Overlays',
- iconCls: 'icon-add',
+ iconCls: 'icon-overlay',
handler: function() {
Ext.getCmp('overlays_w').setPagePosition(Ext.getCmp('east').x - (G.conf.window_width + 15 + 5), Ext.getCmp('center').y + 41);
Ext.getCmp('overlays_w').show();
@@ -2259,7 +2259,16 @@
title: '<span class="panel-title">' + G.i18n.polygon_layer + '</span>',
featureSelection: false,
legendDiv: 'polygonlegend',
- defaults: {width: 130},
+ defaults: {width: 130},
+ tools: [
+ {
+ id: 'refresh',
+ handler: function() {
+ choropleth.updateValues = true;
+ choropleth.classify();
+ }
+ }
+ ],
listeners: {
'expand': function() {
G.vars.activePanel.setPolygon();
@@ -2278,6 +2287,15 @@
featureSelection: false,
legendDiv: 'pointlegend',
defaults: {width: 130},
+ tools: [
+ {
+ id: 'refresh',
+ handler: function() {
+ symbol.updateValues = true;
+ symbol.classify();
+ }
+ }
+ ],
listeners: {
'expand': function() {
G.vars.activePanel.setPoint();
@@ -2303,6 +2321,7 @@
var zoomInButton = new Ext.Button({
iconCls: 'icon-zoomin',
tooltip: G.i18n.zoom_in,
+ style: 'margin-top:1px',
handler: function() {
G.vars.map.zoomIn();
}
@@ -2311,6 +2330,7 @@
var zoomOutButton = new Ext.Button({
iconCls: 'icon-zoomout',
tooltip: G.i18n.zoom_out,
+ style: 'margin-top:1px',
handler:function() {
G.vars.map.zoomOut();
}
@@ -2319,6 +2339,7 @@
var zoomToVisibleExtentButton = new Ext.Button({
iconCls: 'icon-zoommin',
tooltip: G.i18n.zoom_to_visible_extent,
+ style: 'margin-top:1px',
handler: function() {
if (G.vars.activePanel.isPolygon()) {
if (choropleth.layer.getDataExtent()) {
@@ -2332,95 +2353,12 @@
}
}
});
-
- var favoritesButton = new Ext.Button({
- iconCls: 'icon-favorite',
- tooltip: G.i18n.favorite_map_views,
- handler: function() {
- var x = Ext.getCmp('center').x + 15;
- var y = Ext.getCmp('center').y + 41;
- favoriteWindow.setPosition(x,y);
-
- if (favoriteWindow.visible) {
- favoriteWindow.hide();
- }
- else {
- favoriteWindow.show();
- }
- }
- });
-
- var exportImageButton = new Ext.Button({
- iconCls: 'icon-image',
- tooltip: G.i18n.export_map_as_image,
- handler: function() {
- if (Ext.isIE) {
- Ext.message.msg(false, 'SVG not supported by browser');
- return;
- }
-
- var x = Ext.getCmp('center').x + 15;
- var y = Ext.getCmp('center').y + 41;
-
- exportImageWindow.setPosition(x,y);
-
- if (exportImageWindow.visible) {
- exportImageWindow.hide();
- }
- else {
- exportImageWindow.show();
- }
- }
- });
-
- var predefinedMapLegendSetButton = new Ext.Button({
- iconCls: 'icon-predefinedlegendset',
- tooltip: G.i18n.create_predefined_legend_sets,
- disabled: !G.user.isAdmin,
- handler: function() {
- var x = Ext.getCmp('center').x + 15;
- var y = Ext.getCmp('center').y + 41;
- predefinedMapLegendSetWindow.setPosition(x,y);
-
- if (predefinedMapLegendSetWindow.visible) {
- predefinedMapLegendSetWindow.hide();
- }
- else {
- predefinedMapLegendSetWindow.show();
- if (!G.stores.predefinedMapLegend.isLoaded) {
- G.stores.predefinedMapLegend.load();
- }
- }
- }
- });
-
- var adminButton = new Ext.Button({
- iconCls: 'icon-admin',
- tooltip: 'Administrator settings',
- disabled: !G.user.isAdmin,
- handler: function() {
- var x = Ext.getCmp('center').x + 15;
- var y = Ext.getCmp('center').y + 41;
- adminWindow.setPosition(x,y);
- adminWindow.show();
- }
- });
-
- var helpButton = new Ext.Button({
- iconCls: 'icon-help',
- tooltip: G.i18n.help,
- handler: function() {
- var c = Ext.getCmp('center').x;
- var e = Ext.getCmp('east').x;
- helpWindow.setPagePosition(c+((e-c)/2)-280, Ext.getCmp('east').y + 100);
- helpWindow.show();
- }
- });
var viewHistoryButton = new Ext.Button({
id: 'viewhistory_b',
iconCls: 'icon-history',
tooltip: G.i18n.history,
+ style: 'margin-top:1px',
addMenu: function() {
this.menu = new Ext.menu.Menu({
id: 'viewhistory_m',
@@ -2490,11 +2428,101 @@
});
}
});
+
+ var favoritesButton = new Ext.Button({
+ iconCls: 'icon-favorite',
+ tooltip: G.i18n.favorite_map_views,
+ style: 'margin-top:1px',
+ handler: function() {
+ var x = Ext.getCmp('center').x + 15;
+ var y = Ext.getCmp('center').y + 41;
+ favoriteWindow.setPosition(x,y);
+
+ if (favoriteWindow.visible) {
+ favoriteWindow.hide();
+ }
+ else {
+ favoriteWindow.show();
+ }
+ }
+ });
+
+ var exportImageButton = new Ext.Button({
+ iconCls: 'icon-image',
+ tooltip: G.i18n.export_map_as_image,
+ style: 'margin-top:1px',
+ handler: function() {
+ if (Ext.isIE) {
+ Ext.message.msg(false, 'SVG not supported by browser');
+ return;
+ }
+
+ var x = Ext.getCmp('center').x + 15;
+ var y = Ext.getCmp('center').y + 41;
+
+ exportImageWindow.setPosition(x,y);
+
+ if (exportImageWindow.visible) {
+ exportImageWindow.hide();
+ }
+ else {
+ exportImageWindow.show();
+ }
+ }
+ });
+
+ var predefinedMapLegendSetButton = new Ext.Button({
+ iconCls: 'icon-predefinedlegendset',
+ tooltip: G.i18n.create_predefined_legend_sets,
+ disabled: !G.user.isAdmin,
+ style: 'margin-top:1px',
+ handler: function() {
+ var x = Ext.getCmp('center').x + 15;
+ var y = Ext.getCmp('center').y + 41;
+ predefinedMapLegendSetWindow.setPosition(x,y);
+
+ if (predefinedMapLegendSetWindow.visible) {
+ predefinedMapLegendSetWindow.hide();
+ }
+ else {
+ predefinedMapLegendSetWindow.show();
+ if (!G.stores.predefinedMapLegend.isLoaded) {
+ G.stores.predefinedMapLegend.load();
+ }
+ }
+ }
+ });
+
+ var adminButton = new Ext.Button({
+ iconCls: 'icon-admin',
+ tooltip: 'Administrator settings',
+ disabled: !G.user.isAdmin,
+ style: 'margin-top:1px',
+ handler: function() {
+ var x = Ext.getCmp('center').x + 15;
+ var y = Ext.getCmp('center').y + 41;
+ adminWindow.setPosition(x,y);
+ adminWindow.show();
+ }
+ });
+
+ var helpButton = new Ext.Button({
+ iconCls: 'icon-help',
+ tooltip: G.i18n.help,
+ style: 'margin-top:1px',
+ handler: function() {
+ var c = Ext.getCmp('center').x;
+ var e = Ext.getCmp('east').x;
+ helpWindow.setPagePosition(c+((e-c)/2)-280, Ext.getCmp('east').y + 100);
+ helpWindow.show();
+ }
+ });
var exitButton = new Ext.Button({
text: G.i18n.exit_gis,
iconCls: 'icon-exit',
tooltip: G.i18n.return_to_DHIS_2_dashboard,
+ style: 'margin-top:1px',
handler: function() {
window.location.href = '../../dhis-web-portal/redirect.action';
}
@@ -2507,7 +2535,7 @@
mapLabel,
' ',' ',' ',' ',' ',
zoomInButton,
- zoomOutButton, ' ',
+ zoomOutButton,
zoomToVisibleExtentButton,
viewHistoryButton,
'-',
@@ -2544,7 +2572,8 @@
margins: '0 5px 0 5px',
defaults: {
border: true,
- frame: true
+ frame: true,
+ collapsible: true
},
layout: 'anchor',
items:
@@ -2552,33 +2581,23 @@
layerTree,
{
title: '<span class="panel-title">' + G.i18n.overview_map + '</span>',
- contentEl: 'overviewmap',
- anchor: '100%',
- collapsible: true
+ contentEl: 'overviewmap'
},
{
title: '<span class="panel-title">'+ G.i18n.cursor_position +'</span>',
- contentEl: 'mouseposition',
- anchor: '100%',
- collapsible: true
+ contentEl: 'mouseposition'
},
{
title: '<span class="panel-title">' + G.i18n.feature_data + '</span>',
- contentEl: 'featuredatatext',
- anchor: '100%',
- collapsible: true
+ contentEl: 'featuredatatext'
},
{
title: '<span class="panel-title">' + G.i18n.map_legend_polygon + '</span>',
- contentEl: 'polygonlegend',
- anchor: '100%',
- collapsible: true
+ contentEl: 'polygonlegend'
},
{
title: '<span class="panel-title">' + G.i18n.map_legend_point + '</span>',
- contentEl: 'pointlegend',
- anchor: '100%',
- collapsible: true
+ contentEl: 'pointlegend'
}
]
},
@@ -2592,7 +2611,7 @@
width: G.conf.west_width,
minSize: 175,
maxSize: 500,
- margins: '0 0 0 5',
+ margins: '0 0 0 5px',
layout: 'accordion',
defaults: {
border: true,
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png 2011-03-23 16:19:24 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png 2010-12-09 20:23:56 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png 2011-03-23 16:19:24 +0000 differ
