- Improve logo handling in default skin (#1488385)

12 years ago · 3cbdbd9bb7
parent fe3a1d60a5
commit 3cbdbd9bb7
6 changed files with 10 additions and 15 deletions
--- a/program/include/html.php
+++ b/program/include/html.php
@ -157,7 +157,7 @@ class html
            $attr = array('src' => $attr);
        }
        return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
-	    array('src','alt','width','height','border','usemap')));
+	        array('src','alt','width','height','border','usemap','onclick')));
    }

    /**
--- a/skins/default/common.css
+++ b/skins/default/common.css
@ -154,14 +154,10 @@ img
  left: 20px;
 }

-body > #header
+body > #logo
 {
-  position: absolute;
-  top: 8px;
-  left: 19px;
-  width: 170px;
-  height: 40px;
-  z-index: 100;
+  margin-left: 12px;
+  cursor: pointer;
 }

 #taskbar
@ -170,7 +166,7 @@ body > #header
  top: 0px;
  right: 0px;
  height: 24px;
-  width: 100%;
+  left: 250px;
  background: url(images/taskbar.png) top right no-repeat;
  padding: 10px 6px 5px 0px;
  text-align: right;
--- a/skins/default/includes/header.html
+++ b/skins/default/includes/header.html
@ -1,3 +1,2 @@
-<div id="header"><a href="./?_page=1"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></a></div>
-
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" onclick="location.href='./?_page=1'" />
 <roundcube:object name="message" id="message" />
--- a/skins/default/print.css
+++ b/skins/default/print.css
@ -25,7 +25,7 @@ a, a:active, a:visited
  color: #000000;
 }

-#header
+body > #logo
 {
  float: right;
  margin: 0 5mm 3mm 5mm;
@ -57,7 +57,7 @@ table.headers-table tr td.subject
  width: 90%;
  font-weight: bold;
 }
-  
+
 #attachment-list
 {
  margin-top: 3mm;
--- a/skins/default/templates/error.html
+++ b/skins/default/templates/error.html
@ -6,7 +6,7 @@
 </head>
 <body>

-<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />

 <div style="width:400px; margin:60px auto;">
 $__page_content
--- a/skins/default/templates/messageprint.html
+++ b/skins/default/templates/messageprint.html
@ -7,7 +7,7 @@
 </head>
 <body>

-<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />

 <div id="printmessageframe">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />