add labels to make checkboxes better clickable

[squirrelmail.git] / plugins / squirrelspell / sqspell_functions.php

diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 9653cff06ca9076c5dd0fcfc43d001d569647f6a..731cbc30c278ffcf4914613b1b1740edf9fa2c41 100644 (file)
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -6,7 +6,7 @@
  * All SquirrelSpell-wide functions are in this file.
  *
  * @author Konstantin Riabitsev <icon at duke.edu>
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -22,6 +22,12 @@ global $SQSPELL_APP, $SQSPELL_APP_DEFAULT, $SQSPELL_WORDS_FILE, $SQSPELL_CRYPTO;
  */
 include_once(SM_PATH . 'plugins/squirrelspell/sqspell_config.php');
 
+/**
+ * Workaround for including function squirrelspell_version() in SM 1.5 CVS,
+ * where plugins' setup.php is not included by default.
+ */
+include_once(SM_PATH . 'plugins/squirrelspell/setup.php');
+
 /** Hooked functions **/
 
 /**
@@ -62,7 +68,7 @@ function squirrelspell_setup_function() {
      * use document.write() so the "Check Spelling" button is not
      * displayed if js is off in the browser.
      */
-    echo "<script type=\"text/javascript\">\n".
+    $output = "<script type=\"text/javascript\">\n".
       "<!--\n".
       'document.write("<input type=\"button\" value=\"'.
       _("Check Spelling").
@@ -71,6 +77,7 @@ function squirrelspell_setup_function() {
       'resizable=yes\')\" />");' . "\n".
       "//-->\n".
       "</script>\n";
+    return array('compose_button_row' => $output);
   }
 }
 
@@ -857,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"