Trac #894 and #1013 - fixed bad redirects after delete notice

[quix0rs-gnu-social.git] / lib / publicgroupnav.php

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 7860783fa48330afa701aa665f4ea8e0ccf7c4a7..d72475e20276c8747b81ba77c693f43160bef96a 100644 (file)
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * Base class for all actions (~views)
+ * Menu for public group of actions
  *
  * PHP version 5
  *
@@ -19,10 +19,9 @@
  * 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  Action
+ * @category  Menu
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -35,22 +34,15 @@ if (!defined('LACONICA')) {
 require_once INSTALLDIR.'/lib/widget.php';
 
 /**
- * Base class for all actions
- *
- * This is the base class for all actions in the package. An action is
- * more or less a "view" in an MVC framework.
- *
- * Actions are responsible for extracting and validating parameters; using
- * model classes to read and write to the database; and doing ouput.
+ * Menu for public group of actions
  *
  * @category Output
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  *
- * @see      HTMLOutputter
+ * @see      Widget
  */
 
 class PublicGroupNav extends Widget
@@ -77,21 +69,26 @@ class PublicGroupNav extends Widget
 
     function show()
     {
+        $action_name = $this->action->trimmed('action');
+
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         $this->out->menuItem(common_local_url('public'), _('Public'),
-            _('Public timeline'), $this->action == 'public', 'nav_timeline_public');
+            _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
+
+        $this->out->menuItem(common_local_url('groups'), _('Groups'),
+            _('User groups'), $action_name == 'groups', 'nav_groups');
 
-        $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
-            _('Recent tags'), $this->action == 'tag', 'nav_recent-tags');
+        $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+            _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
 
         if (count(common_config('nickname', 'featured')) > 0) {
             $this->out->menuItem(common_local_url('featured'), _('Featured'),
-                _('Featured users'), $this->action == 'featured', 'nav_featured');
+                _('Featured users'), $action_name == 'featured', 'nav_featured');
         }
 
         $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-            _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
+            _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
 
         $this->action->elementEnd('ul');
     }