diff --git a/main/css/base.css b/main/css/base.css
index d17294f689..3a79ea4d67 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -596,7 +596,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {
}
.group_discussions_info {
- width:100%;
+ width:400px;
}
.group_social_grid {
@@ -1916,26 +1916,21 @@ div.image-social-content center.friend {
/*MY GROUPS*/
.mygroups_grid_item {
- background: none repeat scroll 0 0 #FFFFFF;
- border: 1px solid #E5E5E5;
- border-radius: 11px 11px 11px 11px;
-
- -webkit-border-radius: 11px 11px 11px 11px;
- -opera-border-radius: 11px 11px 11px 11px;
- -moz-border-radius: 11px 11px 11px 11px;
-
- box-shadow: 0 4px 18px #C8C8C8;
- -webkit-box-shadow: 0 4px 18px #C8C8C8;
- -opera-box-shadow: 0 4px 18px #C8C8C8;
- -moz-box-shadow: 0 4px 18px #C8C8C8;
-
+ border-bottom:1px solid #EAEAEA;
float: left;
- height: 120px;
+ height: 70px;
margin: 0 8px 15px 15px;
padding: 16px 12px 5px;
width:600px;
}
+.topic_div {
+ width:620px;
+ border-bottom:1px solid #EAEAEA;
+ margin-bottom: 20px;
+ height: 96px;
+}
+
.box_description_group_member {
color: #999999;
font-size: 10px;
@@ -2654,3 +2649,6 @@ div.admin_section h4 {
padding:10px;
}
+.topics_grid_item {
+ margin-left:20px;
+}
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 3209d7e405..85c6b093cc 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -943,20 +943,20 @@ class MessageManager
$files_attachments = self::get_links_message_attachment_files($topic['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
- $html .= '
';
+ $html .= '
';
$items = $topic['count'];
$reply_label = ($items == 1) ? get_lang('Reply'): get_lang('Replies');
$html .= '
';
$html .= Display::div(Display::tag('span', $items).$reply_label, array('class' =>'group_discussions_replies'));
- $html .= ' | ';
+ $html .= ' | ';
$topic['title'] = trim($topic['title']);
if (empty($topic['title'])) {
$topic['title'] = get_lang('Untitled');
}
- $title = Display::url(''.Security::remove_XSS($topic['title']).'', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
+ $title = Display::url(''.Security::remove_XSS($topic['title']).'', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
$date = '';
$link = '';
@@ -970,11 +970,11 @@ class MessageManager
$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'];
- $user = ''.$name.' ';
- $user_image = '';
- $user = ''.$user.' ';
+ $user_info = ' | '.$name.' ';
+ $user_info .= '';
+ $user_info .= ' '.$user.' | ';
//$date.
- $html .= Display::div($title.cut($topic['content'], 350).$user_image.$user.$link, array('class'=>'group_discussions_info')).'
';
+ $html .= Display::div($title.cut($topic['content'], 150).$user_info, array('class'=>'group_discussions_info')).'';
$html .= '
'; //rounded_div
@@ -1019,7 +1019,7 @@ class MessageManager
//$items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']);
$items_page_nr = null;
- echo Display::tag('h1', $main_message['title']);
+ echo Display::tag('h2', $main_message['title']);
$user_sender_info = UserManager::get_user_info_by_id($main_message['user_sender_id']);
$files_attachments = self::get_links_message_attachment_files($main_message['id']);
$name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']);
@@ -1075,7 +1075,7 @@ class MessageManager
$links.= '
';
@@ -1118,7 +1118,7 @@ class MessageManager
}
}
$html .= '
';
- $html = Display::div($html, array('class'=>'rounded_div', 'style'=>'width:638px'));
+ $html = Display::div($html, array('class'=>'', 'style'=>'width:638px'));
return $html;
}
diff --git a/main/social/group_topics.php b/main/social/group_topics.php
index de29ddf96f..6efd642e2e 100644
--- a/main/social/group_topics.php
+++ b/main/social/group_topics.php
@@ -119,27 +119,6 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
if (is_string($res)) {
Display::display_error_message($res);
}
-/*
- if (!empty($res)) {
- $groups_user = GroupPortalManager::get_users_by_group($group_id);
- $group_info = GroupPortalManager::get_group_data($group_id);
- $admin_user_info = api_get_user_info(1);
- $sender_name = api_get_person_name($admin_user_info['firstName'], $admin_user_info['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
- $sender_email = $admin_user_info['mail'];
- $subject = sprintf(get_lang('ThereIsANewMessageInTheGroupX'),$group_info['name']);
- $link = api_get_path(WEB_PATH).'main/social/groups.php?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
- $text_link = ''.get_lang('ClickHereToSeeMessageGroup')."
\r\n
\r\n".get_lang('OrCopyPasteTheFollowingUrl')."
\r\n ".$link;
-
- $message = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'), $group_info['name'])."
$text_link";
-
- foreach ($groups_user as $group_user) {
- //if ($group_user == $current_user) continue;
- $group_user_info = api_get_user_info($group_user['user_id']);
- $recipient_name = api_get_person_name($group_user_info['firstName'], $group_user_info['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
- $recipient_email = $group_user_info['mail'];
- @api_mail_html($recipient_name, $recipient_email, stripslashes($subject), $message, $sender_name, $sender_email);
- }
- } */
$topic_id = intval($_GET['topic_id']);
if ($_POST['action'] == 'add_message_group') {
$topic_id = $res;
@@ -154,7 +133,8 @@ echo '';
SocialManager::show_social_menu('member_list', $group_id);
echo '
';
echo '';
- //echo '
';
+ echo '
';
+
if (!empty($show_message)){
Display::display_confirmation_message($show_message);
}
@@ -163,4 +143,4 @@ echo '
';
echo '
';
echo '
';
-Display :: display_footer();
+Display :: display_footer();
\ No newline at end of file