X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Foptions.tpl;h=c0cd1b2b3f957f2f0f665b0b3060fde3c805d740;hp=ecbb02a50fc67b007df968e528a5de09cffeda75;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=2eb944e80ce1d3b340621e34f6142e2a5c174f7b
diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index ecbb02a5..c0cd1b2b 100644
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -5,12 +5,13 @@
* 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
+ * @copyright 1999-2018 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@ -30,7 +31,7 @@ if ( !empty($topmessage) ) {
\n";
if (!empty($option['name'])) {
@@ -41,20 +42,31 @@ foreach ($options as $option) {
" \n";
}
+ $hidden_widgets = '';
foreach ($option['options'] as $opt) {
- if ($opt->type != SMOPT_TYPE_HIDDEN) {
+ if ($opt->type == SMOPT_TYPE_INFO) {
+ echo "
\n"
+ . " \n"
+ . " \n"
+ . " \n"
+ . " \n"
+ . $opt->createWidget() . "\n"
+ . " | \n"
+ . " \n"
+ . " \n"
+ . " | \n"
+ . "
\n";
+
+ } else if ($opt->type != SMOPT_TYPE_HIDDEN) {
echo "
\n" .
- " \n ";
+ " | caption_wrap ? '' : ' style="white-space:nowrap"') . ">\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) {
- echo '';
- } else {
- echo $opt->caption;
+ echo '';
echo "\n | \n" .
" \n" .
@@ -62,12 +74,12 @@ foreach ($options as $option) {
" | \n" .
"
\n";
} else {
- echo $opt->createWidget();
+ $hidden_widgets .= $opt->createWidget();
}
}
echo "
\n \n"
- . " \n | \n
\n";
echo "\n";