Fuss with edit list sizing a touch

[squirrelmail.git] / functions / options.php

diff --git a/functions/options.php b/functions/options.php
index dd22fa0a2dd2fefdbef9d63fb0bdbaedf3633b98..e05c408e3d09f45466fc3c23170f093bf6b79958 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -60,6 +60,11 @@ define('SMOPT_SAVE_NOOP', 'save_option_noop');
  * @subpackage prefs
  */
 class SquirrelOption {
+    /**
+     * The original option configuration array
+     * @var array
+     */
+    var $raw_option_array;
     /**
      * The name of this setting
      * @var string
@@ -184,6 +189,7 @@ class SquirrelOption {
 
     /**
      * Constructor function
+     * @param array $raw_option_array
      * @param string $name
      * @param string $caption
      * @param integer $type
@@ -193,15 +199,16 @@ class SquirrelOption {
      * @param bool $htmlencoded
      */
     function SquirrelOption
-    ($name, $caption, $type, $refresh_level, $initial_value = '', $possible_values = '', $htmlencoded = false) {
+    ($raw_option_array, $name, $caption, $type, $refresh_level, $initial_value = '', $possible_values = '', $htmlencoded = false) {
         /* Set the basic stuff. */
+        $this->raw_option_array = $raw_option_array;
         $this->name = $name;
         $this->caption = $caption;
         $this->type = $type;
         $this->refresh_level = $refresh_level;
         $this->possible_values = $possible_values;
         $this->htmlencoded = $htmlencoded;
-        $this->size = SMOPT_SIZE_MEDIUM;
+        $this->size = SMOPT_SIZE_NORMAL;
         $this->trailing_text = '';
         $this->yes_text = '';
         $this->no_text = '';
@@ -704,19 +711,21 @@ class SquirrelOption {
         global $oTemplate;
 
         switch ($this->size) {
-//FIXME: not sure about these sizes... seems like we could add another on the "large" side...
             case SMOPT_SIZE_TINY:
                 $height = 3;
                 break;
             case SMOPT_SIZE_SMALL:
                 $height = 8;
                 break;
-            case SMOPT_SIZE_LARGE:
+            case SMOPT_SIZE_MEDIUM:
                 $height = 15;
                 break;
-            case SMOPT_SIZE_HUGE:
+            case SMOPT_SIZE_LARGE:
                 $height = 25;
                 break;
+            case SMOPT_SIZE_HUGE:
+                $height = 40;
+                break;
             case SMOPT_SIZE_NORMAL:
             default:
                 $height = 5;
@@ -729,7 +738,7 @@ class SquirrelOption {
         $oTemplate->assign('input_widget', addInput('add_' . $this->name, '', 38, 0, $this->aExtraAttribs));
         $oTemplate->assign('trailing_text', $this->trailing_text);
         $oTemplate->assign('possible_values', $this->possible_values);
-        $oTemplate->assign('select_widget', addSelect('new_' . $this->name, $this->possible_values, $this->value, FALSE, !checkForJavascript() ? $this->aExtraAttribs : array_merge(array('onchange' => 'if (typeof(window.addinput) == \'undefined\') { var f = document.forms.length; var i = 0; var pos = -1; while( pos == -1 && i < f ) { var e = document.forms[i].elements.length; var j = 0; while( pos == -1 && j < e ) { if ( document.forms[i].elements[j].type == \'text\' && document.forms[i].elements[j].name == \'add_' . $this->name . '\' ) { pos = j; } j++; } i++; } if( pos >= 0 ) { window.addinput = document.forms[i-1].elements[pos]; } } for (x = 0; x < this.length; x++) { if (this.options[x].selected) { window.addinput.value = this.options[x].value; break; } }'), $this->aExtraAttribs), TRUE, $height));
+        $oTemplate->assign('select_widget', addSelect('new_' . $this->name, $this->possible_values, $this->value, FALSE, !checkForJavascript() ? $this->aExtraAttribs : array_merge(array('onchange' => 'if (typeof(window.addinput_' . $this->name . ') == \'undefined\') { var f = document.forms.length; var i = 0; var pos = -1; while( pos == -1 && i < f ) { var e = document.forms[i].elements.length; var j = 0; while( pos == -1 && j < e ) { if ( document.forms[i].elements[j].type == \'text\' && document.forms[i].elements[j].name == \'add_' . $this->name . '\' ) { pos = j; } j++; } i++; } if( pos >= 0 ) { window.addinput_' . $this->name . ' = document.forms[i-1].elements[pos]; } } for (x = 0; x < this.length; x++) { if (this.options[x].selected) { window.addinput_' . $this->name . '.value = this.options[x].value; break; } }'), $this->aExtraAttribs), TRUE, $height));
         $oTemplate->assign('checkbox_widget', addCheckBox('delete_' . $this->name, FALSE, SMPREF_YES, array_merge(array('id' => 'delete_' . $this->name), $this->aExtraAttribs)));
         $oTemplate->assign('name', $this->name);
 
@@ -886,6 +895,7 @@ function create_option_groups($optgrps, $optvals) {
         foreach ($grpopts as $optset) {
             /* Create a new option with all values given. */
             $next_option = new SquirrelOption(
+                    $optset,
                     $optset['name'],
                     $optset['caption'],
                     $optset['type'],