From 9f03d69ebb81fcb35cc9ee1565dc059f13a3e8d9 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Fri, 13 May 2016 15:36:16 +0200
Subject: [PATCH] Fix message UI

---
 main/inc/lib/message.lib.php   | 44 +++++++++++++++++++++++++++-------
 main/inc/lib/social.lib.php    |  2 +-
 main/messages/view_message.php |  8 +++----
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 810f8551c9..15571a86f2 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1038,25 +1038,50 @@ class MessageManager
 
         $from_user = api_get_user_info($user_sender_id);
         $name = $from_user['complete_name'];
-        $user_image = Display::img($from_user['avatar'], $name, array('title' => $name));
-
         $message_content = Display::page_subheader(str_replace("\\", "", $title));
-
+        $user_image = '';
         if (api_get_setting('allow_social_tool') == 'true') {
-            $message_content .= $user_image.' ';
+            $user_image = Display::img(
+                $from_user['avatar_no_query'],
+                $name,
+                array('title' => $name, 'class' => 'img-responsive img-circle', 'style' => 'max-width:35px')
+            );
         }
 
         $receiverUserInfo = api_get_user_info($row['user_receiver_id']);
 
         $message_content .='<tr>';
         if (api_get_setting('allow_social_tool') == 'true') {
+            $message_content .= '<div class="row">';
+
             if ($source == 'outbox') {
-                $message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
-                    api_strtolower(get_lang('To')).'&nbsp;<b>'.$receiverUserInfo['complete_name'].'</b>';
+                $message_content .= '<div class="col-md-1">';
+                $message_content .= $user_image;
+                $message_content .= '</div>';
+
+                $message_content .= '<div class="col-md-3">';
+                $message_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> ';
+                $message_content .= api_strtolower(get_lang('To')).'&nbsp;<b>'.$receiverUserInfo['complete_name'];
+                $message_content .= '</div>';
+
+                $message_content .= '<div class="col-md-2 col-md-offset-6">';
+                $message_content .= Display::tip(date_to_str_ago($row['send_date']), api_get_local_time($row['send_date']));
+                $message_content .= '</div>';
+
             } else {
-                $message_content .= get_lang('From').' <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
-                    api_strtolower(get_lang('To')).'&nbsp;<b>'.get_lang('Me').'</b>';
+                $message_content .= '<div class="col-md-1">';
+                $message_content .= $user_image;
+                $message_content .= '</div>';
+
+                $message_content .= '<div class="col-md-3">';
+                $message_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> ';
+                $message_content .= '</div>';
+
+                $message_content .= '<div class="col-md-2 col-md-offset-6">';
+                $message_content .= Display::tip(date_to_str_ago($row['send_date']), api_get_local_time($row['send_date']));
+                $message_content .= '</div>';
             }
+            $message_content .= '</div>';
         } else {
             if ($source == 'outbox') {
                 $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.$receiverUserInfo['complete_name'].'</b>';
@@ -1064,7 +1089,7 @@ class MessageManager
                 $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>';
             }
         }
-        $message_content .=' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
+        $message_content .='
 		        <br />
 		        <hr style="color:#ddd" />
 		        <table height="209px" width="100%">
@@ -1094,6 +1119,7 @@ class MessageManager
 		      <td width=10></td>
 		    </tr>
 		</table>';
+
         return $message_content;
     }
 
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index bba36dd274..3b4f773a91 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -1697,7 +1697,7 @@ class SocialManager extends UserManager
             $groupId,
             $userId
         );
-
+        
         $profileEditionLink = null;
 
         if ($currentUserId === $userId) {
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index 37f5a0f655..f0d19244c7 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -3,7 +3,7 @@
 /**
 *	@package chamilo.messages
 */
-$cidReset= true;
+$cidReset = true;
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();
 if (api_get_setting('allow_message_tool')!='true') {
@@ -19,7 +19,7 @@ if (isset($_REQUEST['f']) && $_REQUEST['f'] == 'social') {
 	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
 }
 
-$social_right_content = null;
+$social_right_content = '';
 
 if (isset($_GET['f']) && $_GET['f']=='social') {
 	$social_parameter = '?f=social';
@@ -57,10 +57,10 @@ $message  = '';
 
 // LEFT COLUMN
 if (api_get_setting('allow_social_tool') == 'true') {
-    //Block Social Menu
+    // Block Social Menu
     $social_menu_block = SocialManager::show_social_menu($show_menu);
 }
-//MAIN CONTENT
+// MAIN CONTENT
 $message .= MessageManager::show_message_box($id_message, $source);
 
 if (!empty($message)) {