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

merge

Browse Source
skala
cvargas 15 years ago
parent ce2958504b 338a10ad69
commit 70743a3720
4 changed files with 28 additions and 17 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. 7
      main/css/blue_lagoon/default.css
  2. BIN
      main/img/talk.png
  3. 34
      main/inc/footer.inc.php
  4. 4
      main/inc/lib/message.lib.php

7
main/css/blue_lagoon/default.css
Unescape View File

@ -385,13 +385,18 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
}
#footer #platformmanager {
float: left;
padding-top:18px;
padding-top:20px;
margin-left:10px;
}
#footer #coursemanager {
float: left;
margin-left: 10px;
}
#footer a {
color:#fff;
}
#footer #coursemanager {
float: left;
margin-left: 10px;
}
.copyright {

BIN
main/img/talk.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

34
main/inc/footer.inc.php
Unescape View File

@ -81,7 +81,7 @@ if (api_get_setting('show_tutor_data')=='true') {
if (count($coachs_email)>1){
$bar='<br />';
echo get_lang('Coachs').' : <ul>';
echo implode("<br /><il>",$email_link);
echo '<li>'.implode("<li>",$email_link);
} elseif(count($coachs_email)==1) {
echo get_lang('Coach').' : ';
echo implode("&nbps;",$email_link);
@ -94,31 +94,37 @@ if (api_get_setting('show_tutor_data')=='true') {
echo '<br>';
}
if (api_get_setting('show_teacher_data')=='true') {
if (api_get_setting('show_teacher_data')=='true') {
if (api_get_setting('show_tutor_data')=='false'){
$class='platformmanager';
} else {
$class='coursemanager';
}
// course manager
$id_course=api_get_course_id();
if (isset($id_course) && $id_course!=-1) {
echo '<span id="coursemanager">';
echo '<span id="'.$class.'">';
$mail=CourseManager::get_emails_of_tutors_to_course($id_course);
if (!empty($mail)) {
if (count($mail)>1){
$bar='<br />';
echo get_lang('Teachers').' : <ul>';
foreach ($mail as $value=>$key) {
foreach ($key as $email=>$name){
echo '<li>'.Display::encrypted_mailto_link($email,$name).'</li>';
}
}
echo '</ul>';
} else {
$bar='';
echo get_lang('Teacher').' : ';
}
foreach ($mail as $value=>$key) {
foreach ($key as $email=>$name){
echo '<il>'.Display::encrypted_mailto_link($email,$name).$bar.'</il>';
foreach ($mail as $value=>$key) {
foreach ($key as $email=>$name){
echo Display::encrypted_mailto_link($email,$name).'<br />';
}
}
}
}
if (count($mail)>1){
echo '</ul>';
} else {
echo '<br>';
}
echo '<br /></span>';
}
}

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

@ -904,7 +904,7 @@ class MessageManager
$html .= '<a name="topic_'.$topic['id'].'"></a>';
$html.= '<div style="margin-bottom:10px">';
$html.= '<div id="message-reply-link" style="margin-right:10px">
<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=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
<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=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
$html.= '&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='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
@ -934,7 +934,7 @@ class MessageManager
$html_items .= '<div class="social-box-content3">';
$html_items.= '<div id="message-reply-link">';
$html_items.= '<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='.$item['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
$html_items.= '<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='.$item['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $item['user_sender_id'] == $current_user_id) {
$html_items.= '&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='.$current_user_id.'&group_id='.$group_id.'&message_id='.$item['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';

Write Preview
Loading…
Cancel
Save