diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-01 22:28:55 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-01 22:28:55 +0000 |
| commit | 96672deebfe1094bc118d0f82e354cba2ccd5c43 (patch) | |
| tree | b8a23368017c6e8cd1a6128f7b9cfe81fe0bcda1 | |
| parent | 3858e1a19f9b8331d01cc7ab45d28b5575c0e260 (diff) | |
| download | brdo-96672deebfe1094bc118d0f82e354cba2ccd5c43.tar.gz brdo-96672deebfe1094bc118d0f82e354cba2ccd5c43.tar.bz2 | |
#917220 by Everett Zufelt, mgifford: Invisible elements should appear before form elements.
| -rw-r--r-- | includes/form.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/form.test | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/form.inc b/includes/form.inc index 40fff1f25..faaa75d5f 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -3533,11 +3533,11 @@ function theme_form_element($variables) { switch ($element['#title_display']) { case 'before': + case 'invisible': $output .= ' ' . theme('form_element_label', $variables); $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n"; break; - case 'invisible': case 'after': $output .= ' ' . $prefix . $element['#children'] . $suffix; $output .= ' ' . theme('form_element_label', $variables) . "\n"; diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test index b38264a3f..70cf19b86 100644 --- a/modules/simpletest/tests/form.test +++ b/modules/simpletest/tests/form.test @@ -525,15 +525,15 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase { $elements = $this->xpath('//input[@id="edit-form-textfield-test-no-title-required"]/preceding-sibling::label[@for="edit-form-textfield-test-no-title-required"]/span[@class="form-required"]'); $this->assertTrue(isset($elements[0]), t("Label tag with required marker preceeds required textfield with no title.")); + $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]'); + $this->assertTrue(isset($elements[0]), t("Label preceeding field and label class is element-invisible.")); + $elements = $this->xpath('//input[@id="edit-form-textfield-test-title"]/preceding-sibling::span[@class="form-required"]'); $this->assertFalse(isset($elements[0]), t("No required marker on non-required field.")); $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-after"]/following-sibling::label[@for="edit-form-textfield-test-title-after" and @class="option"]'); $this->assertTrue(isset($elements[0]), t("Label after field and label option class correct for text field.")); - $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/following-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]'); - $this->assertTrue(isset($elements[0]), t("Label after field and label class is element-invisible.")); - $elements = $this->xpath('//label[@for="edit-form-textfield-test-title-no-show"]'); $this->assertFalse(isset($elements[0]), t("No label tag when title set not to display.")); |