Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Author: ywarnier

app/Resources/public/css/base.css

@@ -6038,6 +6038,16 @@ ul#toolnavbox-two li a.btn{
 #smallcalendar .month{
     text-align: center;
 }
+.list-message{
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+.list-message li{
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: middle;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
@@ -6261,6 +6271,21 @@ ul#toolnavbox-two li a.btn{
     .navbar-default{
         border: none;
     }
+    .question_options .radio {
+	min-height: 18px;
+	margin-left: 20px;
+        font-size: 12px;
+    }
+    .question_options .checkbox{
+        margin-left: 20px;
+    }
+    .main-question .question_title {
+	font-size: 16px;
+	font-weight: bold;
+	margin: 15px 0px;
+	color: #666666;
+        line-height: 20px;
+    }
 }
 
 

main/inc/lib/message.lib.php

@@ -1041,30 +1041,21 @@ public static function show_message_box($message_id, $source = 'inbox')
             $message_content .= '<div class="row">';
 
             if ($source == 'outbox') {
-                $message_content .= '<div class="col-md-1">';
-                $message_content .= $user_image;
+                $message_content .= '<div class="col-md-12">';
+                $message_content .= '<ul class="list-message">';
+                $message_content .= '<li>' . $user_image . '</li>';
+                $message_content .= '<li><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'].'</b></li>';
+                $message_content .= '<li>' . Display::dateToStringAgoAndLongDate($row['send_date']) . '</li>';
+                $message_content .= '</ul>';
                 $message_content .= '</div>';
-
-                $message_content .= '<div class="col-md-4">';
-                $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-5">';
-                $message_content .= Display::dateToStringAgoAndLongDate($row['send_date']);
-                $message_content .= '</div>';
-
             } else {
-                $message_content .= '<div class="col-md-1">';
-                $message_content .= $user_image;
-                $message_content .= '</div>';
-
-                $message_content .= '<div class="col-md-4">';
-                $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-5">';
-                $message_content .= Display::dateToStringAgoAndLongDate($row['send_date']);
+                $message_content .= '<div class="col-md-12">';
+                $message_content .= '<ul class="list-message">';
+                $message_content .= '<li>' . $user_image . '</li>';
+                $message_content .= '<li><a href="' . api_get_path(WEB_PATH) . 'main/social/profile.php?u=' . $user_sender_id . '">' . $name . '</a> </li>';
+                $message_content .= '<li>'. Display::dateToStringAgoAndLongDate($row['send_date']) . '</li>';
+                $message_content .= '</ul>';
                 $message_content .= '</div>';
             }
             $message_content .= '</div>';
@@ -1077,7 +1068,7 @@ public static function show_message_box($message_id, $source = 'inbox')
         }
 
         $message_content .= '
-		        <br />
+		        
 		        <hr style="color:#ddd" />
 		        <table width="100%">
 		            <tr>