CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - set current region (whose end point matches current URL) to region button and region dropdown on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d3a9995 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d3a9995 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d3a9995 Branch: refs/heads/marvin_refactor Commit: 4d3a9995fef40604aca0a50adebf83ddd01163bb Parents: 7c5f5c3 Author: Jessica Wang <[email protected]> Authored: Wed Mar 20 14:34:37 2013 -0700 Committer: Prasanna Santhanam <[email protected]> Committed: Sun Mar 31 22:02:00 2013 +0530 ---------------------------------------------------------------------- ui/scripts/regions.js | 3 +-- ui/scripts/ui-custom/regions.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d3a9995/ui/scripts/regions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js index 917b761..6e87c7f 100644 --- a/ui/scripts/regions.js +++ b/ui/scripts/regions.js @@ -29,8 +29,7 @@ data: regions ? regions : [ { id: -1, name: '(Default)' } ], - activeRegionID: cloudStack.context.users.regionid ? - cloudStack.context.users.regionid : 1 + activeRegionID: cloudStack.context.users[0].regionid }); } }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d3a9995/ui/scripts/ui-custom/regions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js index b29d914..611edda 100644 --- a/ui/scripts/ui-custom/regions.js +++ b/ui/scripts/ui-custom/regions.js @@ -29,6 +29,7 @@ var data = args.data; var activeRegionID = args.activeRegionID; + var currentRegion; $(data).each(function() { var region = this; var regionName = region.name; @@ -36,16 +37,20 @@ $li.data('region-data', region); + if(document.location.href == region.endpoint) { + currentRegion = region; + $li.addClass('active'); + } + /* if (region.id == activeRegionID) { $li.addClass('active'); } - - $regionSwitcherButton.find('.title') - .html(regionName) - .attr('title', regionName); - + */ + $regionList.append($li); }); + + $regionSwitcherButton.find('.title').html(_s(currentRegion.name)).attr('title', _s(currentRegion.name)); } } });
