Tweak mimp search page

diff --git a/imp/lib/Mimp.php b/imp/lib/Mimp.php
index 78e3b0c..58dc861 100644 (file)
--- a/imp/lib/Mimp.php
+++ b/imp/lib/Mimp.php
@@ -19,7 +19,8 @@ class IMP_Mimp
      * @param Horde_Mobile_linkset $menu  The menu linkset, with page-specific
      *                                    options already filled in.
      * @param string $page                The current page ('compose',
-     *                                    'folders', 'mailbox', 'message').
+     *                                    'folders', 'mailbox', 'message',
+     *                                    'search').
      */
     public function addMIMPMenu($menu, $page)
     {
@@ -30,11 +31,11 @@ class IMP_Mimp
             $items[IMP::generateIMPUrl('mailbox-mimp.php', 'INBOX')] = _("Inbox");
         }
 
-        if (($page != 'compose') && IMP::canCompose()) {
+        if (!in_array($page, array('compose', 'search')) && IMP::canCompose()) {
             $items[Horde_Util::addParameter(Horde::applicationUrl('compose-mimp.php'), 'u', uniqid(mt_rand()))] = _("New Message");
         }
 
-        if ($page != 'folders') {
+        if (!in_array($page, array('folders', 'search'))) {
             $items[Horde::applicationUrl('folders-mimp.php')] = _("Folders");
         }
 

diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php
index 733c38b..38a4fea 100644 (file)
--- a/imp/mailbox-mimp.php
+++ b/imp/mailbox-mimp.php
@@ -29,6 +29,13 @@ $readonly = $imp_imap->isReadOnly($imp_mbox['mailbox']);
 /* Set the current time zone. */
 Horde_Nls::setTimeZone();
 
+/* Need Horde_Mobile init here for autoloading purposes. */
+$mimp_render = new Horde_Mobile();
+
+/* Create mailbox menu. */
+$menu = new Horde_Mobile_card('o', _("Menu"));
+$mset = &$menu->add(new Horde_Mobile_linkset());
+
 /* Run through the action handlers */
 $actionID = Horde_Util::getFormData('a');
 switch ($actionID) {
@@ -52,6 +59,7 @@ case 'c':
 
 // 's' = search
 case 's':
+    IMP_Mimp::addMIMPMenu($mset, 'search');
     require IMP_TEMPLATES . '/mailbox/search-mimp.inc';
     exit;
 
@@ -80,9 +88,6 @@ $mailbox_url = IMP::generateIMPUrl('mailbox-mimp.php', $imp_mbox['mailbox']);
 $imp_mailbox = IMP_Mailbox::singleton($imp_mbox['mailbox']);
 $pageOb = $imp_mailbox->buildMailboxPage(Horde_Util::getFormData('p'), Horde_Util::getFormData('s'));
 
-/* Need Horde_Mobile init here for autoloading purposes. */
-$mimp_render = new Horde_Mobile();
-
 /* Generate page links. */
 $pages_first = $pages_prev = $pages_last = $pages_next = null;
 if ($pageOb['page'] != 1) {
@@ -220,10 +225,6 @@ if (!$search_mbox &&
     $items[Horde_Util::addParameter($mailbox_url, array('a' => 's'))] = _("Search");
 }
 
-/* Create mailbox menu. */
-$menu = new Horde_Mobile_card('o', _("Menu"));
-$mset = &$menu->add(new Horde_Mobile_linkset());
-
 foreach ($items as $link => $label) {
     $mset->add(new Horde_Mobile_link($label, $link));
 }

diff --git a/imp/templates/mailbox/search-mimp.inc b/imp/templates/mailbox/search-mimp.inc
index 4ab5d49..a7c71a4 100644 (file)
--- a/imp/templates/mailbox/search-mimp.inc
+++ b/imp/templates/mailbox/search-mimp.inc
@@ -3,16 +3,17 @@
 $mimp_render = new Horde_Mobile();
 $c = $mimp_render->add(new Horde_Mobile_card('m', sprintf(_("Search %s"), $imp_mbox['mailbox'])));
 
+$imp_notify->setMobileObject($c);
+$notification->notify(array('listeners' => 'status'));
+
 $f = $c->add(new Horde_Mobile_form('mailbox-mimp.php'));
 
 $f->add(new Horde_Mobile_hidden('a', 'rs'));
 $f->add(new Horde_Mobile_hidden('mailbox', $imp_mbox['mailbox']));
 
-$f->add(new Horde_Mobile_input('search', '', _("Search String: ")));
+$f->add(new Horde_Mobile_input('search', '', _("Search:")));
 
 $f->add(new Horde_Mobile_submit(_("Run Search"), 'submit'));
 
-$imp_notify->setMobileObject($c);
-$notification->notify(array('listeners' => 'status'));
-
+$mimp_render->add($menu);
 $mimp_render->display();