From b2cf1ada41978f0feefd2047fa3f3b748f5cf234 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 5 Sep 2017 12:22:39 +0200
Subject: [PATCH] Options menu for mail folders list

---
 skins/elastic/styles/widgets/lists.less    |  3 ++-
 skins/elastic/styles/widgets/taskmenu.less |  2 +-
 skins/elastic/styles/widgets/toolbar.less  | 30 +++++++++++++++++-----
 skins/elastic/templates/contactsearch.html |  2 +-
 skins/elastic/templates/mail.html          | 15 ++++++-----
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 60b9d08d3..343351c2b 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -401,6 +401,7 @@ table.fixedcopy {
         width: 99%;
         position: relative; /* for span.date positioning in Firefox */
         background-clip: padding-box; /* fixes Firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=688556 */
+        padding-right: 0;
 
         a {
             text-decoration: none;
@@ -469,7 +470,7 @@ table.fixedcopy {
     }
 
     tr.unread td.subject span.subject {
-        /* TODO font-weight: bold? */
+        font-weight: bold;
     }
 
     /* thread parent message with unread children */
diff --git a/skins/elastic/styles/widgets/taskmenu.less b/skins/elastic/styles/widgets/taskmenu.less
index 9652adb80..2413eb351 100644
--- a/skins/elastic/styles/widgets/taskmenu.less
+++ b/skins/elastic/styles/widgets/taskmenu.less
@@ -47,7 +47,7 @@
             content: @fa-var-user;
         }
         &.settings:before {
-            content: @fa-var-cog;
+            content: @fa-var-sliders;
         }
         &.help:before {
             content: @fa-var-life-bouy;
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index fb782f85a..3bd49e6b7 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -52,7 +52,7 @@
             content: @fa-var-caret-down;
         }
         &.settings:before {
-            content: @fa-var-cog;
+            content: @fa-var-sliders;
         }
         &.move:before {
             content: @fa-var-arrows;
@@ -123,6 +123,9 @@
         &.threads:before {
             content: @fa-var-comments;
         }
+        &.actions:before {
+            content: @fa-var-cog;
+        }
     }
 
     .dropbutton {
@@ -388,6 +391,18 @@
     a.expand.none:before {
         content: @fa-var-comments;
     }
+    a.delete:before {
+        content: @fa-var-trash;
+    }
+    a.expunge:before {
+        content: @fa-var-compress;
+    }
+    a.import:before {
+        content: @fa-var-upload;
+    }
+    a.settings:before {
+        content: @fa-var-sliders;
+    }
 }
 
 @media screen and (min-width: (@screen-width-small + 1px)) {
@@ -453,11 +468,12 @@
             }
         }
 
-    }
-    ul.toolbar > li {
-        display: inline-block;
-    }
-    ul.toolbar.listing li {
-        border: 0;
+        & > li {
+            display: inline-block;
+        }
+
+        &.listing li {
+            border: 0;
+        }
     }
 }
diff --git a/skins/elastic/templates/contactsearch.html b/skins/elastic/templates/contactsearch.html
index 0debb0fa9..0adfd7cf4 100644
--- a/skins/elastic/templates/contactsearch.html
+++ b/skins/elastic/templates/contactsearch.html
@@ -3,7 +3,7 @@
 <h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="advsearch" /></h1>
 
 <div class="formcontent">
-	<roundcube:object name="searchform" id="advsearchform" class="tabbed" size=30 />
+	<roundcube:object name="searchform" id="advsearchform" class="tabbed propform" size=30 />
 </div>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index 594c099c6..8b1a9929f 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -13,8 +13,9 @@
 	<div id="folderlist-content" class="scroller">
 		<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing folderlist" folder_filter="mail" unreadwrap="%s" />
 	</div>
-	<div id="folderlist-footer" class="footer">
-		<roundcube:button id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" data-popup="mailboxoptions-menu" innerClass="inner" content="&#9881;" />
+	<div id="folderlist-footer" class="footer toolbar">
+		<roundcube:button name="folderactions" type="link" title="folderactions" label="folderactions"
+			class="button actions" innerclass="inner" data-popup="mailboxoptions-menu" />
 		<roundcube:if condition="env:quota" />
 			<span class="voice"><roundcube:label name="quota"></span>
 			<roundcube:object name="quotaDisplay" id="quotadisplay" class="countdisplay" display="text" />
@@ -124,11 +125,11 @@
 <div id="mailboxoptions-menu" class="popupmenu">
 	<h3 id="aria-label-mailboxoptions-menu" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-mailboxoptions-menu">
-		<roundcube:button command="expunge" type="link-menuitem" label="compact" classAct="active" />
-		<roundcube:button command="purge" type="link-menuitem" label="empty" classAct="active" />
-		<roundcube:button command="mark-all-read" type="link-menuitem" label="markallread" classAct="active" />
-		<roundcube:button command="import-messages" type="link-menuitem" name="messageimport" classAct="active" label="importmessages" onclick="if (rcmail.command_enabled('import-messages')) rcmail.upload_input('uploadform')" />
-		<roundcube:button command="folders" task="settings" type="link-menuitem" label="managefolders" classAct="active" />
+		<roundcube:button command="expunge" type="link-menuitem" label="compact" class="expunge" classAct="expunge active" />
+		<roundcube:button command="purge" type="link-menuitem" label="empty" class="delete" classAct="delete active" />
+		<roundcube:button command="mark-all-read" type="link-menuitem" label="markallread" class="read" classAct="read active" />
+		<roundcube:button command="import-messages" type="link-menuitem" label="importmessages" class="import" classAct="import active" name="messageimport" onclick="if (rcmail.command_enabled('import-messages')) rcmail.upload_input('uploadform')" />
+		<roundcube:button command="folders" task="settings" type="link-menuitem" label="managefolders" class="settings" classAct="settings active" />
 		<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
 	</ul>
 </div>