From 80919e1cf5aa46c2a6ed0393aa8971cc99590a83 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 24 Aug 2016 19:16:49 +0200
Subject: [PATCH] Added Search button in quick search menus (#5312)

---
 CHANGELOG                              |  1 +
 program/js/app.js                      | 10 +++-------
 skins/larry/styles.css                 |  7 +++++++
 skins/larry/templates/addressbook.html |  1 +
 skins/larry/templates/mail.html        |  1 +
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 16c071612..2622918a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Added Search button in quick search menus (#5312)
 - Implement "one click" attachment/messages/photo upload (#5024)
 - Squirrelmail_usercopy: Add option to define character set of data files
 - Removed useless 'created' column from 'session' table (#5389)
diff --git a/program/js/app.js b/program/js/app.js
index 2c3ddd886..b8cea98ef 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1255,12 +1255,8 @@ function rcube_webmail()
 
       // quicksearch
       case 'search':
-        if (!props && this.gui_objects.qsearchbox)
-          props = this.gui_objects.qsearchbox.value;
-        if (props) {
-          this.qsearch(props);
-          break;
-        }
+        ret = this.qsearch(props);
+        break;
 
       // reset quicksearch
       case 'reset-search':
@@ -4975,7 +4971,7 @@ function rcube_webmail()
   // send remote request to search mail or contacts
   this.qsearch = function(value)
   {
-    if (value != '') {
+    if (value || $(this.gui_objects.qsearchbox).val() || $(this.gui_objects.search_interval).val()) {
       var r, lock = this.set_busy(true, 'searching'),
         url = this.search_params(value),
         action = this.env.action == 'compose' && this.contact_list ? 'search-contacts' : 'search';
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index a9a60dcce..4080f3c92 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -2290,6 +2290,13 @@ table.quota-info td.root {
 	border-top: 0;
 }
 
+.popupmenu > .buttons {
+	border-top: 1px solid #5a5a5a;
+	height: 25px;
+	padding-top: 5px;
+	text-align: center;
+}
+
 ul.toolbarmenu,
 ul.toolbarmenu ul,
 #rcmKSearchpane ul {
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 7f358f51d..554a7a4bd 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -54,6 +54,7 @@
 		<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="email" /></span></label></li>
 		<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="allfields" /></span></label></li>
 	</ul>
+	<div class="buttons"><a class="button" href="#" onclick="if (rcmail.command('search')) UI.show_popup('searchmenu',false)"><roundcube:label name="search" /></a></div>
 </div>
 </div>
 
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 7fe2d0721..a5de02c22 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -59,6 +59,7 @@
 		<li role="menuitem"><label><input type="radio" name="s_scope" value="sub" id="s_scope_sub" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="subfolders" /></span></label></li>
 		<li role="menuitem"><label><input type="radio" name="s_scope" value="all" id="s_scope_all" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="allfolders" /></span></label></li>
 	</ul>
+	<div class="buttons"><a class="button" href="#" onclick="if (rcmail.command('search')) UI.show_popup('searchmenu',false)"><roundcube:label name="search" /></a></div>
 </div>
 
 </div>