move inbox/outbox to object menu

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 7faeb7dba3b0365d0ba856e10e5285c29b52a106..cb56eb5904932a47c8c0b9b52582bc5741b881b3 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -168,4 +168,10 @@ class MailboxAction extends CurrentUserDesignAction
     {
          return true;
     }
+
+    function showObjectNav()
+    {
+        $mm = new MailboxMenu($this);
+        $mm->show();
+    }
 }

diff --git a/lib/mailboxmenu.php b/lib/mailboxmenu.php
new file mode 100644 (file)
index 0000000..d2d3607
--- /dev/null
+++ b/lib/mailboxmenu.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Private mailboxes menu
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Menu of existing mailboxes
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class MailboxMenu extends Menu
+{
+    function show()
+    {
+        $cur = common_current_user();
+        $nickname = $cur->nickname;
+
+        $this->out->elementStart('ul', array('class' => 'nav'));
+
+        $this->item('inbox',
+                    array('nickname' => $nickname),
+                    _('Inbox'),
+                    _('Your incoming messages'));
+
+        $this->item('outbox',
+                    array('nickname' => $nickname),
+                    _('Outbox'),
+                    _('Your sent messages'));
+
+        $this->out->elementEnd('ul');
+    }
+
+}

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 348195a99d77b1bc67e786d06106605458d3d75b..9d78857c6da252fdcb67a32b3bb2c2450e01427a 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -95,15 +95,11 @@ class PersonalGroupNav extends Menu
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
                                                                      $nickname)),
-                                     _('Inbox'),
+                                     _('Messages'),
                                      _('Your incoming messages'),
                                      $action == 'inbox');
-                $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                      $nickname)),
-                                     _('Outbox'),
-                                     _('Your sent messages'),
-                                     $action == 'outbox');
             }
+
             Event::handle('EndPersonalGroupNav', array($this));
         }
         $this->out->elementEnd('ul');