X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Foptions.tpl;h=03e23d4488d2536bdcddf7f5fcf3b1cca679a39d;hb=e40b0e8e41f95e772e5557fcdf15cfcc4e015165;hp=e9cf2d5a92a9631ceaa5d26cb203c658c63a5dbc;hpb=3b6a455c9af15582495ea5e55faacddc10700c29;p=squirrelmail.git

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index e9cf2d5a..03e23d44 100644
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -41,10 +41,11 @@ 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  ";
+                   " <td class=\"optionName\"" . ($opt->caption_wrap ? '' : ' style="white-space:nowrap"') . ">\n  ";
 
             if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
              || $opt->type == SMOPT_TYPE_BOOLEAN) {
@@ -60,12 +61,12 @@ foreach ($options as $option) {
                    " </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";