From bf9c6341231cf2bc17895d54e41bc824eb742b7a Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Mon, 24 Aug 2009 03:11:34 +0000 Subject: #550572 by sun and c960657: Fixed CSS+JS regressions related to form-item-[name]. --- includes/form.inc | 4 ++-- modules/book/book.css | 2 +- modules/dblog/dblog-rtl.css | 2 +- modules/dblog/dblog.css | 2 +- modules/locale/locale.css | 2 +- modules/openid/openid.css | 6 +++--- modules/openid/openid.js | 4 ++-- modules/system/system-rtl.css | 5 ----- modules/system/system.css | 5 ----- modules/system/system.js | 8 ++++---- modules/taxonomy/vocabulary.js | 4 ++-- 11 files changed, 17 insertions(+), 27 deletions(-) diff --git a/includes/form.inc b/includes/form.inc index f36da73ab..2256f4f05 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -2540,10 +2540,10 @@ function theme_form_element($element) { // Add element's #type and #name as class to aid with JS/CSS selectors. $class = array('form-item'); if (!empty($element['#type'])) { - $class[] = 'form-item-' . strtr($element['#type'], array('_' => '-')); + $class[] = 'form-type-' . strtr($element['#type'], '_', '-'); } if (!empty($element['#name'])) { - $class[] = strtr($element['#name'], array(' ' => '-', '_' => '-', '[' => '-', ']' => '')) . '-wrapper'; + $class[] = 'form-item-' . strtr($element['#name'], array(' ' => '-', '_' => '-', '[' => '-', ']' => '')); } $output = '
' . "\n"; diff --git a/modules/book/book.css b/modules/book/book.css index 757b4bdd2..e84f18e93 100644 --- a/modules/book/book.css +++ b/modules/book/book.css @@ -38,7 +38,7 @@ html.js #edit-book-pick-book { display: none; } -.form-item-book-bid-wrapper .description { +.form-item-book-bid .description { clear: both; } #book-admin-edit select { diff --git a/modules/dblog/dblog-rtl.css b/modules/dblog/dblog-rtl.css index 9684b54c5..995a044ea 100644 --- a/modules/dblog/dblog-rtl.css +++ b/modules/dblog/dblog-rtl.css @@ -1,6 +1,6 @@ /* $Id$ */ -.form-item-type-wrapper, .form-item-severity-wrapper { +.form-item-type, .form-item-severity { float: right; padding-right: 0; padding-left: .8em; diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css index 9f9a94d56..d8a5c9b9c 100644 --- a/modules/dblog/dblog.css +++ b/modules/dblog/dblog.css @@ -1,6 +1,6 @@ /* $Id$ */ -.form-item-type-wrapper, .form-item-severity-wrapper { +.form-item-type, .form-item-severity { float: left; /* LTR */ padding-right: .8em; /* LTR */ margin: 0.1em; diff --git a/modules/locale/locale.css b/modules/locale/locale.css index b6b89478e..3923f9ef3 100644 --- a/modules/locale/locale.css +++ b/modules/locale/locale.css @@ -5,7 +5,7 @@ text-decoration: line-through; } -.form-item-language-wrapper, .form-item-translation-wrapper, .form-item-group-wrapper { +.form-item-language, .form-item-translation, .form-item-group { float: left; /* LTR */ padding-right: .8em; /* LTR */ margin: 0.1em; diff --git a/modules/openid/openid.css b/modules/openid/openid.css index 99444707b..5d694a393 100644 --- a/modules/openid/openid.css +++ b/modules/openid/openid.css @@ -6,11 +6,11 @@ background-repeat: no-repeat; padding-left: 20px; } -div.form-item-openid-identifier-wrapper { +div.form-item-openid-identifier { display: block; } -html.js #user-login-form div.form-item-openid-identifier-wrapper, -html.js #user-login div.form-item-openid-identifier-wrapper { +html.js #user-login-form div.form-item-openid-identifier, +html.js #user-login div.form-item-openid-identifier { display: none; } html.js #user-login-form li.openid-link, diff --git a/modules/openid/openid.js b/modules/openid/openid.js index 152bf10cb..2f4dfe90d 100644 --- a/modules/openid/openid.js +++ b/modules/openid/openid.js @@ -3,8 +3,8 @@ Drupal.behaviors.openid = { attach: function (context) { - var loginElements = $('.form-item-name-wrapper, .form-item-pass-wrapper, li.openid-link'); - var openidElements = $('.form-item-openid-identifier-wrapper, li.user-link'); + var loginElements = $('.form-item-name, .form-item-pass, li.openid-link'); + var openidElements = $('.form-item-openid-identifier, li.user-link'); // This behavior attaches by ID, so is only valid once on a page. if (!$('#edit-openid-identifier.openid-processed').size() && $('#edit-openid-identifier').val()) { diff --git a/modules/system/system-rtl.css b/modules/system/system-rtl.css index 511143a04..21563a6ca 100644 --- a/modules/system/system-rtl.css +++ b/modules/system/system-rtl.css @@ -66,11 +66,6 @@ html.js fieldset.collapsed legend a { background-position: 98% 50%; } -div.teaser-button-wrapper { - float: left; - padding-right: 0; - padding-left: 5%; -} .teaser-checkbox div.form-item { float: left; margin: 0 0 0 5%; diff --git a/modules/system/system.css b/modules/system/system.css index 531ae65ed..fe9fa5d76 100644 --- a/modules/system/system.css +++ b/modules/system/system.css @@ -409,11 +409,6 @@ a.tabledrag-handle-hover .handle { .teaser-checkbox { padding-top: 1px; } -div.teaser-button-wrapper { - float: right; /* LTR */ - padding-right: 5%; /* LTR */ - margin: 0; -} .teaser-checkbox div.form-item { float: right; /* LTR */ margin: 0 5% 0 0; /* LTR */ diff --git a/modules/system/system.js b/modules/system/system.js index 7637109e4..e9c505de4 100644 --- a/modules/system/system.js +++ b/modules/system/system.js @@ -8,15 +8,15 @@ Drupal.hideEmailAdministratorCheckbox = function () { // Make sure the secondary box is shown / hidden as necessary on page load. if ($('#edit-update-status-module-1').is(':checked')) { - $('.update-status-module-2-wrapper').show(); + $('.form-item-update-status-module-2').show(); } else { - $('.update-status-module-2-wrapper').hide(); + $('.form-item-update-status-module-2').hide(); } // Toggle the display as necessary when the checkbox is clicked. $('#edit-update-status-module-1').change( function () { - $('.update-status-module-2-wrapper').toggle(); + $('.form-item-update-status-module-2').toggle(); }) }; @@ -196,7 +196,7 @@ Drupal.behaviors.machineReadableValue = { // Build selector for the machine readable name. var target = '#edit-' + settings.target; // Build selector for the wrapper element around the target field. - var wrapper = '.' + settings.target + '-wrapper'; + var wrapper = '.form-item-' + settings.target; // Do not process the element if we got an error or the given name and the // machine readable name are identical or the machine readable name is diff --git a/modules/taxonomy/vocabulary.js b/modules/taxonomy/vocabulary.js index 227f2b9cd..ff2fd667e 100644 --- a/modules/taxonomy/vocabulary.js +++ b/modules/taxonomy/vocabulary.js @@ -4,13 +4,13 @@ Drupal.behaviors.contentTypes = { attach: function () { if ($('#edit-machine-name').val() == $('#edit-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('#edit-machine-name').val() == '') { - $('#edit-machine-name-wrapper').hide(); + $('.form-item-machine-name').hide(); $('#edit-name').keyup(function () { var machine = $(this).val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_'); if (machine != '_' && machine != '') { $('#edit-machine-name').val(machine); $('#vocabulary-name-suffix').empty().append(' Machine name: ' + machine + ' [').append($('' + Drupal.t('Edit') + '').click(function () { - $('#edit-machine-name-wrapper').show(); + $('.form-item-machine-name').show(); $('#vocabulary-name-suffix').hide(); $('#edit-name').unbind('keyup'); return false; -- cgit v1.2.3