banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use template file name rather than special attribute

Browse Source
pull/107/head
PhilW 11 years ago
parent a77504aeac
commit d81d69377a
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File

5
config/defaults.inc.php
Unescape Escape View File

@ -240,9 +240,8 @@ $config['support_url'] = '';
// replace Roundcube logo with this image // replace Roundcube logo with this image
// specify an URL relative to the document root of this Roundcube installation // specify an URL relative to the document root of this Roundcube installation
// an array can be used to specify different logos for different screens // an array can be used to specify different logos for specific template files, '*' for default logo
// for example array("default" => "/images/roundcube_logo.png", "print" => "/images/roundcube_logo_print.png") // for example array("*" => "/images/roundcube_logo.png", "messageprint" => "/images/roundcube_logo_print.png")
// available options: default, login, print
$config['skin_logo'] = null; $config['skin_logo'] = null;
// automatically create a new Roundcube user when log-in the first time. // automatically create a new Roundcube user when log-in the first time.

8
program/include/rcmail_output_html.php
Unescape Escape View File

@ -926,11 +926,11 @@ class rcmail_output_html extends rcmail_output
$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
if (is_array($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'))) { if ($logo = $this->config->get('skin_logo')[$this->template_name]) {
$attrib['src'] = $this->config->get('skin_logo')[$attrib['type']]; $attrib['src'] = $logo;
} }
elseif (array_key_exists('default', $this->config->get('skin_logo'))) { elseif ($logo = $this->config->get('skin_logo')['*']) {
$attrib['src'] = $this->config->get('skin_logo')['default']; $attrib['src'] = $logo;
} }
} }
elseif ($logo = $this->config->get('skin_logo')) { elseif ($logo = $this->config->get('skin_logo')) {

2
skins/classic/includes/header.html
Unescape Escape View File

@ -1,2 +1,2 @@
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" onclick="location.href='./?_page=1'" type="default" /> <roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" onclick="location.href='./?_page=1'" />
<roundcube:object name="message" id="message" /> <roundcube:object name="message" id="message" />

2
skins/classic/templates/login.html
Unescape Escape View File

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" style="margin:0 11px" type="login" /> <roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" style="margin:0 11px" />
<roundcube:object name="message" id="message" /> <roundcube:object name="message" id="message" />

2
skins/classic/templates/messageprint.html
Unescape Escape View File

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" type="print" /> <roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />
<div id="printmessageframe"> <div id="printmessageframe">
<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" /> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />

2
skins/larry/includes/header.html
Unescape Escape View File

@ -29,7 +29,7 @@
<roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" /> <roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
<span class="minmodetoggle"></span> <span class="minmodetoggle"></span>
</div> </div>
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" type="default" /> <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
</div> </div>
<roundcube:endif /> <roundcube:endif />

2
skins/larry/templates/login.html
Unescape Escape View File

@ -9,7 +9,7 @@
<div id="login-form"> <div id="login-form">
<div class="box-inner"> <div class="box-inner">
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" type="login" /> <roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" />
<roundcube:form name="form" method="post"> <roundcube:form name="form" method="post">
<roundcube:object name="loginform" form="form" size="40" /> <roundcube:object name="loginform" form="form" size="40" />

2
skins/larry/templates/messageprint.html
Unescape Escape View File

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" type="print" /></div> <div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" /></div>
<div id="printmessageframe"> <div id="printmessageframe">
<roundcube:object name="messageHeaders" class="headers-table" /> <roundcube:object name="messageHeaders" class="headers-table" />

Write Preview
Loading…
Cancel
Save