chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor style changes in groups

Browse Source
skala
Julio Montoya 14 years ago
parent 0fcb988ab7
commit a941d7caa9
3 changed files with 26 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      main/css/base.css
  2. 20
      main/inc/lib/message.lib.php
  3. 26
      main/social/group_topics.php

28
main/css/base.css
Unescape View File

@ -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;
}

20
main/inc/lib/message.lib.php
Unescape View File

@ -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 .= '<div class="rounded_div" style="width:620px">';
$html .= '<div class="topic_div">';
$items = $topic['count'];
$reply_label = ($items == 1) ? get_lang('Reply'): get_lang('Replies');
$html .= '<table width="100%"><tr><td width="20px" valign="top">';
$html .= Display::div(Display::tag('span', $items).$reply_label, array('class' =>'group_discussions_replies'));
$html .= '</td><td valign="top">';
$html .= '</td><td width="150px" valign="top">';
$topic['title'] = trim($topic['title']);
if (empty($topic['title'])) {
$topic['title'] = get_lang('Untitled');
}
$title = Display::url('<h2>'.Security::remove_XSS($topic['title']).'</h2>', 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']);
$title = Display::url('<h3>'.Security::remove_XSS($topic['title']).'</h3>', '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 = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
$user_image = '<div class="clear"></div><div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="32" height="32" title="'.$name.'" /></div>';
$user = '<div class="message-group-author">'.$user.'</div>';
$user_info = '<td valign="top"><a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
$user_info .= '<div class="message-group-author"><img src="'.$image_repository.$existing_image.'" alt="'.$name.'" width="32" height="32" title="'.$name.'" /></div>';
$user_info .= '<div class="message-group-author">'.$user.'</div></td>';
//$date.
$html .= Display::div($title.cut($topic['content'], 350).$user_image.$user.$link, array('class'=>'group_discussions_info')).'</td></table>';
$html .= Display::div($title.cut($topic['content'], 150).$user_info, array('class'=>'group_discussions_info')).'</td></table>';
$html .= '</div>'; //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.= '<div id="message-reply-link">';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
$links.= '<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='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>';
}
}
$links.= '&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='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
$links.= '</div>';
@ -1118,7 +1118,7 @@ class MessageManager
}
}
$html .= '</div>';
$html = Display::div($html, array('class'=>'rounded_div', 'style'=>'width:638px'));
$html = Display::div($html, array('class'=>'', 'style'=>'width:638px'));
return $html;
}

26
main/social/group_topics.php
Unescape View File

@ -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 = '<a href="'.$link.'">'.get_lang('ClickHereToSeeMessageGroup')."</a><br />\r\n<br />\r\n".get_lang('OrCopyPasteTheFollowingUrl')." <br />\r\n ".$link;
$message = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'), $group_info['name'])."<br />$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 '<div id="social-content">';
SocialManager::show_social_menu('member_list', $group_id);
echo '</div>';
echo '<div id="social-content-right">';
//echo '<h4><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h4>';
echo '<h1><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a> &raquo; '.get_lang('Messages').'</h1>';
if (!empty($show_message)){
Display::display_confirmation_message($show_message);
}
@ -163,4 +143,4 @@ echo '<div id="social-content">';
echo '</div>';
echo '</div>';
Display :: display_footer();
Display :: display_footer();
Write Preview
Loading…
Cancel
Save