Changeset 688d16e in github

Timestamp:

Jul 12, 2012 5:24:49 AM (11 months ago)

Author:

Thomas Bruederli <thomas@…>

Children:

88fb563

Parents:

9d72713

Message:

Join address book toolbars again

Location:

skins/larry

Files:

• addressbook.css (modified) (3 diffs)
• templates/addressbook.html (modified) (2 diffs)
• templates/mail.html (modified) (1 diff)

skins/larry/addressbook.css

@@ -19 +19 @@
         width: 220px;
         bottom: 0;
+        z-index: 2;
 }
 
@@ -27 +28 @@
         right: 0;
         bottom: 0;
-}
-
-#directorytoolbar,
+        z-index: 3;
+}
+
 #addressbooktoolbar {
         position: absolute;
@@ -37 +38 @@
         height: 40px;
         white-space: nowrap;
-}
-
-#directorytoolbar {
-        right: 0;
+        z-index: 10;
 }
 

skins/larry/templates/addressbook.html

@@ -11 +11 @@
 <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 -->
@@ -33 +37 @@
 
 <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 -->

skins/larry/templates/mail.html

@@ -46 +46 @@
 
 <div id="mailview-right">
-
-<!-- toolbar -->
-<div id="messagetoolbar">
-</div>
 
 <div id="messagesearchtools">