Updated Branches: refs/heads/master 730f808d1 -> b7d68ac5d
CS-15325: Fix selected name of user from the drop down list overlay. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b7d68ac5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b7d68ac5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b7d68ac5 Branch: refs/heads/master Commit: b7d68ac5d5eb287a5b57694fa6ddf8fddb1b033c Parents: 730f808 Author: olgasmola <[email protected]> Authored: Fri Jul 27 16:27:59 2012 +0300 Committer: olgasmola <[email protected]> Committed: Fri Jul 27 16:27:59 2012 +0300 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 2 ++ ui/scripts/ui-custom/login.js | 19 +++++++++++++------ ui/scripts/ui/core.js | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b7d68ac5/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index a60e480..876d663 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -280,6 +280,8 @@ body.login { .login .fields .field label.error { color: #FF0000; float: right; + left: 204px; + top: 0; } .login .fields input { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b7d68ac5/ui/scripts/ui-custom/login.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js index 20e6abf..c092b82 100644 --- a/ui/scripts/ui-custom/login.js +++ b/ui/scripts/ui-custom/login.js @@ -53,7 +53,7 @@ $form.validate(); // Form label behavior - $inputs.bind('keydown keyup focus blur', function(event) { + $inputs.bind('keydown focus click blur', function(event) { var $target = $(event.target); var $label = $form.find('label').filter(function() { return $(this).attr('for') == $target.attr('name'); @@ -63,11 +63,16 @@ $label.hide(); return true; - } else { - if (!$target.val()) { + } else if (event.type == 'blur') { + if ($target.hasClass('first-input')) { + $target.removeClass('first-input'); + } + if (!$(this).val()) { $label.show(); - } else { - $label.hide(); + } + } else { + if (!$target.hasClass('first-input')) { + $label.hide(); } } @@ -79,11 +84,13 @@ // Labels cause related input to be focused $login.find('label').click(function() { var $input = $inputs.filter('[name=' + $(this).attr('for') + ']'); + var $label = $(this); $input.focus(); + $label.hide(); }); - $inputs.filter(':first').focus(); + $inputs.filter(':first').addClass('first-input').focus(); // Login action $login.find('input[type=submit]').click(function() { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b7d68ac5/ui/scripts/ui/core.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js index b7ffdba..0c6b4e7 100644 --- a/ui/scripts/ui/core.js +++ b/ui/scripts/ui/core.js @@ -352,7 +352,7 @@ // Check if target should be hovered function checkHoveredLabel($target) { var $multiWizard = $('div.ui-dialog div.multi-wizard'); - if ($target.is('label[for]') || + if (($target.is('label[for]') && !$target.parents('body.login')) || ($multiWizard.size() && ($target.is('.multi-wizard label') && $target.prev('input[type="radio"],input[type="checkbox"]').size()) || ($target.is('.multi-wizard .select-desc div.name') && $target.parent('div.select-desc').prev('input[type="radio"],input[type="checkbox"]').size())
