You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/21 19:03:16 UTC
[05/49] git commit: updated refs/heads/marvin_refactor to 0b5fe9a
Project switcher: Add label
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50140735
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50140735
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50140735
Branch: refs/heads/marvin_refactor
Commit: 50140735c7cc584b052105df1d16f861bc080475
Parents: f51ccfc
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 14:42:22 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 14:42:22 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 9 ++++++++-
ui/scripts/ui-custom/projectSelect.js | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50140735/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bf3cfb5..61e5ab4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8913,6 +8913,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
padding: 9px 17px 0 0;
}
+.project-switcher label {
+ position: absolute;
+ top: -2px;
+ color: #FFFFFF;
+ font-size: 11px;
+}
+
.project-switcher select {
width: 100%;
font-size: 12px;
@@ -11390,7 +11397,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
border-bottom: 1px solid #FFFFFF;
height: 28px;
float: left;
- margin: 4px 13px 0 0;
+ margin: 5px 13px 0 0;
cursor: pointer;
/*+box-shadow:inset 0px 1px 1px #000000;*/
-moz-box-shadow: inset 0px 1px 1px #000000;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50140735/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index ae3d8f9..f93fefc 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -23,8 +23,9 @@
$('<option>').attr('value', 'basic').html(_l('Project 1')),
$('<option>').attr('value', 'advanced').html(_l('Project 2'))
);
+ var $label = $('<label>').html('Project:');
- $projectSelect.appendTo($projectSwitcher);
+ $projectSwitcher.append($label, $projectSelect);
$projectSwitcher.insertBefore($header.find('.region-switcher'));
});
}(jQuery, cloudStack));