Updated Branches: refs/heads/ui-new-project-switcher aa5ed0a0f -> c529c5a18
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/c529c5a1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c529c5a1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c529c5a1 Branch: refs/heads/ui-new-project-switcher Commit: c529c5a18d7f18a72cf2d2de6368526966a6ac3e Parents: aa5ed0a Author: Brian Federle <brian.fede...@citrix.com> Authored: Wed Apr 10 14:42:22 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Wed Apr 10 14:43:52 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/c529c5a1/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/c529c5a1/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));
