From fff2f548ac77ac06da132edb013f2e7456cf4393 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 17 Nov 2003 19:16:55 +0000
Subject: - Improved form items: added <label> tags to improve accessibility
 and added   theme_form_element() function to improve themeability.  I left
 form_item()   and the calls to form_item() intact for now.

---
 includes/common.inc | 19 ++++++++++---------
 includes/theme.inc  | 13 +++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index d15c9f7a5..5c4835b19 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -813,34 +813,35 @@ function form($form, $method = "post", $action = 0, $options = 0) {
 }
 
 function form_item($title, $value, $description = 0) {
-  return "<div class=\"form-item\">". ($title ? "<div class=\"title\">$title:</div>" : "") . $value . ($description ? "<div class=\"description\">$description</div>" : "") ."</div>\n";
+  return theme("form_element", $title, $value, $description);
 }
+
 function form_group($legend, $group, $description = 0) {
   return "<fieldset>" . ($legend ? "<legend>$legend</legend>" : "") . $group . ($description ? "<div class=\"description\">$description</div>" : "") . "</fieldset>\n";
 }
 
 function form_radio($title, $name, $value = 1, $checked = 0, $description = 0, $attributes = 0) {
-  return form_item(0, "<input type=\"radio\" class=\"form-radio\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
+  return theme("form_element", 0, "<input type=\"radio\" class=\"form-radio\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
 }
 
 function form_checkbox($title, $name, $value = 1, $checked = 0, $description = 0, $attributes = 0) {
-  return form_hidden($name, 0) . form_item(0, "<input type=\"checkbox\" class=\"form-checkbox\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
+  return form_hidden($name, 0) . theme("form_element", 0, "<input type=\"checkbox\" class=\"form-checkbox\" name=\"edit[$name]\" value=\"". $value ."\"". ($checked ? " checked=\"checked\"" : "") . drupal_attributes($attributes) ." /> $title", $description);
 }
 
 function form_textfield($title, $name, $value, $size, $maxlength, $description = 0, $attributes = 0) {
   $size = $size ? " size=\"$size\"" : "";
-  return form_item($title, "<input type=\"text\" maxlength=\"$maxlength\" class=\"form-text\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\"". drupal_attributes($attributes) ." />", $description);
+  return theme("form_element", $title, "<input type=\"text\" maxlength=\"$maxlength\" class=\"form-text\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\"". drupal_attributes($attributes) ." />", $description);
 }
 
 function form_password($title, $name, $value, $size, $maxlength, $description = 0, $attributes = 0) {
   $size = $size ? " size=\"$size\"" : "";
-  return form_item($title, "<input type=\"password\" class=\"form-password\" maxlength=\"$maxlength\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\"". drupal_attributes($attributes) ." />", $description);
+  return theme("form_element", $title, "<input type=\"password\" class=\"form-password\" maxlength=\"$maxlength\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\"". drupal_attributes($attributes) ." />", $description);
 }
 
 function form_textarea($title, $name, $value, $cols, $rows, $description = 0, $attributes = 0) {
   $cols = $cols ? " cols=\"$cols\"" : "";
   module_invoke_all("textarea", $name);  // eg. optionally plug in a WYSIWYG editor
-  return form_item($title, "<textarea wrap=\"virtual\"$cols rows=\"$rows\" name=\"edit[$name]\" id=\"edit[$name]\"". drupal_attributes($attributes) .">". check_form($value) ."</textarea>", $description);
+  return theme("form_element", $title, "<textarea wrap=\"virtual\"$cols rows=\"$rows\" name=\"edit[$name]\" id=\"edit[$name]\"". drupal_attributes($attributes) .">". check_form($value) ."</textarea>", $description);
 }
 
 function form_select($title, $name, $value, $options, $description = 0, $extra = 0, $multiple = 0) {
@@ -848,7 +849,7 @@ function form_select($title, $name, $value, $options, $description = 0, $extra =
     foreach ($options as $key=>$choice) {
       $select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($value == $key ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
     }
-    return form_item($title, "<select name=\"edit[$name]". ($multiple ? "[]" : "") ."\"". ($multiple ? " multiple " : "") . ($extra ? " $extra" : "") .">$select</select>", $description);
+    return theme("form_element", $title, "<select name=\"edit[$name]". ($multiple ? "[]" : "") ."\"". ($multiple ? " multiple " : "") . ($extra ? " $extra" : "") .">$select</select>", $description);
   }
 }
 
@@ -857,12 +858,12 @@ function form_radios($title, $name, $value, $options, $description = 0) {
     foreach ($options as $key=>$choice) {
       $output .= form_radio($choice, $name, $key, ($key == $value));
     }
-    return form_item($title, $output, $description);
+    return theme("form_element", $title, $output, $description);
   }
 }
 
 function form_file($title, $name, $size, $description = 0) {
-  return form_item($title, "<input type=\"file\" class=\"form-file\" name=\"edit[$name]\" size=\"$size\" />\n", $description);
+  return theme("form_element", $title, "<input type=\"file\" class=\"form-file\" name=\"edit[$name]\" size=\"$size\" />\n", $description);
 }
 
 function form_hidden($name, $value) {
diff --git a/includes/theme.inc b/includes/theme.inc
index ae284d34d..6dfff30bd 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -145,6 +145,19 @@ function _theme_table_cell($cell, $header = 0) {
   return $output;
 }
 
+/**
+  Returns themed table.
+
+  @param $title the form element's title
+  @param $value the form element's data
+  @param $description the form element's description or explanation
+
+  @return a string contraining the \a node output.
+**/
+
+function theme_form_element($title, $value, $description = 0) {
+  return "<div class=\"form-item\">". ($title ? "<label>$title:</label>" : "") . $value . ($description ? "<div class=\"description\">$description</div>" : "") ."</div>\n";
+}
 
 /**
   Returns themed table.
-- 
cgit v1.2.3