You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/07/28 05:41:21 UTC
[10/13] git commit: CS-15325: Fix selected name of user from the drop
down list overlay.
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/0be4230f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0be4230f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0be4230f
Branch: refs/heads/master
Commit: 0be4230f91115a65d8fe8644b1fe50709a2114d9
Parents: 9d67ecd
Author: olgasmola <ol...@gmail.com>
Authored: Fri Jul 27 16:27:59 2012 +0300
Committer: chip.childers@gmail.com <ch...@gmail.com>
Committed: Fri Jul 27 23:37:45 2012 -0400
----------------------------------------------------------------------
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/0be4230f/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/0be4230f/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/0be4230f/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())