Fixing tag results + more group UI improvements

main/inc/lib/usermanager.lib.php

@@ -2721,7 +2721,6 @@ class UserManager
 	 * @return array
 	 */
 	public static function get_all_user_tags($tag, $field_id = 0, $from = 0, $number_of_items = 10) {
-		// database table definition
 
 		$user_table 			= Database::get_main_table(TABLE_MAIN_USER);
 		$table_user_tag			= Database::get_main_table(TABLE_MAIN_TAG);
@@ -2745,7 +2744,10 @@ class UserManager
 		$result = Database::query($sql);
 		$return = array();
 		if (Database::num_rows($result)> 0) {
-			while ($row = Database::fetch_array($result,'ASSOC')) {
+			while ($row = Database::fetch_array($result,'ASSOC')) {			    
+			    if (isset($return[$row['user_id']]) && !empty($return[$row['user_id']]['tag'])) {
+			        $row['tag'] .=', '.$return[$row['user_id']]['tag'];  
+			    }
 				$return[$row['user_id']] = $row;
 			}
 		}
@@ -2791,7 +2793,7 @@ class UserManager
 		$res = Database::query($sql);
 		if (Database::num_rows($res)> 0) {
 			while ($row = Database::fetch_array($res,'ASSOC')) {
-				if (!in_array($row['user_id'], $return)) {
+				if (!in_array($row['user_id'], array_keys($return))) {
 					$return[$row['user_id']] = $row;
 				}
 			}

main/social/groups.php

@@ -82,9 +82,14 @@ function validate_text_empty (str,msg) {
 }
 
 jQuery(document).ready(function() {
- 
+ 	/* Binds a tab id in the url */
+    $("#tab_browse").bind("tabsselect", function(event, ui) {
+		window.location.href=ui.tab;
+    });
 	$("#tabs").tabs();
 	$("#tab_browse").tabs();
+	
+
 
    var valor = "'.$anchor.'";
 
@@ -126,8 +131,6 @@ function hide_icon_edit(element_html)  {
 
 </script>';
 
-//$htmlHeadXtra[] = '<style> #tabs{position:relative;} </style>';
-
 
 $allowed_views = array('mygroups','newest','pop');
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));

main/social/home.php

@@ -126,11 +126,10 @@ echo '<div id="social-content">';
 				} else {
 					$count_users_group = $count_users_group.' '.get_lang('Members');
 				}
-
-				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).' ('.$count_users_group.') '.$url_close.Display::return_icon('linegroups.jpg','');
+				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).$url_close.Display::span('<br />'.$count_users_group,array('class'=>'box_description_group_member'));
 				$picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80);
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="10" height="44" border="2" align="left" width="44" />';
-				$actions = '<div class="box_description_group_actions" ><a href="groups.php?view=newest">'.get_lang('SeeMore').$url_close.'</div>';
+				$actions = '<div class="box_description_group_actions" ><a href="groups.php?#tab_browse-2">'.get_lang('SeeMore').$url_close.'</div>';
 				$groups_newest[]= array($url_open.$result['picture_uri'].$url_close, $result['name'], cut($result['description'],120,true).$actions);
 			}
 
@@ -146,22 +145,22 @@ echo '<div id="social-content">';
 					$result['count'] = $result['count'].' '.get_lang('Member');
 				} else {
 					$result['count'] = $result['count'].' '.get_lang('Members');
-				}
-				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).' ('.$result['count'].') '.$url_close.Display::return_icon('linegroups.jpg');
+				}				
+				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).$url_close.Display::span('<br />'.$result['count'],array('class'=>'box_description_group_member'));
 				$picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80);
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="10" height="44" border="2" align="left" width="44" />';
-				$actions = '<div class="box_description_group_actions" ><a href="groups.php?view=pop">'.get_lang('SeeMore').$url_close.'</div>';
+				$actions = '<div class="box_description_group_actions" ><a href="groups.php?#tab_browse-3">'.get_lang('SeeMore').$url_close.'</div>';
 				$groups_pop[]= array($url_open.$result['picture_uri'].$url_close, $result['name'], cut($result['description'],120,true).$actions);
 			}
 
 			if (count($groups_newest) > 0) {
-				echo '<div class="social-groups-home-title">'.api_strtoupper(get_lang('Newest')).'</div>';
+				echo '<div class="social-groups-home-title">'.get_lang('Newest').'</div>';
 				Display::display_sortable_grid('home_group', array(), $groups_newest, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 				echo '<br />';
 			}
 
 			if (count($groups_pop) > 0) {
-				echo '<div class="social-groups-home-title">'.api_strtoupper(get_lang('Popular')).'</div>';
+				echo '<div class="social-groups-home-title">'.get_lang('Popular').'</div>';
 				Display::display_sortable_grid('home_group', array(), $groups_pop, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 			}
 

main/social/search.php

@@ -51,7 +51,7 @@ echo '<div id="social-content">';
 		if ($query != '') {
 			if (isset($query) && $query!='') {		
 				//get users from tags
-				$users = UserManager::get_all_user_tags($query, 0, 0, 5);	
+				$users  = UserManager::get_all_user_tags($query, 0, 0, 5);
 				$groups = GroupPortalManager::get_all_group_tags($query);
 				
 				if (empty($users) && empty($groups)) {
@@ -59,8 +59,7 @@ echo '<div id="social-content">';
 				}
 						
 				$results = array();
-				if (is_array($users) && count($users)> 0) {
-					
+				if (is_array($users) && count($users)> 0) {					
 					echo '<h2>'.get_lang('Users').'</h2>';			
 					foreach($users as $user) {
 						$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],80);