$headers_to_display contains TRANSLATED key values! Thanks to Stefano Bridi.

[squirrelmail.git] / templates / default / options.tpl

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index e205bbaafa634f634b8ff8bd52cf3fdbbcea983a..30c56226dcdce7f3031f635e5025381d1db9e953 100644 (file)
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -41,23 +41,34 @@ foreach ($options as $option) {
              " </tr>\n";
     }
 
+    $hidden_widgets = '';
     foreach ($option['options'] as $opt) {
         if ($opt->type != SMOPT_TYPE_HIDDEN) {
             echo   "<tr>\n" .
-                   " <td class=\"optionName\">\n" .
-                   "  ".$opt->caption."\n" .
-                   " </td>\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;
+            }
+
+            echo   "\n </td>\n" .
                    " <td class=\"optionValue\">\n" .
                    "  ".$opt->createWidget()."\n" .
                    " </td>\n" .
                    "</tr>\n";
         } else {
-            echo $opt->createWidget();
+            $hidden_widgets .= $opt->createWidget();
         }
     }
 
     echo " <tr>\n  <td colspan=\"2\" align=\"right\">\n"
-       . "   <input type=\"submit\" value=\"" . _("Submit") 
+       . $hidden_widgets . "   <input type=\"submit\" value=\"" . _("Submit") 
        . "\" name=\"" . $submit_name . "\" />&nbsp;&nbsp;&nbsp;&nbsp;\n  </td>\n </tr>\n";
 
     echo "</table>\n";