X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Foptions.tpl;h=ab4fc511921728e979b279e1af2d2832e5c47b28;hb=a95c75b3e0fb36b479741603ab9d855fb417a5e5;hp=17a2b550d791d8d2542765e76bac2561838f2382;hpb=ce910bcaa2fcf8661061662923b8f8b768467009;p=squirrelmail.git

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index 17a2b550..ab4fc511 100644
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -5,10 +5,11 @@
  * Template for rendering the options page
  * 
  * The following variables are available to this template:
- *      $options - array of options as built by SquirrelMail.  Important fields
- *                 in this array include (but are not limited to):
- *          $el['name']     - The name of the option group
- *          $el['options']  - array of squirrelOption objects
+ *      $option_groups - array of option groups and their options as
+ *                       built by SquirrelMail.  Important fields
+ *                       in this array include (but are not limited to):
+ *                       ['name']     - The name of the option group
+ *                       ['options']  - array of squirrelOption objects
  *
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -30,7 +31,7 @@ if ( !empty($topmessage) ) {
 
 <div id="optionDisplay">
 <?php
-foreach ($options as $option) {
+foreach ($option_groups as $option) {
     echo "<table cellspacing=\"0\">\n";
 
     if (!empty($option['name'])) {
@@ -43,14 +44,29 @@ foreach ($options as $option) {
 
     $hidden_widgets = '';
     foreach ($option['options'] as $opt) {
-        if ($opt->type != SMOPT_TYPE_HIDDEN) {
+        if ($opt->type == SMOPT_TYPE_INFO) {
+            echo "<tr>\n"
+               . " <td colspan=\"2\">\n"
+               . "  <table class=\"optionInfo\">\n"
+               . "   <tr>\n"
+               . "    <td>\n"
+               . $opt->createWidget() . "\n"
+               . "    </td>\n"
+               . "   </tr>\n"
+               . "  </table>\n"
+               . " </td>\n"
+               . "</tr>\n";
+
+        } else if ($opt->type != SMOPT_TYPE_HIDDEN) {
             echo   "<tr>\n" .
-                   " <td class=\"optionName\">\n  ";
+                   " <td class=\"optionName\"" . ($opt->caption_wrap ? '' : ' style="white-space:nowrap"') . ">\n  ";
 
             if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
              || $opt->type == SMOPT_TYPE_BOOLEAN) {
                 echo '<label for="new_' . $opt->name . '">'
                    . $opt->caption . '</label>';
+            } else if ($opt->type == SMOPT_TYPE_TEXTAREA && !empty($opt->trailing_text)) {
+                echo $opt->caption . '<br /><small>' . $opt->trailing_text . '</small>';
             } else {
                 echo $opt->caption;
             }