From d4e2e61a41bce2be1b005ecdd41f64cc60016f64 Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 26 Jan 2007 13:58:41 +0000
Subject: [PATCH] add labels to make checkboxes better clickable

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12204 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/squirrelspell/modules/edit_dic.mod   | 5 +++--
 plugins/squirrelspell/modules/enc_setup.mod  | 8 ++++----
 plugins/squirrelspell/modules/lang_setup.mod | 9 +++++----
 plugins/squirrelspell/sqspell_functions.php  | 8 +++++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/plugins/squirrelspell/modules/edit_dic.mod b/plugins/squirrelspell/modules/edit_dic.mod
index 8e60ff7d..238ad7b7 100644
--- a/plugins/squirrelspell/modules/edit_dic.mod
+++ b/plugins/squirrelspell/modules/edit_dic.mod
@@ -61,8 +61,9 @@ foreach ($langs as $lang) {
         $msg .= "</td><td valign=\"top\">\n";
       }
       $msg .= "<input type=\"checkbox\" name=\"words_ary[]\" "
-        . 'value="'.htmlspecialchars($lang_words[$j]). '" /> '
-        . htmlspecialchars($lang_words[$j]) . "<br />\n";
+        . 'value="'.htmlspecialchars($lang_words[$j]). '" id="words_ary_'
+        . $j . '" /> <label for="words_ary_' . $j .'">'
+        . htmlspecialchars($lang_words[$j]) . "</label><br />\n";
     }
     $msg .= '</td></tr></table></td></tr>'
       . "<tr bgcolor=\"$color[0]\" align=\"center\"><td>"
diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod
index 7d91fdfd..8805a8b1 100644
--- a/plugins/squirrelspell/modules/enc_setup.mod
+++ b/plugins/squirrelspell/modules/enc_setup.mod
@@ -61,9 +61,9 @@ if ($crypted){
         . '<form method="post" onsubmit="return checkMe()">'
         . '<input type="hidden" name="MOD" value="crypto" />'
         . '<p align="center"><input type="checkbox" name="action" '
-        . 'value="decrypt" /> '
+        . 'value="decrypt" id="action_decrypt" /> <label for="action_decrypt">'
         . _("Please decrypt my personal dictionary and store it in a clear-text format." )
-        . '</p>'
+        . '</label></p>'
         . '<p align="center"><input type="submit" value=" '
         . _("Change crypto settings")
         . ' " /></p>'
@@ -86,9 +86,9 @@ if ($crypted){
         . '<form method="post" onsubmit="return checkMe()">'
         . '<input type="hidden" name="MOD" value="crypto" />'
         . '<p align="center"><input type="checkbox" name="action" '
-        . 'value="encrypt" /> '
+        . 'value="encrypt" id="action_encrypt" /> <label for="action_encrypt">'
         . _("Please encrypt my personal dictionary and store it in an encrypted format.")
-        . '</p>'
+        . '</label></p>'
         . '<p align="center"><input type="submit" value=" '
         . _("Change crypto settings") . ' " /></p>'
         . '</form>';
diff --git a/plugins/squirrelspell/modules/lang_setup.mod b/plugins/squirrelspell/modules/lang_setup.mod
index 57d3d826..8d02538e 100644
--- a/plugins/squirrelspell/modules/lang_setup.mod
+++ b/plugins/squirrelspell/modules/lang_setup.mod
@@ -28,16 +28,17 @@ $msg = '<p>'
  * Present a nice listing.
  */
 $langs = sqspell_getSettings();
-$add = '<p>'
+$add = '<p><label for="lang_default">'
   . _("Make this dictionary my default selection:")
-  . " <select name=\"lang_default\">\n";
+  . "</label> <select name=\"lang_default\" id=\"lang_default\">\n";
 while (list($avail_lang, $junk) = each($SQSPELL_APP)){
   $msg .= "<input type=\"checkbox\" name=\"use_langs[]\" "
-    . "value=\"$avail_lang\"";
+    . "value=\"$avail_lang\" id=\"use_langs_$avail_lang\"";
   if (in_array($avail_lang, $langs)) {
     $msg .= ' checked="checked"';
   }
-  $msg .= ' /> ' . _($avail_lang) . "<br />\n";
+  $msg .= ' /> <label for="use_langs_' . $avail_lang . '">'
+    . _($avail_lang) . "</label><br />\n";
   $add .= "<option";
   if ($avail_lang==$langs[0]) {
     $add .= ' selected="selected"';
diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index e44dc59a..731cbc30 100644
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -864,10 +864,12 @@ function sqspell_handle_crypt_panic($lang=false) {
        '<input type="hidden" name="dict_lang" value="'.htmlspecialchars($lang).'" />' :
        '<input type="hidden" name="old_setup" value="yes" />')
     . html_tag( 'p',  "\n" .
-        '<input type="checkbox" name="delete_words" value="ON" />'
-        . _("Delete my dictionary and start a new one") . '<br />'
+        '<input type="checkbox" name="delete_words" value="ON" id="delete_words" />'
+        . '<label for="delete_words">'
+        . _("Delete my dictionary and start a new one")
+        . '</label><br /><label for="old_key">'
         . _("Decrypt my dictionary with my old password:")
-        . '<input name="old_key" size="10" />' ,
+        . '</label><input type="text" name="old_key" id="old_key" size="10" />' ,
         'left' ) . "\n"
         . '</blockquote>' . "\n"
         . html_tag( 'p', "\n"
-- 
2.25.1