Add way to exit from basic search in IMP

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 3f4f4a0..4d479c0 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -436,6 +436,7 @@ if ($_SESSION['imp']['protocol'] != 'pop') {
             /* Mini search results. */
             $search_mailbox = reset($imp_search->getSearchFolders());
             $hdr_template->set('search', Horde::link(Horde_Util::addParameter(Horde::applicationUrl('search-basic.php'), array('search_mailbox' => $search_mailbox)), sprintf(_("Search %s"), IMP::getLabel($search_mailbox))) . Horde::img('search.png', _("Search")) . '</a>');
+            $hdr_template->set('searchclose', Horde::link(IMP::generateIMPUrl('mailbox.php', $search_mailbox), _("Exit Search")));
         } elseif (!$vfolder) {
             $edit_search = _("Edit Search Query");
         }

diff --git a/imp/templates/mailbox/header.html b/imp/templates/mailbox/header.html
index a8350ba..8689f4d 100644 (file)
--- a/imp/templates/mailbox/header.html
+++ b/imp/templates/mailbox/header.html
@@ -5,6 +5,7 @@
   <tag:refresh />
   <if:filter><tag:filter /></if:filter>
   <if:search><tag:search /></if:search>
+  <if:searchclose><tag:searchclose /><span class="closeImg"></span></a></if:searchclose>
   <if:empty><tag:empty /></if:empty>
   <if:delete_vfolder><tag:delete_vfolder /></if:delete_vfolder>
  </div>