summaryrefslogtreecommitdiff
path: root/skins/default/templates
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-05-26 12:28:04 +0000
committerthomascube <thomas@roundcube.net>2009-05-26 12:28:04 +0000
commitb4f7c665bbe31d4ddbdca8c9f89eedb1d6187582 (patch)
treea4430ed9bc3318cfe0bf6ffa18a2cad94ddddae1 /skins/default/templates
parent8234b4c6bc3c9cd9cb639039d3080131098dd966 (diff)
Tweak default skin with better icons (sprites) and move IE hacks to an external file included by conditional comments
Diffstat (limited to 'skins/default/templates')
-rw-r--r--skins/default/templates/addcontact.html1
-rw-r--r--skins/default/templates/addressbook.html9
-rw-r--r--skins/default/templates/compose.html1
-rw-r--r--skins/default/templates/editcontact.html1
-rw-r--r--skins/default/templates/editidentity.html1
-rw-r--r--skins/default/templates/identities.html1
-rw-r--r--skins/default/templates/importcontacts.html1
-rw-r--r--skins/default/templates/mail.html6
-rw-r--r--skins/default/templates/managefolders.html1
-rw-r--r--skins/default/templates/message.html6
-rw-r--r--skins/default/templates/messagepart.html1
-rw-r--r--skins/default/templates/messagepreview.html4
-rw-r--r--skins/default/templates/plugin.html1
-rw-r--r--skins/default/templates/settings.html1
-rw-r--r--skins/default/templates/showcontact.html1
15 files changed, 12 insertions, 24 deletions
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index 38151c9e4..3b18ec5e7 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/addresses.css" />
</head>
<body class="iframe">
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 7e8edef87..2dc92e058 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -3,25 +3,24 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/addresses.css" />
<script type="text/javascript" src="/splitter.js"></script>
<style type="text/css">
<roundcube:if condition="count(env:address_sources) &lt;= 1" />
#abookcountbar { left: 20px;}
-#mainscreen { left:20px; /* IE hack */ width:expression((parseInt(document.documentElement.clientWidth)-40)+'px') }
+#addressscreen { left:20px; /* IE hack */ width:expression((parseInt(document.documentElement.clientWidth)-40)+'px') }
#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
#contacts-box {
left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
/* IE hack */
- width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
+ width:expression((parseInt(addressscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
}
<roundcube:else />
#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
#contacts-box {
left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
/* IE hack */
- width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
+ width:expression((parseInt(addressscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
}
<roundcube:endif />
</style>
@@ -53,7 +52,7 @@
</div>
<roundcube:endif />
-<div id="mainscreen">
+<div id="addressscreen">
<div id="addresslist">
<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" />
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 99a4185b2..d5abd47cc 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="productname" /> :: <roundcube:label name="compose" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/mail.css" />
<link rel="stylesheet" type="text/css" href="/googiespell.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index 6cef903e5..1fc1237f8 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/addresses.css" />
</head>
<body class="iframe">
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 4d15bde0b..deff97990 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body>
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index 30d33a38b..f67d34bbe 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body>
diff --git a/skins/default/templates/importcontacts.html b/skins/default/templates/importcontacts.html
index 35a8e41f8..b005d3554 100644
--- a/skins/default/templates/importcontacts.html
+++ b/skins/default/templates/importcontacts.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/addresses.css" />
</head>
<body>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 93d4e4dce..d3d8e232e 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/mail.css" />
<script type="text/javascript" src="/splitter.js"></script>
<script type="text/javascript" src="/functions.js"></script>
<style type="text/css">
@@ -27,7 +26,6 @@
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/messagemenu.html" />
<div id="mainscreen">
@@ -118,8 +116,8 @@
<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
-<roundcube:button name="messagemenulink" id="messagemenulink" image="/images/buttons/messagemenu.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" />
<roundcube:button name="markreadbutton" id="markreadbutton" image="/images/buttons/markread_act.png" width="32" height="32" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" />
+<roundcube:button name="messagemenulink" id="messagemenulink" image="/images/buttons/actions_act.png" width="34" height="32" title="messageactions" onclick="rcmail_ui.show_messagemenu();return false" />
<roundcube:container name="toolbar" id="messagetoolbar" />
<div id="markmessagemenu">
@@ -132,6 +130,8 @@
</ul>
</div>
+<roundcube:include file="/includes/messagemenu.html" />
+
<div id="searchfilter">
<label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
<roundcube:object name="searchfilter" class="searchfilter" />
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 925bc2c81..a19a7423a 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body>
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index eb4499068..3d1555025 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/mail.css" />
<script type="text/javascript" src="/splitter.js"></script>
<script type="text/javascript" src="/functions.js"></script>
<style type="text/css">
@@ -18,7 +17,6 @@
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/messagemenu.html" />
<div id="messagecountbar">
<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
@@ -35,9 +33,11 @@
<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
-<roundcube:button name="messagemenulink" image="/images/buttons/messagemenu.png" width="32" height="32" title="messagemenu" onclick="rcmail_ui.show_messagemenu();return false" id="messagemenulink" />
+<roundcube:button name="messagemenulink" image="/images/buttons/actions_act.png" width="34" height="32" title="messageactions" onclick="rcmail_ui.show_messagemenu();return false" id="messagemenulink" />
<roundcube:container name="toolbar" id="messagetoolbar" />
<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
+
+<roundcube:include file="/includes/messagemenu.html" />
</div>
<div id="mainscreen">
diff --git a/skins/default/templates/messagepart.html b/skins/default/templates/messagepart.html
index c524b7f23..ce7dbe2e1 100644
--- a/skins/default/templates/messagepart.html
+++ b/skins/default/templates/messagepart.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/mail.css" />
</head>
<body class="extwin">
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index e08f2c7ec..69ed4cf57 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
-<link rel="stylesheet" type="text/css" href="/mail.css" />
+<roundcube:include file="/includes/links.html" />
</head>
<body class="iframe">
<div class="messageheaderbox">
+<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" />
<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
<roundcube:object name="messageAttachments" id="attachment-list" />
</div>
diff --git a/skins/default/templates/plugin.html b/skins/default/templates/plugin.html
index 9725fe4d8..03f020307 100644
--- a/skins/default/templates/plugin.html
+++ b/skins/default/templates/plugin.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/<roundcube:var name='env:task'/>.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body>
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index 0abe7fa41..b2a3c15b9 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body>
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index 79304578c..e50c6031c 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/addresses.css" />
</head>
<body class="iframe">