Explorar o código

Improving groups layout

Julio Montoya %!s(int64=14) %!d(string=hai) anos
pai
achega
22328a5e53

+ 9 - 15
main/exercice/exercise.class.php

@@ -87,7 +87,7 @@ class Exercise {
 	    $TBL_QUESTIONS          = Database::get_course_table(TABLE_QUIZ_QUESTION,$this->course['db_name']);
     	#$TBL_REPONSES           = Database::get_course_table(TABLE_QUIZ_ANSWER);
 
-		$sql="SELECT title,description,sound,type,random, random_answers, active, results_disabled, max_attempt,start_time,end_time,feedback_type,expired_time,propagate_neg FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'";
+		$sql="SELECT * FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'";
 		$result=Database::query($sql);
 
 		// if the exercise has been found
@@ -113,8 +113,6 @@ class Exercise {
 			}
       		$this->expired_time 	= $object->expired_time; //control time
       		
-      		
-      		
 			$sql="SELECT question_id, question_order FROM $TBL_EXERCICE_QUESTION, $TBL_QUESTIONS WHERE question_id=id AND exercice_id='".Database::escape_string($id)."' ORDER BY question_order";
 			
 			$result=Database::query($sql);
@@ -130,7 +128,7 @@ class Exercise {
             //load questions only for exercises of type 'one question per page'
             //this is needed only is there is no questions
             //
-            // @todo not sure were in the code this is used somebody mess with the exercise 
+            // @todo not sure were in the code this is used somebody mess with the exercise tool
             global $_configuration, $questionList;
             if ($this->type == ONE_PER_PAGE && $_configuration['live_exercise_tracking'] && $_SERVER['REQUEST_METHOD'] != 'POST' && defined('QUESTION_LIST_ALREADY_LOGGED')) {
             	//if(empty($_SESSION['questionList']))
@@ -409,8 +407,7 @@ class Exercise {
 			$this->sound=$sound['name'];
 
 			if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) {
-				$query="SELECT 1 FROM $TBL_DOCUMENT "
-            ." WHERE path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
+				$query="SELECT 1 FROM $TBL_DOCUMENT  WHERE path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
 				$result=Database::query($query);
 
 				if(!Database::num_rows($result)) {
@@ -506,7 +503,7 @@ class Exercise {
 	 * @author - Olivier Brouckaert
 	 */
 	function save($type_e='') {
-		global $_course,$_user;
+		global $_course;
 		$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
         $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
         $TBL_QUIZ_QUESTION= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
@@ -559,7 +556,7 @@ class Exercise {
 			Database::query($sql);
 
 			// update into the item_property table
-			api_item_property_update($_course, TOOL_QUIZ, $id,'QuizUpdated',$_user['user_id']);
+			api_item_property_update($_course, TOOL_QUIZ, $id,'QuizUpdated',api_get_user_id());
 
             if (api_get_setting('search_enabled')=='true') {
                 $this -> search_engine_edit();
@@ -597,7 +594,7 @@ class Exercise {
 			$this->id=Database::insert_id();
         	// insert into the item_property table
 
-        	api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizAdded',$_user['user_id']);
+        	api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizAdded',api_get_user_id());
 			if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
 				$this -> search_engine_save();
 			}
@@ -820,11 +817,11 @@ class Exercise {
 	 * @author - Olivier Brouckaert
 	 */
 	function delete() {
-		global $_course,$_user;
+		global $_course;
 		$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
 		$sql="UPDATE $TBL_EXERCICES SET active='-1' WHERE id='".Database::escape_string($this->id)."'";
 		Database::query($sql);
-		api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizDeleted',$_user['user_id']);
+		api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizDeleted',api_get_user_id());
 
 		if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) {
 			$this -> search_engine_delete();
@@ -987,10 +984,7 @@ class Exercise {
 
 			$form -> addElement('text', 'enabletimercontroltotalminutes',get_lang('ExerciseTotalDurationInMinutes'),array('style' => 'width : 35px','id' => 'enabletimercontroltotalminutes'));
 			$form -> addElement('html','</div>');
-			//$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2'));
-			
-			
-			
+			//$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2'));			
 
 			$form -> addElement('html','</div>');  //End advanced setting
 			$form -> addElement('html','</div>');

+ 1 - 1
main/exercice/exercise.lib.php

@@ -6,7 +6,7 @@
  *  @todo convert this lib into a static class
  *  
  * 	shows a question and its answers
- *	@package dokeos.exercise
+ *	@package chamilo.exercise
  * 	@author Olivier Brouckaert <oli.brouckaert@skynet.be>
  * 	@version $Id: exercise.lib.php 22247 2009-07-20 15:57:25Z ivantcholakov $
  */

+ 4 - 16
main/inc/lib/display.lib.php

@@ -241,20 +241,9 @@ class Display {
 	 * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing
 	 */
 
-	public static function display_sortable_grid($name, $header, $content, $paging_options = array(), $query_vars = null, $form_actions = array(), $vibility_options = true) {
-		if (!class_exists('SortableTable')) {
-			require_once 'sortabletable.class.php';
-		}
-		global $origin;
-		$column =  0;
-		$default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20;
-		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
-
-		if (is_array($query_vars)) {
-			$table->set_additional_parameters($query_vars);
-		}
-		echo $table->display_simple_grid($vibility_options, $paging_options['hide_navigation']);
-	}
+	public static function display_sortable_grid($name, $header, $content, $paging_options = array(), $query_vars = null, $form_actions = array(), $vibility_options = true, $sort_data = true) {
+	    echo self::return_sortable_grid($name, $header, $content, $paging_options, $query_vars, $form_actions, $vibility_options, $sort_data);		
+	}	
 
 	/**
 	 * Gets a nice grid in html string
@@ -829,8 +818,7 @@ class Display {
         $i = 1;
         foreach ($header_list as $item) {
             
-            $item =self::tag('a', $item, array('href'=>'#'.$id.'-'.$i)); 
-                       
+            $item =self::tag('a', $item, array('href'=>'#'.$id.'-'.$i));
         	$lis .=self::tag('li', $item, $ul_attributes);
             $i++;
         }

+ 11 - 47
main/inc/lib/group_portal_manager.lib.php

@@ -899,7 +899,7 @@ class GroupPortalManager
 		$picture		= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_MEDIUM);
 		$big_image		= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_BIG);
 		$tags			= GroupPortalManager::get_group_tags($group_id, true);
-		$members		= GroupPortalManager::get_users_by_group($group_id);
+		
 		$groups_by_user	= GroupPortalManager::get_groups_by_user($user_id, 0);
 
 		//my relation with the group is set here
@@ -921,18 +921,18 @@ class GroupPortalManager
 			case GROUP_USER_PERMISSION_READER:
 				// I'm just a reader
 				$relation_group_title = get_lang('IamAReader');
-				$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
-				$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
+				//$links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
+				//$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
 				$links .=  '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';
-				$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
+				//$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
 				$links .=  '<li><a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.	Display::return_icon('group_leave.png', get_lang('LeaveGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('LeaveGroup').'</span></a></li>';
 				break;
 			case GROUP_USER_PERMISSION_ADMIN:
 				$relation_group_title = get_lang('IamAnAdmin');
-				$links .=  '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
-				$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
+				//$links .=  '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
+				//$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
 				$links .=  '<li><a href="group_edit.php?id='.$group_id.'">'.			Display::return_icon('group_edit.png', get_lang('EditGroup'), array('hspace'=>'6')).'<span class="'.($show=='group_edit'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('EditGroup').'</span></a></li>';
-				$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
+				//$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
 				//if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
 					$links .=  '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('waiting_list.png', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="'.($show=='waiting_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('WaitingList').'</span></a></li>';
 				//}
@@ -946,9 +946,9 @@ class GroupPortalManager
 				break;
 			case GROUP_USER_PERMISSION_MODERATOR:
 				$relation_group_title = get_lang('IamAModerator');
-				$links .=  '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
-				$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
-				$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
+				//$links .=  '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('NewTopic').'</span></a></li>';
+				//$links .=  '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).'<span class="'.($show=='messages_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MessageList').'</span></a></li>';
+				//$links .=  '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).'<span class="'.($show=='member_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MemberList').'</span></a></li>';
 				if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
 					$links .=  '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('waiting_list.png', get_lang('WaitingList'), array('hspace'=>'6')).'<span class="'.($show=='waiting_list'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('WaitingList').'</span></a></li>';
 				}
@@ -966,43 +966,7 @@ class GroupPortalManager
 			echo '</ul>';
 		}
 
-		//Members
-		if (count($members) > 0) {
-			echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.get_lang('Members').'</span></div>';
-			echo '<div align="center">';
-				$min_count_members = 4;
-				$i = 1;
-				foreach($members as $member) {
-					if ($i > $min_count_members) break;
-					// if is a member
-					if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
-						//add icons
-						if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-							$icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
-						}elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-							$icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
-						} else{
-							$icon= '';
-						}
-						$image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);
-						$picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
-
-						echo '<div class="social-menu-group-member">';
-						echo '<a href="profile.php?u='.$member['user_id'].'">';
-						echo '<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
-						echo '<div>'.api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon.'</div></a>';
-						echo '</div>';
-						$i++;
-					}
-				}
-				if (count($members) > $min_count_members) {
-					//More link
-					echo '<div class="group_member_more" style="margin-top:20px;"><a href="group_members.php?id='.$group_id.'">'.get_lang('SeeMore').'</a></div>';
-				}
-			echo '</div>';
-			echo '<div class="clear"></div>';
-			echo '<br />';
-		}
+		
 		/*
 		// my other groups
 		if (count($groups_by_user) > 1) {

+ 1 - 1
main/inc/lib/message.lib.php

@@ -961,7 +961,7 @@ class MessageManager
 									$html_items.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$item['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
 								}
 								$html_items.= '</div>';
-								$html_items.= '<div class="message-group-title">'.Security::remove_XSS($item['title']).'&nbsp;</div>';						
+								//$html_items.= '<div class="message-group-title">'.Security::remove_XSS($item['title']).'&nbsp;</div>';						
 									$image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true);								$image_repository = $image_path['dir'];
 									$existing_image = $image_path['file'];
 								$html_items.= '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" />&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$item['user_sender_id'].'">'.$name.'&nbsp;</a></div>';

+ 13 - 19
main/inc/lib/social.lib.php

@@ -541,7 +541,7 @@ class SocialManager extends UserManager {
 			$user_id = api_get_user_id();
 		}
 
-		$show_groups      = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list');
+		$show_groups      = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list', 'browse_groups');
 		$show_messages    = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose');
 
 		// get count unread message and total invitations
@@ -555,6 +555,7 @@ class SocialManager extends UserManager {
 		$total_invitations = (!empty($total_invitations)?' ('.$total_invitations.')':'');
 
 		// Everybody can create groups
+		/*
 		if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
 			$create_group_item =  '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='group_add'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('CreateASocialGroup').'</span></a></li>';
 		} else {
@@ -562,25 +563,19 @@ class SocialManager extends UserManager {
 			if (api_is_allowed_to_edit(null,true)) {
 				$create_group_item =  '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='group_add'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('CreateASocialGroup').'</span></a></li>';
 			}
-		}
+		}*/
 
 		echo '<div class="social-menu">';
 
 	  	if (in_array($show, $show_groups) && !empty($group_id)) {
 			//--- Group image
-
 			$group_info = GroupPortalManager::get_group_data($group_id);
 			$big		= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_BIG);
 			$original	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_ORIGINAL);
 
 			echo '<div class="social-content-image">';
-				echo '<div class="social-background-content" onmouseout="hide_icon_edit()" onmouseover="show_icon_edit()"><center>';
-
-				if (basename($big['file']) != 'unknown_group.png') {
-					echo '<a class="thickbox" href="'.$original['file'].'"><img src='.$big['file'].' class="social-groups-image" /> </a><br /><br />';
-				} else {
-					echo '<img src='.$big['file'].' class="social-groups-image" /><br /><br />';
-				}
+				echo '<div class="social-background-content" onmouseout="hide_icon_edit()" onmouseover="show_icon_edit()"><center>';				
+				echo Display::url('<img src='.$big['file'].' class="social-groups-image" /> </a><br /><br />', api_get_path(WEB_PATH).'main/social/groups.php?id='.$group_id);
 				if (GroupPortalManager::is_group_admin($group_id, api_get_user_id())) {
 					echo '<div id="edit_image" class="hidden_message" style="display:none"><a href="'.api_get_path(WEB_PATH).'main/social/group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a></div>';
 				}
@@ -609,7 +604,7 @@ class SocialManager extends UserManager {
 		  	echo '</div>';
 	  	}
 
-		if ($show != 'shared_profile') {
+		if (!in_array($show, array('shared_profile', 'groups', 'group_edit', 'member_list','waiting_list','invite_friends'))) {
 			echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
 
 	        echo 	'<div>
@@ -618,7 +613,6 @@ class SocialManager extends UserManager {
 	                        <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="'.($show=='messages'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Messages').$count_unread_message.'</span></a></li>';
 
 			if (in_array($show, $show_messages)) {
-
 					echo '<li><ul>';
 						echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
 						echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Inbox').'</span></a></li>';						
@@ -635,14 +629,14 @@ class SocialManager extends UserManager {
 	              <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.png',get_lang('SocialGroups'),array('hspace'=>'6')).'<span class="'.($show=='groups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('SocialGroups').'</span></a></li>';
 			
 			//Show groups
-	        if (in_array($show,$show_groups)) {					
+/*	        if (in_array($show,$show_groups)) {					
     			echo $create_group_item;
                 if (api_get_setting('allow_students_to_create_groups_in_social') == 'true' || api_is_platform_admin()) {                        
                     echo '<li><ul>';    
                     echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.png',get_lang('MySocialGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MySocialGroups').'</span></a></li>';
                     echo '</ul></li>';
                 }
-			}
+			}*/
 			
 			//Groups
 			if (api_get_setting('show_groups_to_users') == 'true') {
@@ -659,12 +653,12 @@ class SocialManager extends UserManager {
 			//My files
 			 echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase_small.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';	
 	        echo'</ul>
-				  </div>';
-
-	        if (in_array($show, $show_groups) && !empty($group_id)) {
-	        	echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id(), $show);
-	        }
+				  </div>';	     
 		}
+		
+        if (in_array($show, $show_groups) && !empty($group_id)) {
+            echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id(), $show);
+        }
 
         if ($show == 'shared_profile') {
 

+ 3 - 2
main/social/group_invitation.php

@@ -339,8 +339,9 @@ if ($add_type == 'multiple') {
 			SocialManager::show_social_menu('invite_friends',$group_id);
 		echo '</div>';
 
-	echo '<div id="social-content-right">';
-
+	echo '<div id="social-content-right">';	
+    echo '<h2><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h2>';
+    
 	if (count($nosessionUsersList) == 0) {
 			$friends = SocialManager::get_friends(api_get_user_id());
 			if ($friends == 0) {

+ 3 - 0
main/social/group_members.php

@@ -107,6 +107,9 @@ echo '<div id="social-content">';
 	SocialManager::show_social_menu('member_list',$group_id);
 	echo '</div>';
 	echo '<div id="social-content-right">';
+	
+	     echo '<h2><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h2>';
+	 
 		echo '<div class="social-box-container2">';				
 			echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('MemberList')).'</div>';
 			echo '<div id="div_content_table" class="social-box-content2">';

+ 97 - 34
main/social/groups.php

@@ -33,8 +33,8 @@ if (isset($_GET['anchor_topic'])) {
 	}
 	$anchor = 'topic_'.$match[1];
 }
-
-$htmlHeadXtra[] = '<script type="text/javascript">
+$htmlHeadXtra[] = api_get_jquery_ui_js();
+$htmlHeadXtra[] = '<script type="text/javascript"> 
 
 var counter_image = 1;
 function remove_image_form(id_elem1) {
@@ -82,6 +82,9 @@ function validate_text_empty (str,msg) {
 }
 
 jQuery(document).ready(function() {
+ 
+	$("#tabs").tabs();
+	$("#tab_browse").tabs();
 
    var valor = "'.$anchor.'";
 
@@ -123,6 +126,9 @@ 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'));
 
@@ -152,7 +158,10 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
 		$content = $_POST['content'];
 		$group_id = intval($_POST['group_id']);
 		$parent_id = intval($_POST['parent_id']);
-
+		
+		if ($_POST['action'] == 'reply_message_group') {
+		    $title = cut($content, 50);
+		}
 		if ($_POST['action'] == 'edit_message_group') {
 			$edit_message_id = 	intval($_POST['message_id']);
 			$res = MessageManager::send_message(0, $title, $content, $_FILES, '', $group_id, $parent_id, $edit_message_id);
@@ -231,7 +240,7 @@ echo '<div id="social-content">';
 		if ($group_id != 0 ) {
 			SocialManager::show_social_menu('groups',$group_id);
 		} else {
-			$show_menu = 'groups';
+			$show_menu = 'browse_groups';
 			if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
 				$show_menu = $_GET['view'];
 			}
@@ -294,15 +303,58 @@ if ($group_id != 0 ) {
 	echo '<div class="clear"></div>';
 
 	//-- Show message groups
-	echo '<div class="messages">';
+	echo '<div class="messages" style="width:720px">';
 		if (GroupPortalManager::is_group_member($group_id)) {
-			echo '<h3>'.get_lang('Topics').'</h3>';
+			//echo '<h3>'.get_lang('Topics').'</h3>';		
+			
 			$content = MessageManager::display_messages_for_group($group_id);
-			if (!empty($content)) {
-				echo $content;
+			if (empty($content)) {			
+				$content =  '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).get_lang('YouShouldCreateATopic').'</a></li>';
 			} else {
-				echo '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouShouldCreateATopic').'</span></a></li>';
+			    $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).get_lang('NewTopic').'</a>';
+			    $content = $create_thread_link.$content; 			    
 			}
+			
+			$members		= GroupPortalManager::get_users_by_group($group_id);
+            $member_content = '';
+    		//Members
+    		if (count($members) > 0) {
+				$min_count_members = 4;
+				$i = 1;
+				//$member_content .= '<div width="100%">';
+				$member_content .= Display::url(Display::return_icon('edit.gif', get_lang('EditMembersList')).' '.get_lang('EditMembersList'), 'group_members.php?id='.$group_id);
+				
+				foreach($members as $member) {				    
+					if ($i > $min_count_members) break;
+					// if is a member
+					if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
+						//add icons
+						if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
+							$icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
+						} elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
+							$icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+						} else{
+							$icon= '';
+						}
+						$image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);
+						$picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
+
+						$member_content .= '<div class="">';
+						$member_name = Display::url(api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon, 'profile.php?u='.$member['user_id']);
+						$member_content .= Display::div('<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>&nbsp'.$member_name);						
+						$member_content .= '</div>';
+						$i++;
+					}					 	
+				}
+				//if (count($members) > $min_count_members) {
+					//More link
+					
+				//}   
+				//$member_content .= '</div>';						
+    		}		
+    		$headers = array(get_lang('Messages'), get_lang('Members'));
+			echo Display::tabs($headers, array($content, $member_content),'tabs');
+			
 		} else {
 			// if I already sent an invitation message
 			if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
@@ -454,65 +506,76 @@ if ($group_id != 0 ) {
 
 	   		switch ($view_group) {
 	   			case 'mygroups' :
-	        		if (count($grid_my_groups) > 0) {
-	        			echo '<h2>'.get_lang('MyGroups').'</h2>';
-	        			Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+	        		if (count($grid_my_groups) > 0) {	        			
+	        			$my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
 	        		}
-	       			if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
-						if (empty($grid_my_groups)) {
-							echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
-						}
-					}
+        	   		if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+        	        	    $create_group_item =  '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
+        	        	    $my_group_content = $create_group_item. $my_group_content;
+        	        } else {
+        	            	if (api_is_allowed_to_edit(null,true)) {
+        	            	    $create_group_item =  '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
+        	        	        $my_group_content = $create_group_item. $my_group_content;
+        	            	}
+        	        }
 
 	        		break;
 	        	case 'newest' :
 	        		if (count($grid_newest_groups) > 0) {
-						echo '<h2>'.get_lang('Newest').'</h2>';
-						Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+						$newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 					}
-
 					if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
 						if (empty($grid_newest_groups)) {
-							echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+							//echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
 						}
 					}
 	        		break;
 	        	default :
 	        		if (count($grid_pop_groups) > 0) {
-						echo '<h2>'.get_lang('Popular').'</h2>';
-						Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+						//echo '<h2>'.get_lang('Popular').'</h2>';
+						$popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 					}
-
 					if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
 						if (empty($grid_pop_groups)) {
-							echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+							//echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
 						}
 					}
 	        		break;
 	   		}
 	   	} else {
 	        if (count($grid_my_groups) > 0) {
-	        	echo '<h2>'.get_lang('MyGroups').'</h2>';
-	        	Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+	        	//echo '<h2>'.get_lang('MyGroups').'</h2>';
+	        	$my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+                if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
+    	        	    $create_group_item =  '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
+    	        	    $my_group_content = $create_group_item. $my_group_content;
+    	        } else {
+    	            	if (api_is_allowed_to_edit(null,true)) {
+    	            	    $create_group_item =  '<a href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).get_lang('CreateASocialGroup').'</a>';
+    	        	        $my_group_content = $create_group_item. $my_group_content;
+    	            	}
+    	        }
 	        }
 			if (count($grid_newest_groups) > 0) {					
-				echo '<h2>'.get_lang('Newest').'</h2>';
-				Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
+				//echo '<h2>'.get_lang('Newest').'</h2>';
+				$newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 			}
 			if (count($grid_pop_groups) > 0) {
 				//echo '<div class="social-groups-text3">'.get_lang('Popular').'</div>';
-				echo '<h2>'.get_lang('Popular').'</h2>';
-				Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+				//echo '<h2>'.get_lang('Popular').'</h2>';
+				$popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 			}
-
 			if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
 				if (empty($grid_my_groups)  && empty($grid_newest_groups)  && empty($grid_pop_groups) ) {
-					echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
+					//echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
 				}
 			}
 	   	}
+	   	
+	   	$headers = array(get_lang('MyGroups'), get_lang('Newest'), get_lang('Popular'));
+	   	
+		echo Display::tabs($headers, array($my_group_content, $newest_content, $popular_content),'tab_browse');		
 		echo '</div>';
-
 }
 	echo '</div>';
 echo '</div>';

+ 24 - 23
main/social/message_for_group_form.inc.php

@@ -71,29 +71,30 @@ $page_topic  = !empty($_GET['topics_page_nr'])?intval($_GET['topics_page_nr']):1
 <div id="id_content_panel_init">
 	<dl>
 	<?php
-			if (api_get_setting('allow_message_tool')=='true') {	
-	            //normal message
-		   		$user_info=api_get_user_info($userfriend_id);
-		  		echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;&nbsp;&nbsp;<?php echo api_xml_http_response_encode($to_group); ?>
-		  		<br />
-		 		<br /><span style="color:red">*</span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
-		 		<input id="txt_subject_id" name="title" type="text" style="width:450px;" value="<?php echo $subject ?>"><br/>
-		   		<br /><?php echo api_xml_http_response_encode(get_lang('Message')); ?> :<br />		   		
-		   		<?php
-				$oFCKeditor = new FCKeditor('content') ;
-				$oFCKeditor->ToolbarSet = 'messages';
-				$oFCKeditor->Width		= '100%';
-				$oFCKeditor->Height		= '130';
-				$oFCKeditor->Value		= $message;					
-				$return =	$oFCKeditor->CreateHtml();	
-				echo $return;
-		   		?>		   		
-		   		<br /><?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />
-				<span id="filepaths"><div id="filepath_1"><input type="file" name="attach_1" size="20" /></div></span>
-				<div id="link-more-attach"><a href="javascript://" onclick="return add_image_form()"><?php echo get_lang('AddOneMoreFile') ?></a>&nbsp;(<?php echo api_xml_http_response_encode(sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize')))) ?>)</div>		   				   				   		
-		   		<br />
-		   		<button class="save" onclick="if(validate_text_empty(this.form.title.value,'<?php echo get_lang('YouShouldWriteASubject')?>')){return false;}" type="submit" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>
-		   		<div><span style="color:red">*</span><?php echo get_lang('FieldRequired') ?></div>
+		if (api_get_setting('allow_message_tool')=='true') {	
+            //normal message
+	   		$user_info=api_get_user_info($userfriend_id);
+	  		echo api_xml_http_response_encode(get_lang('To')).":&nbsp;&nbsp;".api_xml_http_response_encode($to_group); 
+	  		if ($allowed_action == 'add_message_group') {
+	  		    echo '<br /><br /><span style="color:red">*</span> '.api_xml_http_response_encode(get_lang('Subject')).' :<br />';
+	  		    echo '<input id="txt_subject_id" name="title" type="text" style="width:450px;" value="'.$subject.'"><br />';		 	 
+	  		}
+	  		echo '<br /><br />'.api_xml_http_response_encode(get_lang('Message')).' :<br />';		   		
+	   		
+			$oFCKeditor = new FCKeditor('content') ;
+			$oFCKeditor->ToolbarSet = 'messages';
+			$oFCKeditor->Width		= '100%';
+			$oFCKeditor->Height		= '130';
+			$oFCKeditor->Value		= $message;					
+			$return =	$oFCKeditor->CreateHtml();	
+			echo $return;
+	   		?>		   		
+	   		<br /><?php echo api_xml_http_response_encode(get_lang('AttachmentFiles')); ?> :<br />
+			<span id="filepaths"><div id="filepath_1"><input type="file" name="attach_1" size="20" /></div></span>
+			<div id="link-more-attach"><a href="javascript://" onclick="return add_image_form()"><?php echo get_lang('AddOneMoreFile') ?></a>&nbsp;(<?php echo api_xml_http_response_encode(sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize')))) ?>)</div>		   				   				   		
+	   		<br />
+	   		<button class="save" onclick="if(validate_text_empty(this.form.title.value,'<?php echo get_lang('YouShouldWriteASubject')?>')){return false;}" type="submit" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>
+	   		<div><span style="color:red">*</span><?php echo get_lang('FieldRequired') ?></div>
 	<?php } ?>
 	</dl>
 </td>

+ 3 - 3
main/social/profile.php

@@ -451,7 +451,7 @@ if ($show_full_profile) {
 			$url_open  = '<a href="groups.php?id='.$id.'">';
 			$url_close = '</a>';
 			$icon = '';
-			$name = api_strtoupper(cut($result['name'],20,true));
+			$name = cut($result['name'],20,true);
 			if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
 				$icon = Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 			} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
@@ -464,10 +464,10 @@ if ($show_full_profile) {
 				$count_users_group = $count_users_group.' '.get_lang('Members');
 			}
 			$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);
-			$item_name = '<div class="box_shared_profile_group_title">'.$url_open.'<span class="social-groups-text1">'.api_strtoupper($name).'</span>'. $icon.$url_close.'</div>';
+			$item_name = '<div class="box_shared_profile_group_title">'.$url_open.$name.$icon.$url_close.'</div>';
 
 			if ($result['description'] != '') {
-				$item_description = '<div class="box_shared_profile_group_description"><span class="social-groups-text2">'.get_lang('DescriptionGroup').'</span><p class="social-groups-text4">'.cut($result['description'],100,true).'</p></div>';
+				$item_description = '<div class="box_shared_profile_group_description"><p class="social-groups-text4">'.cut($result['description'],100,true).'</p></div>';
 			} else {
 				$item_description = '<div class="box_shared_profile_group_description"><span class="social-groups-text2"></span><p class="social-groups-text4"></p></div>';
 			}