From a77504aeacd4516156267fe10eeca1bfffcacf87 Mon Sep 17 00:00:00 2001 From: PhilW Date: Mon, 26 Aug 2013 12:22:34 +0100 Subject: allow different logos for different functions (eg. normal and print) --- config/defaults.inc.php | 3 +++ program/include/rcmail_output_html.php | 13 ++++++++++++- skins/classic/includes/header.html | 2 +- skins/classic/templates/login.html | 2 +- skins/classic/templates/messageprint.html | 2 +- skins/larry/includes/header.html | 2 +- skins/larry/templates/login.html | 2 +- skins/larry/templates/messageprint.html | 2 +- 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 54d0b1d27..feed82f1b 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -240,6 +240,9 @@ $config['support_url'] = ''; // replace Roundcube logo with this image // specify an URL relative to the document root of this Roundcube installation +// an array can be used to specify different logos for different screens +// for example array("default" => "/images/roundcube_logo.png", "print" => "/images/roundcube_logo_print.png") +// available options: default, login, print $config['skin_logo'] = null; // automatically create a new Roundcube user when log-in the first time. diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index a2ec29ca3..39f79d119 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -924,8 +924,19 @@ class rcmail_output_html extends rcmail_output } else if ($object == 'logo') { $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); - if ($logo = $this->config->get('skin_logo')) + + if (is_array($this->config->get('skin_logo'))) { + if (isset($attrib['type']) && array_key_exists($attrib['type'], $this->config->get('skin_logo'))) { + $attrib['src'] = $this->config->get('skin_logo')[$attrib['type']]; + } + elseif (array_key_exists('default', $this->config->get('skin_logo'))) { + $attrib['src'] = $this->config->get('skin_logo')['default']; + } + } + elseif ($logo = $this->config->get('skin_logo')) { $attrib['src'] = $logo; + } + $content = html::img($attrib); } else if ($object == 'productname') { diff --git a/skins/classic/includes/header.html b/skins/classic/includes/header.html index 08d777af0..962e4dd7b 100644 --- a/skins/classic/includes/header.html +++ b/skins/classic/includes/header.html @@ -1,2 +1,2 @@ - + diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html index 2dacd48ff..ece8f0477 100644 --- a/skins/classic/templates/login.html +++ b/skins/classic/templates/login.html @@ -7,7 +7,7 @@ - + diff --git a/skins/classic/templates/messageprint.html b/skins/classic/templates/messageprint.html index fa7822ad5..97049d281 100644 --- a/skins/classic/templates/messageprint.html +++ b/skins/classic/templates/messageprint.html @@ -7,7 +7,7 @@ - +

diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html index 5a934d89b..35ce837f6 100644 --- a/skins/larry/includes/header.html +++ b/skins/larry/includes/header.html @@ -29,7 +29,7 @@

- + diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html index 13e919ad3..45769e3ff 100644 --- a/skins/larry/templates/login.html +++ b/skins/larry/templates/login.html @@ -9,7 +9,7 @@

- + diff --git a/skins/larry/templates/messageprint.html b/skins/larry/templates/messageprint.html index d01c70bcd..297ffd6e2 100644 --- a/skins/larry/templates/messageprint.html +++ b/skins/larry/templates/messageprint.html @@ -7,7 +7,7 @@ - +

