From 1c079c1ace959266ab6b2f6c5df5f397a5ccdee0 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 11 Jul 2012 09:34:49 -0400
Subject: [PATCH] Put separated toolbars back together again; add min. width to mail view
---
skins/larry/templates/mail.html | 14 ++++--
skins/larry/includes/mailtoolbar.html | 13 ++----
skins/larry/templates/message.html | 16 +++++---
skins/larry/styles.css | 17 ++++++++
skins/larry/mail.css | 10 +++-
skins/larry/templates/compose.html | 5 ++
6 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index fbc2e5e..f750e06 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -1,15 +1,11 @@
-<div id="mailtoolbar" class="toolbar">
-<roundcube:if condition="template:name == 'message'" />
-<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
-<roundcube:endif />
<roundcube:button command="reply" type="link" class="button reply disabled" classAct="button reply" classSel="button reply pressed" label="reply" title="replytomessage" />
<span class="dropbutton">
-<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
-<span class="dropbuttontip" id="replyallmenulink" onclick="UI.show_popup('replyallmenu');return false"></span>
+ <roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
+ <span class="dropbuttontip" id="replyallmenulink" onclick="UI.show_popup('replyallmenu');return false"></span>
</span>
<span class="dropbutton">
-<roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" />
-<span class="dropbuttontip" id="forwardmenulink" onclick="UI.show_popup('forwardmenu');return false"></span>
+ <roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" />
+ <span class="dropbuttontip" id="forwardmenulink" onclick="UI.show_popup('forwardmenu');return false"></span>
</span>
<roundcube:button command="delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="deletemessage" />
<roundcube:if condition="template:name == 'message'" />
@@ -20,7 +16,6 @@
<roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" />
<roundcube:endif />
<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" />
-</div>
<div id="forwardmenu" class="popupmenu">
<ul class="toolbarmenu">
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 27cc768..3fe451c 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -18,6 +18,7 @@
left: 0;
width: 220px;
bottom: 0;
+ z-index: 2;
}
#mailview-right {
@@ -26,6 +27,7 @@
left: 232px;
right: 0;
bottom: 0;
+ z-index: 3;
}
#mailview-top {
@@ -332,7 +334,6 @@
width: 100%;
}
-#mailboxtoolbar,
#messagetoolbar {
position: absolute;
top: -6px;
@@ -340,14 +341,17 @@
left: 0;
height: 40px;
white-space: nowrap;
+ z-index: 10;
}
#messagetoolbar.fullwidth {
right: 0;
}
-#mailboxtoolbar {
- right: 0;
+#messagetoolbar .toolbarselect {
+ position: absolute;
+ bottom: 6px;
+ right: 3px;
}
#messagesearchtools {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 85372d5..341de90 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -654,6 +654,15 @@
background: #fff;
}
+.minwidth {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ min-width: 1150px;
+}
+
.scroller {
overflow: auto;
}
@@ -1328,6 +1337,13 @@
/*** toolbar ***/
+.toolbar .spacer {
+ display: inline-block;
+ width: 24px;
+ height: 40px;
+ padding: 0;
+}
+
.toolbar a.button {
text-align: center;
font-size: 10px;
@@ -1971,6 +1987,7 @@
margin-bottom: 12px;
padding-top: 15px;
height: 27px;
+ white-space: nowrap;
}
.tabsbar .tablink {
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 93e9703..ff0c833 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -7,8 +7,9 @@
<link rel="stylesheet" type="text/css" href="/googiespell.css" />
<roundcube:endif />
</head>
-<body class="noscroll">
+<body>
+<div class="minwidth">
<roundcube:include file="/includes/header.html" />
<div id="mainscreen">
@@ -170,6 +171,8 @@
</div><!-- end mainscreen -->
+</div><!-- end minwidth -->
+
<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
<roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
<div class="formbuttons">
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 01a5986..f6b53f2 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -11,19 +11,22 @@
<roundcube:endif />
</style>
</head>
-<body class="noscroll">
+<body>
+<div class="minwidth">
<roundcube:include file="/includes/header.html" />
<div id="mainscreen">
-<div id="mailview-left">
-
<!-- toolbar -->
-<div id="mailboxtoolbar" class="toolbar">
+<div id="messagetoolbar" class="toolbar">
<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+ <span class="spacer"></span>
+ <roundcube:include file="/includes/mailtoolbar.html" />
</div>
+
+<div id="mailview-left">
<!-- folders list -->
<div id="folderlist-header"></div>
@@ -45,7 +48,6 @@
<!-- toolbar -->
<div id="messagetoolbar">
-<roundcube:include file="/includes/mailtoolbar.html" />
</div>
<div id="messagesearchtools">
@@ -128,6 +130,8 @@
</div><!-- end mainscreen -->
+<div><!-- end minwidth -->
+
<div id="searchmenu" class="popupmenu">
<ul class="toolbarmenu">
<li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <roundcube:label name="subject" /></label></li>
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 2509662..b66d821 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -10,8 +10,17 @@
<div id="mainscreen">
+<!-- toolbar -->
+<div id="messagetoolbar" class="toolbar fullwidth">
+ <roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
+ <span class="spacer"></span>
+ <roundcube:include file="/includes/mailtoolbar.html" />
+ <div class="toolbarselect">
+ <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
+ </div>
+</div>
+
<div id="mailview-left">
-<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist" folder_filter="mail" />
<!-- folders list -->
<div id="mailboxcontainer" class="uibox listbox">
@@ -23,11 +32,6 @@
</div>
<div id="mailview-right">
-
-<!-- toolbar -->
-<div id="messagetoolbar" class="fullwidth">
-<roundcube:include file="/includes/mailtoolbar.html" />
-</div>
<div id="mailview-top">
<div id="messageheader" class="uibox">
--
Gitblit v1.9.1