From 99833c6289339e863a6e3b04432bf8f335351736 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 2 Dec 2009 15:09:16 +0000
Subject: - Patch #558928 by brandonojc, mgifford, Owen Barton, Everett Zufelt:
 improved consistency, flexibility and accessibility of form element labels.

---
 modules/system/system.api.php | 2 ++
 modules/system/system.module  | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index f85c014a1..202c08732 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -320,6 +320,8 @@ function hook_cron_queue_info() {
  *  - "#pre_render": array of callback functions taking $element and $form_state.
  *  - "#post_render": array of callback functions taking $element and $form_state.
  *  - "#submit": array of callback functions taking $form and $form_state.
+ *  - "#title_display": optional string indicating if and how #title should be
+ *    displayed, see theme_form_element() and theme_form_element_label().
  *
  * @see hook_element_info_alter()
  * @see system_element_info()
diff --git a/modules/system/system.module b/modules/system/system.module
index 0e801f802..429d45534 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -56,7 +56,6 @@ define('REGIONS_VISIBLE', 'visible');
  */
 define('REGIONS_ALL', 'all');
 
-
 /**
  * Implement hook_help().
  */
@@ -399,7 +398,7 @@ function system_element_info() {
     '#process' => array('ajax_process_form'),
     '#theme' => 'radio',
     '#theme_wrappers' => array('form_element'),
-    '#form_element_skip_title' => TRUE,
+    '#title_display' => 'after',
   );
   $types['checkboxes'] = array(
     '#input' => TRUE,
@@ -414,7 +413,7 @@ function system_element_info() {
     '#process' => array('ajax_process_form'),
     '#theme' => 'checkbox',
     '#theme_wrappers' => array('form_element'),
-    '#form_element_skip_title' => TRUE,
+    '#title_display' => 'after',
   );
   $types['select'] = array(
     '#input' => TRUE,
-- 
cgit v1.2.3