-- cgit v1.2.3 From d81d69377a53f347eab1bef898dc405d3b5940e9 Mon Sep 17 00:00:00 2001 From: PhilW Date: Mon, 26 Aug 2013 13:45:30 +0100 Subject: use template file name rather than special attribute --- config/defaults.inc.php | 5 ++--- program/include/rcmail_output_html.php | 8 ++++---- skins/classic/includes/header.html | 2 +- skins/classic/templates/login.html | 2 +- skins/classic/templates/messageprint.html | 2 +- skins/larry/includes/header.html | 2 +- skins/larry/templates/login.html | 2 +- skins/larry/templates/messageprint.html | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/config/defaults.inc.php b/config/defaults.inc.php index feed82f1b..30ed70bd2 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -240,9 +240,8 @@ $config['support_url'] = ''; // replace Roundcube logo with this image // specify an URL relative to the document root of this Roundcube installation -// an array can be used to specify different logos for different screens -// for example array("default" => "/images/roundcube_logo.png", "print" => "/images/roundcube_logo_print.png") -// available options: default, login, print +// an array can be used to specify different logos for specific template files, '*' for default logo +// for example array("*" => "/images/roundcube_logo.png", "messageprint" => "/images/roundcube_logo_print.png") $config['skin_logo'] = null; // automatically create a new Roundcube user when log-in the first time. diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 39f79d119..ebf71cb3f 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -926,11 +926,11 @@ class rcmail_output_html extends rcmail_output $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); if (is_array($this->config->get('skin_logo'))) { - if (isset($attrib['type']) && array_key_exists($attrib['type'], $this->config->get('skin_logo'))) { - $attrib['src'] = $this->config->get('skin_logo')[$attrib['type']]; + if ($logo = $this->config->get('skin_logo')[$this->template_name]) { + $attrib['src'] = $logo; } - elseif (array_key_exists('default', $this->config->get('skin_logo'))) { - $attrib['src'] = $this->config->get('skin_logo')['default']; + elseif ($logo = $this->config->get('skin_logo')['*']) { + $attrib['src'] = $logo; } } elseif ($logo = $this->config->get('skin_logo')) { diff --git a/skins/classic/includes/header.html b/skins/classic/includes/header.html index 962e4dd7b..08d777af0 100644 --- a/skins/classic/includes/header.html +++ b/skins/classic/includes/header.html @@ -1,2 +1,2 @@ - + diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html index ece8f0477..2dacd48ff 100644 --- a/skins/classic/templates/login.html +++ b/skins/classic/templates/login.html @@ -7,7 +7,7 @@ - + diff --git a/skins/classic/templates/messageprint.html b/skins/classic/templates/messageprint.html index 97049d281..fa7822ad5 100644 --- a/skins/classic/templates/messageprint.html +++ b/skins/classic/templates/messageprint.html @@ -7,7 +7,7 @@ - +

diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html index 35ce837f6..5a934d89b 100644 --- a/skins/larry/includes/header.html +++ b/skins/larry/includes/header.html @@ -29,7 +29,7 @@

- +

diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html index 45769e3ff..13e919ad3 100644 --- a/skins/larry/templates/login.html +++ b/skins/larry/templates/login.html @@ -9,7 +9,7 @@

- + diff --git a/skins/larry/templates/messageprint.html b/skins/larry/templates/messageprint.html index 297ffd6e2..d01c70bcd 100644 --- a/skins/larry/templates/messageprint.html +++ b/skins/larry/templates/messageprint.html @@ -7,7 +7,7 @@ - +

-- cgit v1.2.3 From fb4474aca9f5f56927290828c09407ddba637d8a Mon Sep 17 00:00:00 2001 From: PhilW Date: Sat, 31 Aug 2013 09:44:50 +0100 Subject: only call config->get() once --- program/include/rcmail_output_html.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index ebf71cb3f..6db559358 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -925,16 +925,18 @@ class rcmail_output_html extends rcmail_output else if ($object == 'logo') { $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); - if (is_array($this->config->get('skin_logo'))) { - if ($logo = $this->config->get('skin_logo')[$this->template_name]) { - $attrib['src'] = $logo; - } - elseif ($logo = $this->config->get('skin_logo')['*']) { - $attrib['src'] = $logo; - } - } - elseif ($logo = $this->config->get('skin_logo')) { - $attrib['src'] = $logo; + if ($logo = $this->config->get('skin_logo')) { + if (is_array($logo)) { + if ($template_logo = $logo[$this->template_name]) { + $attrib['src'] = $template_logo; + } + elseif ($template_logo = $logo['*']) { + $attrib['src'] = $template_logo; + } + } + else { + $attrib['src'] = $logo; + } } $content = html::img($attrib); -- cgit v1.2.3