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

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index ecbb02a5..17a2b550 100644
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -41,15 +41,14 @@ 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  ";
 
-//FIXME: use the following two lines instead if we make the default boolean type checkbox
-            //if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
-            // || $opt->type == SMOPT_TYPE_BOOLEAN) {
-            if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX) {
+            if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
+             || $opt->type == SMOPT_TYPE_BOOLEAN) {
                 echo '<label for="new_' . $opt->name . '">'
                    . $opt->caption . '</label>';
             } else {
@@ -62,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";