Tuning social network + CSS see #190

main/css/blue_lagoon/default.css

@@ -2770,6 +2770,11 @@ a.unread {
 	line-height:150%;
 	margin: 5px 0px 8px 0px;
 }
+.message-group-date {
+	color:#666;
+	float:right;	
+}
+
 
 .view-message-content {
 	line-height:150%;
@@ -3004,6 +3009,19 @@ a.unread {
 	padding:2px 0px;
 }
 
+#social_main {
+	float:left;
+	width: 90%;
+}
+
+#social_left {
+	float:left;
+}
+
+#social_right {
+	float:right;
+}
+
 /* INVITATIONS */
  
 .invitation_confirm {

main/inc/ajax/social.ajax.php

@@ -115,7 +115,7 @@ switch ($action) {
 			$number_loop   = ($number_friends/$number_of_images);
 			$loop_friends  = ceil($number_loop);
 			$j=0;
-			$friend_html.= '<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="" >';
+			$friend_html.= '<br /><table width="100%" border="0" cellpadding="0" cellspacing="0" >';
 			for ($k=0;$k<$loop_friends;$k++) {
 				$friend_html.='<tr><td valign="top">';
 				if ($j==$number_of_images) {
@@ -140,7 +140,6 @@ switch ($action) {
 		break;	
 	default:
 		echo '';	
-	
 }
 exit;
 ?>

main/inc/lib/message.lib.php

@@ -878,9 +878,19 @@ class MessageManager
 					$html .= '<div class="message-topic" >';
 					$html .= '<a href="#" class="head" id="head_'.$topic['id'].'">
 								'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align: middle')).'
-								<span class="message-group-title-topic">'.$topic['title'].'</span>
+								<span class="message-group-title-topic">'.$topic['title'].'</span>';
-								<span class="message-group-date">('.get_lang('PostIn').' '.date_to_str_ago($topic['send_date']).($topic['send_date']!=$topic['update_date']?' - '.get_lang('UpdatedIn').' '.date_to_str_ago($topic['send_date']):'').')</span>
+					//$html .= '<span class="message-group-date">('.get_lang('PostIn').' '.date_to_str_ago($topic['send_date']).($topic['send_date']!=$topic['update_date']?' - '.get_lang('LastUpdate').' '.date_to_str_ago($topic['send_date']):'').')</span>';
-							  </a>';							
+					$html .= '</a>';
+					
+					if ($topic['send_date']!=$topic['update_date']) {
+						if (!empty($topic['update_date']) && $topic['update_date'] != '0000-00-00 00:00:00' ) {						
+							$html .= '<span class="message-group-date"> '.get_lang('LastUpdate').' '.date_to_str_ago($topic['update_date']).'</span>';
+						}	
+					} else {
+							$html .= '<span class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</span>';
+					}			
+				 
+											
 						$html .= '<div>';
 							$html.= '<div style="margin-left: '.$indent.'px;margin-bottom:10px">';
 								$html.= '<div id="message-reply-link" style="margin-right:10px">
@@ -914,7 +924,17 @@ class MessageManager
 								$html.= '<div class="message-group-title">'.$item['title'].'&nbsp;</div>';												
 								$html.= '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$item['user_sender_id'].'">'.$name.'&nbsp;</a></div>';		
 								$html.= '<div class="message-group-content">'.$item['content'].'</div>';
-								$html.= '<div class="message-group-date">'.get_lang('PostIn').' '.date_to_str_ago($item['send_date']).($item['send_date']!=$item['update_date']?' - '.get_lang('UpdatedIn').' '.date_to_str_ago($item['send_date']):'').'</div>';						
+								
+								if ($item['send_date'] != $item['update_date']) {
+									if (!empty($item['update_date']) && $item['update_date'] != '0000-00-00 00:00:00' ) {						
+										$html .= '<span class="message-group-date"> '.get_lang('LastUpdate').' '.date_to_str_ago($item['update_date']).'</span>';
+									}	
+								} else {
+									$html .= '<span class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($item['send_date']).'</span>';
+								}	
+					
+								//$html.= '<div class="message-group-date">'.get_lang('PostIn').' '.date_to_str_ago($item['send_date']).($item['send_date']!=$item['update_date']?' - '.get_lang('UpdatedIn').' '.date_to_str_ago($item['send_date']):'').'</div>';
+														
 								$html.= '<div class="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>';						
 							$html.= '</div>';										
 						}

main/inc/lib/social.lib.php

@@ -656,12 +656,15 @@ class SocialManager extends UserManager {
 		echo '<div class="social_menu">';
 			echo '<ul>';
 			echo '<li>'.get_lang('Menu').'</li>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png').' '.get_lang('Home').'</a></li>';
+			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif').' '.get_lang('Home').'</a></li>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a></li>';
+			
 			if ($show == 'messages') {
+				echo '<ul class="social_menu_messages">';
 					echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a></li>';
 					echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a></li>';
 					echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a></li>';
+				echo '</ul>';
 			}	
 	
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('lp_users.png').' '.get_lang('Invitations').'</a></li>';

main/social/friends.php

@@ -43,8 +43,6 @@ function delete_friend (element_div) {
 }
 			
 		
-		
-		
 function search_image_social(element_html)  {
 	name_search=$(element_html).attr("value");
 	 $.ajax({

main/social/groups.php

@@ -62,7 +62,7 @@ function add_image_form() {
 
 jQuery(document).ready(function() {
    $(".head").click(function() {   			
-		$(this).next().slideToggle("fast");
+		$(this).next().next().slideToggle("fast");
 		
 		image_clicked = $("#" + this.id + " img").attr("src");	
 		
@@ -80,7 +80,7 @@ jQuery(document).ready(function() {
 		}
 		
 		return false;
- 	}).next().hide();
+ 	}).next().next().hide();
 });
 
 	</script>';
@@ -123,7 +123,7 @@ $group_id	= intval($_GET['id']);
 echo '<div id="social_wrapper">';
 
 	//this include the social menu div
-	//SocialManager::show_social_menu(array('messages'));	
+	SocialManager::show_social_menu(array('messages'));	
 	
 	echo '<div id="social_main">';
 	

main/social/home.php

@@ -31,12 +31,64 @@ echo '<div id="social_wrapper">';
 	
 	echo '<div id="social_main">';
 	
-		echo '<div id="social_center">';
+		echo '<div id="social_main_sub">';
+		
+			echo '<div id="social_top">';
+			echo get_lang('User Online').'120';
+			echo '</div>';
+		
+			echo '<div id="social_left">';
 			echo 'myinfo';
+			
+				echo '<div id="social_center">';
+				echo '</div>';	
+				echo '<div id="social_center">';
+				echo '</div>';
+				echo '<div id="social_center">';
+				echo '</div>';
+				
 			echo '</div>';
 			
 			echo '<div id="social_right">';
-		echo 'group info';
+					
+				$results = GroupPortalManager::get_groups_by_age(1);
+				
+				$groups = array();
+				foreach ($results as $result) {
+					
+					$id = $result['id'];
+					$url_open  = '<a href="groups.php?id='.$id.'">';
+					$url_close = '</a>';		
+					$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close, cut($result['description'],180,true));
+				}
+				if (count($groups) > 0) {		
+					echo '<h3>'.get_lang('Popular').'</h3>';	
+					Display::display_sortable_grid('newest', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
+				}
+				
+				
+				$results = GroupPortalManager::get_groups_by_popularity(1);
+				$groups = array();
+				foreach ($results as $result) {
+					$id = $result['id'];
+					$url_open  = '<a href="groups.php?id='.$id.'">';
+					$url_close = '</a>';		
+					
+					if ($result['count'] == 1 ) {
+						$result['count'] = $result['count'].' '.get_lang('Member');	
+					} else {
+						$result['count'] = $result['count'].' '.get_lang('Members');
+					}
+					
+					$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],cut($result['description'],120,true));
+				}
+				if (count($groups) > 0) {
+					echo '<h3>'.get_lang('Popular').'</h3>';
+					Display::display_sortable_grid('popular', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+				}
+			
+			echo '</div>';
+			
 		echo '</div>';
 		
 	echo '</div>';

main/social/message_for_group_form.inc.php

@@ -45,7 +45,7 @@ if (!empty($group_id) && $allowed_action) {
 	if (!empty($message_id)) {
 		$message_info = MessageManager::get_message_by_id($message_id);
 		if ($allowed_action == 'reply_message_group') {				
-			$subject  = get_lang('Reply').':'.api_xml_http_response_encode($message_info['title']);
+			$subject  = get_lang('Reply').': '.api_xml_http_response_encode($message_info['title']);
 		} else {
 			$subject  = api_xml_http_response_encode($message_info['title']);
 			$message  = api_xml_http_response_encode($message_info['content']);