Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 3138 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Wed 2011-03-23 12:13:59 +0100 message: (GIS) East region panels made collapsible to save vertical space when needed. 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 2011-03-23 10:04:21 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-03-23 10:52:11 +0000 @@ -437,6 +437,9 @@ color:#111; margin-right:6px; } +#east { + width:200px; +} #overviewmap { height:97px; padding-top:0px; === 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:25:20 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-03-23 10:52:11 +0000 @@ -1985,6 +1985,7 @@ enableDD: false, bodyStyle: 'padding-bottom:5px;', rootVisible: false, + collapsible: true, root: { nodeType: 'async', children: [ @@ -2540,8 +2541,7 @@ id: 'east', collapsible: true, header: false, - width: 200, - margins: '0 5 0 5', + margins: '0 5px 0 5px', defaults: { border: true, frame: true @@ -2553,27 +2553,32 @@ { title: '<span class="panel-title">' + G.i18n.overview_map + '</span>', contentEl: 'overviewmap', - anchor: '100%' + anchor: '100%', + collapsible: true }, { title: '<span class="panel-title">'+ G.i18n.cursor_position +'</span>', contentEl: 'mouseposition', - anchor: '100%' + anchor: '100%', + collapsible: true }, { title: '<span class="panel-title">' + G.i18n.feature_data + '</span>', contentEl: 'featuredatatext', - anchor: '100%' + anchor: '100%', + collapsible: true }, { title: '<span class="panel-title">' + G.i18n.map_legend_polygon + '</span>', contentEl: 'polygonlegend', - anchor: '100%' + anchor: '100%', + collapsible: true }, { title: '<span class="panel-title">' + G.i18n.map_legend_point + '</span>', contentEl: 'pointlegend', - anchor: '100%' + anchor: '100%', + collapsible: true } ] },
_______________________________________________ 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