diff options
author | Andy Wermke <andy@dev.next-step-software.com> | 2013-04-04 16:10:23 +0200 |
---|---|---|
committer | Andy Wermke <andy@dev.next-step-software.com> | 2013-04-04 16:10:23 +0200 |
commit | 92cd7f34b07e86062f2c024039e3309768b48ce6 (patch) | |
tree | 63b9f39280ebcab80742d9f2b4db6a139c1791e1 /program/include/rcmail_html_page.php | |
parent | 029d18f13bcf01aa2f1f08dbdfc6400c081bf7cb (diff) | |
parent | 443b92a7ee19e321b350750240e0fc54ec5be357 (diff) |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Diffstat (limited to 'program/include/rcmail_html_page.php')
-rw-r--r-- | program/include/rcmail_html_page.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/program/include/rcmail_html_page.php b/program/include/rcmail_html_page.php index 2624d590a..5d07b8d04 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 @@ -30,7 +30,19 @@ class rcmail_html_page extends rcmail_output_html { public function write($contents = '') { - self::reset(); + self::reset(true); + + // 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 |