diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-01-24 15:32:24 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-01-25 12:43:03 +0100 |
| commit | 39bb93d9ae553f637b3d2356e51c8a21541888e4 (patch) | |
| tree | 822e350fa485bf10b134c4a1bc5e39862d280948 /program/include | |
| parent | a7cec740ade3588a6b4ff4e9386e18d60acbe4fb (diff) | |
Load a default stylesheet (embed.css) from skin in plain html pages (e.g. attachment warnings and html messages)
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail_html_page.php | 16 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/program/include/rcmail_html_page.php b/program/include/rcmail_html_page.php index 2624d590a..1d8391580 100644 --- a/program/include/rcmail_html_page.php +++ b/program/include/rcmail_html_page.php @@ -5,7 +5,7 @@ | program/include/rcmail_html_page.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2006-2012, The Roundcube Dev Team | + | Copyright (C) 2006-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -21,7 +21,7 @@ /** - * Class to create HTML page output using a skin template + * Class to create an empty HTML page with some default styles * * @package Core * @subpackage View @@ -31,6 +31,18 @@ class rcmail_html_page extends rcmail_output_html public function write($contents = '') { self::reset(); + + // load embed.css from skin folder (if exists) + if ($embed_css = $this->get_skin_file('/embed.css')) { + $this->include_css($embed_css); + } + else { // set default styles for warning blocks inside the attachment part frame + $this->add_header(html::tag('style', array('type' => 'text/css'), + ".rcmail-inline-message { font-family: sans-serif; border:2px solid #ffdf0e; background:#fef893; padding:0.6em 1em; margin-bottom:0.6em }\n" . + ".rcmail-inline-buttons { margin-bottom:0 }" + )); + } + parent::write($contents); } }
\ No newline at end of file diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index cd5f4dddc6..f753bf8e1 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -164,6 +164,7 @@ class rcmail_output_html extends rcmail_output } $this->config->set('skin_path', $skin_path); + $this->base_path = $skin_path; // register skin path(s) $this->skin_paths = array(); |