You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/03/02 02:01:28 UTC
[15/50] [abbrv] git commit: refs/heads/vim51_win8 - Regions UI: Show
(Default) in header if no regions are available
Regions UI: Show (Default) in header if no regions are available
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/260669ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/260669ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/260669ad
Branch: refs/heads/vim51_win8
Commit: 260669ad9eb581a8f5e9225cc25cf41160b7fc7d
Parents: 990071b
Author: Brian Federle <br...@citrix.com>
Authored: Thu Feb 28 16:01:55 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Feb 28 16:02:19 2013 -0800
----------------------------------------------------------------------
ui/scripts/regions.js | 2 +-
ui/scripts/ui-custom/regions.js | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/260669ad/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index f147df5..42a3e9d 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -27,7 +27,7 @@
args.response.success({
data: regions ? regions : [
- { id: -1, name: '(Default region)' }
+ { id: -1, name: '(Default)' }
],
activeRegionID: cloudStack.context.users.regionid ?
cloudStack.context.users.regionid : 1
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/260669ad/ui/scripts/ui-custom/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
index cd836f6..ac52776 100644
--- a/ui/scripts/ui-custom/regions.js
+++ b/ui/scripts/ui-custom/regions.js
@@ -31,18 +31,19 @@
$(data).each(function() {
var region = this;
+ var regionName = region.name;
var $li = $('<li>').append($('<span>').html(_s(region.name)));
$li.data('region-data', region);
if (region.id == activeRegionID) {
$li.addClass('active');
-
- $regionSwitcherButton.find('.title')
- .html(_s(region.name))
- .attr('title', _s(region.name));
}
+ $regionSwitcherButton.find('.title')
+ .html(regionName)
+ .attr('title', regionName);
+
$regionList.append($li);
});
}