You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/01 00:32:15 UTC
[2/2] git commit: refs/heads/master - Regions UI: Show selected
region name in header
Updated Branches:
refs/heads/master 6f1989519 -> 558b808a1
Regions UI: Show selected region name in header
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/558b808a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/558b808a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/558b808a
Branch: refs/heads/master
Commit: 558b808a18d5af929d6611ada913e518511cde0f
Parents: c954d80
Author: Brian Federle <br...@citrix.com>
Authored: Thu Feb 28 15:31:52 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Feb 28 15:31:52 2013 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 22 +++++++++++++++++++---
ui/scripts/ui-custom/regions.js | 8 ++++++--
2 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/558b808a/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index d6eb08d..4d65586 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -11073,6 +11073,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
/*Regions*/
.region-switcher {
+ display: inline-block;
z-index: 2002;
position: relative;
background: url(../images/bg-gradients.png) 0px -1px;
@@ -11084,7 +11085,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
border-radius: 4px;
border-top: 1px solid #717171;
border-bottom: 1px solid #FFFFFF;
- width: 32px;
height: 28px;
float: left;
margin: 4px 13px 0 0;
@@ -11213,10 +11213,26 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
}
.region-switcher .icon {
+ display: inline-block;
+ float: left;
display: block;
- width: 100%;
- height: 100%;
+ width: 26px;
+ height: 26px;
background: url(../images/sprites.png) -15px -1313px;
+ position: absolute;
+}
+
+.region-switcher .title {
+ display: inline-block;
+ float: right;
+ padding: 9px 9px 0 34px;
+ color: #FFFFFF;
+ font-size: 12px;
+ font-weight: bold;
+ max-width: 67px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.region-switcher:hover,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/558b808a/ui/scripts/ui-custom/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
index 0249672..cd836f6 100644
--- a/ui/scripts/ui-custom/regions.js
+++ b/ui/scripts/ui-custom/regions.js
@@ -37,6 +37,10 @@
if (region.id == activeRegionID) {
$li.addClass('active');
+
+ $regionSwitcherButton.find('.title')
+ .html(_s(region.name))
+ .attr('title', _s(region.name));
}
$regionList.append($li);
@@ -62,7 +66,8 @@
var $regionSwitcherButton = $('<div>').addClass('region-switcher')
.attr('title', 'Select region')
.append(
- $('<span>').addClass('icon').html(' ')
+ $('<span>').addClass('icon').html(' '),
+ $('<span>').addClass('title').html('')
);
var closeRegionSelector = function(args) {
@@ -72,7 +77,6 @@
};
var switchRegion = function(url) {
-
closeRegionSelector({
complete: function() {
$('#container').prepend($('<div>').addClass('loading-overlay'));