Implement printer friendly through CSS also for non-javascript. This

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

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index 246523355c2361c6dafa3d39a667e1c8df7c0d11..17a2b550d791d8d2542765e76bac2561838f2382 100644 (file)
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -21,7 +21,13 @@
 
 /** extract variables */
 extract($t);
+
+
+if ( !empty($topmessage) ) {
+       echo "<div id=\"optionMessage\">\n$topmessage\n</div>\n\n";
+}
 ?>
+
 <div id="optionDisplay">
 <?php
 foreach ($options as $option) {
@@ -35,22 +41,35 @@ 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\">\n  ";
+
+            if ($opt->type == SMOPT_TYPE_BOOLEAN_CHECKBOX
+             || $opt->type == SMOPT_TYPE_BOOLEAN) {
+                echo '<label for="new_' . $opt->name . '">'
+                   . $opt->caption . '</label>';
+            } else {
+                echo $opt->caption;
+            }
+
+            echo   "\n </td>\n" .
                    " <td class=\"optionValue\">\n" .
-                   "  ".$opt->createHTMLWidget()."\n" .
+                   "  ".$opt->createWidget()."\n" .
                    " </td>\n" .
                    "</tr>\n";
         } else {
-            echo $opt->createHTMLWidget();
+            $hidden_widgets .= $opt->createWidget();
         }
     }
 
+    echo " <tr>\n  <td colspan=\"2\" align=\"right\">\n"
+       . $hidden_widgets . "   <input type=\"submit\" value=\"" . _("Submit") 
+       . "\" name=\"" . $submit_name . "\" />&nbsp;&nbsp;&nbsp;&nbsp;\n  </td>\n </tr>\n";
+
     echo "</table>\n";
 }
 ?>
-</div>
\ No newline at end of file
+</div>