From 688d16e88296e2ae96ab9b7fc379eaef31d77933 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 12 Jul 2012 05:24:49 -0400
Subject: [PATCH] Join address book toolbars again
---
skins/larry/templates/mail.html | 4 ----
skins/larry/templates/addressbook.html | 17 +++++++----------
skins/larry/addressbook.css | 8 +++-----
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 37315cf..fe087ae 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -18,6 +18,7 @@
left: 0;
width: 220px;
bottom: 0;
+ z-index: 2;
}
#addressview-right {
@@ -26,9 +27,9 @@
left: 232px;
right: 0;
bottom: 0;
+ z-index: 3;
}
-#directorytoolbar,
#addressbooktoolbar {
position: absolute;
top: -6px;
@@ -36,10 +37,7 @@
right: 260px;
height: 40px;
white-space: nowrap;
-}
-
-#directorytoolbar {
- right: 0;
+ z-index: 10;
}
#directorylistbox {
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index ee92ff4..c39c2fe 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -10,13 +10,17 @@
<div id="mainscreen">
-<div id="addressview-left">
-
<!-- toolbar -->
-<div id="directorytoolbar" class="toolbar">
+<div id="addressbooktoolbar" class="toolbar">
<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" />
<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
+ <span class="spacer"></span>
+ <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+ <roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
+ <roundcube:container name="toolbar" id="addressbooktoolbar" />
</div>
+
+<div id="addressview-left">
<!-- sources/groups list -->
<div id="directorylistbox" class="uibox listbox">
@@ -32,13 +36,6 @@
</div><!-- end addressview-left -->
<div id="addressview-right">
-
-<!-- toolbar -->
-<div id="addressbooktoolbar" class="toolbar">
- <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
- <roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
- <roundcube:container name="toolbar" id="addressbooktoolbar" />
-</div>
<!-- search box -->
<div id="quicksearchbar">
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index f6b53f2..32c64d9 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -46,10 +46,6 @@
<div id="mailview-right">
-<!-- toolbar -->
-<div id="messagetoolbar">
-</div>
-
<div id="messagesearchtools">
<!-- search filter -->
--
Gitblit v1.9.1