From: Evan Prodromou <evan@status.net>
Date: Wed, 6 Jul 2011 14:17:22 +0000 (-0400)
Subject: Revert "add a 'more' button for groups menu"
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=97d77a7c7518a4771eedd78ee146020b10ef78fc;p=quix0rs-gnu-social.git

Revert "add a 'more' button for groups menu"

This reverts commit 3226f2bef6fe7d8fdfbc7b9e19ade333b724f3d7.
---

diff --git a/js/util.js b/js/util.js
index d8abbe398b..979415c639 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1422,29 +1422,6 @@ var SN = { // StatusNet
                     SN.Init.NoticeFormSetup(form);
                 })
                 .find('.notice_data-text').focus();
-	},
-
-	showMoreGroupMenuItems: function(url) {
-            $.ajax({
-                type: 'GET',
-                dataType: 'xml',
-                url: url,
-                success: function(data, textStatus) {
-		    var groupmenu = $('ul#nav_group');
-		    $('li#nav_timeline_more_group_menu_items').remove();
-		    $("activity\\:object", data).each(function() {
-			var group = $(this);
-			var fullname = $('title',group).text();
-			var nickname = $('poco\\:preferredUsername',group).text();
-			var url      = $('link[rel="alternate"][type="text/html"]',group).attr('href');
-			if ($('li#nav_timeline_group_'+nickname, groupmenu).length == 0) {
-			    groupmenu.append('<li id="nav_timeline_group_"' + nickname +'">'+
-					     '<a href="'+url+'">'+fullname+'</a>'+
-					     '</li>');
-			}
-		    });
-                }
-            });
 	}
     },
 
diff --git a/lib/groupsnav.php b/lib/groupsnav.php
index c023481a49..26058c2b7e 100644
--- a/lib/groupsnav.php
+++ b/lib/groupsnav.php
@@ -46,8 +46,6 @@ if (!defined('STATUSNET')) {
  */
 class GroupsNav extends Menu
 {
-	const TOP_GROUPS = 5;
-	
     protected $user;
     protected $groups;
 
@@ -55,7 +53,7 @@ class GroupsNav extends Menu
     {
         parent::__construct($action);
         $this->user = $user;
-        $this->groups = $this->getTopGroups($user);
+        $this->groups = $user->getGroups();
     }
 
     function haveGroups()
@@ -63,21 +61,6 @@ class GroupsNav extends Menu
         return (!empty($this->groups) && ($this->groups->N > 0));
     }
 
-	function getTopGroups($user)
-	{
-        $memberships = Group_member::byMember($user->id,
-                                              0,
-                                              self::TOP_GROUPS + 1);
-
-        $g = array();
-
-        while ($memberships->fetch()) {
-            $g[] = User_group::staticGet('id', $memberships->group_id);
-        }
-        
-        return new ArrayWrapper($g);
-	}
-
     /**
      * Show the menu
      *
@@ -87,21 +70,11 @@ class GroupsNav extends Menu
     {
         $action = $this->actionName;
 
-        $this->out->elementStart('ul', array('class' => 'nav',
-                                             'id' => 'nav_group'));
+        $this->out->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartGroupsNav', array($this))) {
 
-			$cnt = 0;
-			
             while ($this->groups->fetch()) {
-            	
-            	$cnt++;
-            	
-            	if ($cnt > self::TOP_GROUPS) {
-            		break;
-            	}
-            	
                 $this->out->menuItem(($this->groups->mainpage) ?
                                      $this->groups->mainpage :
                                      common_local_url('showgroup',
@@ -112,16 +85,6 @@ class GroupsNav extends Menu
                                      $this->action->arg('nickname') == $this->groups->nickname,
                                      'nav_timeline_group_'.$this->groups->nickname);
             }
-            
-            if ($cnt > self::TOP_GROUPS) {
-            	$this->out->menuItem(sprintf('javascript:SN.U.showMoreGroupMenuItems("%s")', 
-                                             common_local_url('AtomPubMembershipFeed', array('profile' => $this->user->id))),
-                                     _('More ▼'),
-                                     _('More groups'),
-                                     false,
-                                     'nav_timeline_more_group_menu_items');
-            }
-            
             Event::handle('EndGroupsNav', array($this));
         }