Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 2645 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Wed 2011-01-19 19:06:36 +0100 message: (GIS) Fixed bug where legend value 0 was not allowed. modified: 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/script/index.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-01-19 10:23:43 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-01-19 18:05:00 +0000 @@ -801,7 +801,6 @@ layout: 'accordion', closeAction: 'hide', width: G.conf.window_width, - height: Ext.isChrome ? 348:346, items: [ { id: 'newpredefinedmaplegend_p', @@ -891,7 +890,7 @@ return; } - if (!mln || !mlsv || !mlev || !mlc) { + if (!mln || !mlc) { Ext.message.msg(false, G.i18n.form_is_not_complete); return; } @@ -2321,6 +2320,11 @@ 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; @@ -2357,7 +2361,7 @@ iconCls: 'icon-predefinedlegendset', tooltip: G.i18n.create_predefined_legend_sets, disabled: !G.user.isAdmin, - handler: function() { + handler: function() { var x = Ext.getCmp('center').x + 15; var y = Ext.getCmp('center').y + 41; predefinedMapLegendSetWindow.setPosition(x,y);
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp