From 0201298cd8f767389789f7c35897985d4475836a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 16 Sep 2013 13:47:24 -0400
Subject: [PATCH] Merge pull request #118 from Dennis1993/patch-12
---
program/steps/settings/func.inc | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index ecd35e9..b492c96 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -844,23 +844,28 @@
continue 2;
}
- $field_id = 'rcmfd_default_font';
- $fonts = rcube_fontdefs();
- $selected = $config['default_font'];
+ // Default font size
+ $field_id = 'rcmfd_default_font_size';
+ $select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
- $select = '<select name="_default_font" id="'.$field_id.'">';
- $select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
- foreach ($fonts as $fname => $font) {
- $select .= '<option value="'.$fname.'"'
- . ($fname == $selected ? ' selected="selected"' : '')
- . ' style=\'font-family: ' . $font . '\'>'
- . Q($fname) . '</option>';
+ $fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
+ foreach ($fontsizes as $size) {
+ $select_default_font_size->add($size, $size);
}
- $select .= '</select>';
+
+ // Default font
+ $field_id = 'rcmfd_default_font';
+ $select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
+
+ $fonts = rcube_fontdefs();
+ foreach ($fonts as $fname => $font) {
+ $select_default_font->add($fname, $fname);
+ }
$blocks['main']['options']['default_font'] = array(
'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
- 'content' => $select
+ 'content' => $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)).
+ $select_default_font->show($RCMAIL->config->get('default_font', 1))
);
}
break;
--
Gitblit v1.9.1