From 3cbdbd9bb772619e38b7715190ffd8ea8a1863e6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 09 Mar 2012 04:44:12 -0500
Subject: [PATCH] - Improve logo handling in default skin (#1488385)
---
skins/default/common.css | 12 ++++--------
program/include/html.php | 2 +-
skins/default/templates/messageprint.html | 2 +-
skins/default/templates/error.html | 2 +-
skins/default/includes/header.html | 3 +--
skins/default/print.css | 4 ++--
6 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/program/include/html.php b/program/include/html.php
index 27da2c3..0e89d77 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -157,7 +157,7 @@
$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')));
}
/**
diff --git a/skins/default/common.css b/skins/default/common.css
index f84c9e6..31ecbe9 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -154,14 +154,10 @@
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 @@
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;
diff --git a/skins/default/includes/header.html b/skins/default/includes/header.html
index 900968f..08d777a 100644
--- 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" />
diff --git a/skins/default/print.css b/skins/default/print.css
index afdf674..59d400e 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -25,7 +25,7 @@
color: #000000;
}
-#header
+body > #logo
{
float: right;
margin: 0 5mm 3mm 5mm;
@@ -57,7 +57,7 @@
width: 90%;
font-weight: bold;
}
-
+
#attachment-list
{
margin-top: 3mm;
diff --git a/skins/default/templates/error.html b/skins/default/templates/error.html
index 60af53b..fdd7c88 100644
--- 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
diff --git a/skins/default/templates/messageprint.html b/skins/default/templates/messageprint.html
index 3102239..fa7822a 100644
--- 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" />
--
Gitblit v1.9.1