diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7051cc32ae..145663af0b 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -394,8 +394,12 @@ ul#navigation .report a { margin: 30px 0 0 0; padding: 0 0 0 10px; } - - +#simple-dialog-form{ + font-size: 12px; +} +#simple-dialog-form .control-label{ + padding-top: 0; +} /* --------------------------------------------------- styles for the agenda (day, week, month view) -----------------------------------------------------*/ @@ -4778,7 +4782,7 @@ i.size-32.icon-new-work{ } .social-avatar .social-profile{ text-align: center; - padding-top: 10px; + padding-top: 20px; } .social-avatar .social-profile .img-responsive{ display: inline-block; @@ -4922,7 +4926,6 @@ i.size-32.icon-new-work{ } .top-mediapost .user-image .avatar-thumb, .sub-mediapost .user-image .avatar-thumb{ - padding: 2px; border: 1px solid #dddddd; margin-bottom: 5px; margin-right: 5px; @@ -6276,6 +6279,98 @@ a.sessionView { #gradebook_list .centered .badge-group { width: auto; } +/* video chat */ +#chat-local-video video, +#chat-remote-video video{ + border-radius: 5px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + box-shadow: 0 2px 3px #C8C8C8; + border: 1px solid #e6e6e6; + background-color:#fff; + padding: 5px; +} +#chat-local-video video, +#chat-remote-video video{ + width: 100%; + min-width: 100%; + display: block; +} +#chat-video-panel .username-local{ + text-align: center; + padding-bottom: 5px; + padding-top:5px; + margin-top:10px; + margin-bottom:10px; + color: #666666; +} +#chat-video-panel .chat-user-remote{ + text-align: center; + padding-bottom: 5px; + padding-top:5px; + color: #666666; +} +#chat-video-panel .title{ + display: block; + color: #52606F; + padding: 0; + margin: 0; + margin-bottom: 20px; + padding-bottom: 10px; + font-size: 20px; + border-bottom: 1px solid #E5E5E5; +} +#listFriends .list-group-item{ + border: none; + padding: 6px; + font-size: 12px; +} + +#listFriends a{ + display: block; + text-overflow: ellipsis; +} +#listFriends a .username{ + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + width: 120px; +} +#chat-video-panel #listFriends a .username{ + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + width: 180px; +} +#listFriends .status{ + float: right; +} +#listFriends .user-image{ + width: 32px; + height: 32px; + margin-right: 5px; +} +#course-block .list-group .list-group-item{ + padding: 5px; + border:none; + font-size: 12px; + line-height: 17px; + color:#666666; +} +#course-block .list-group .img-default{ + float: left; + margin-right: 5px; +} +#course-block .list-group .list-group-item .img-course{ + width: 70px; + float: left; + margin-right: 5px; +} +#course-block .list-group .list-group-item .title{ + display: block; +} /* CSS NEW TOP ******************************************************************************/ /* CSS Responsive */ @media (min-width: 1025px) and (max-width: 1200px) { diff --git a/main/img/session_default_small.png b/main/img/session_default_small.png new file mode 100644 index 0000000000..cda94cdb59 Binary files /dev/null and b/main/img/session_default_small.png differ diff --git a/main/img/statusoffline.png b/main/img/statusoffline.png new file mode 100644 index 0000000000..a4cecdaa02 Binary files /dev/null and b/main/img/statusoffline.png differ diff --git a/main/img/statusonline.png b/main/img/statusonline.png new file mode 100644 index 0000000000..04214263b9 Binary files /dev/null and b/main/img/statusonline.png differ diff --git a/main/inc/lib/javascript/chat/css/chat.css b/main/inc/lib/javascript/chat/css/chat.css index 2395375870..96c41b0c50 100755 --- a/main/inc/lib/javascript/chat/css/chat.css +++ b/main/inc/lib/javascript/chat/css/chat.css @@ -36,13 +36,11 @@ cursor:pointer; } .user_status_main { - width:30px; + width:18px; display:inline; float:left; padding: 0px 4px 0px 4px; } - - .chatbox { position: fixed; position:expression("absolute"); @@ -50,23 +48,27 @@ display:none; z-index: 9000; } - .user_status { - width:16px; - display:inline; - float:left; + width:8px; + display:inline-block; + margin-right: 5px; +} +.chatimage{ + display: inline-block; + margin-right: 5px; } .chatboxtitle { font-weight: normal; - float: left; - font-size: 12px; - width: 130px; + display: inline-block; + font-size: 10px; + width: 100px; cursor:pointer; overflow: hidden; padding-left: 2px; text-overflow: ellipsis; white-space: nowrap; + line-height: 10px; } .chatboxhead { diff --git a/main/inc/lib/javascript/chat/js/chat.js b/main/inc/lib/javascript/chat/js/chat.js index 0060fa2e55..325a8bdfbc 100755 --- a/main/inc/lib/javascript/chat/js/chat.js +++ b/main/inc/lib/javascript/chat/js/chat.js @@ -325,8 +325,8 @@ function restructureChatBoxes() { * @param status * **/ -function chatWith(user_id, user_name, status) { - createChatBox(user_id, user_name, 0, status); +function chatWith(user_id, user_name, status, userImage) { + createChatBox(user_id, user_name, 0, status, userImage); $("#chatbox_"+user_id+" .chatboxtextarea").focus(); } @@ -340,7 +340,7 @@ function chatNotYetWith(message) { /** * Creates a div */ -function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) { +function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage) { if ($("#chatbox_"+user_id).length > 0) { if ($("#chatbox_"+user_id).css('display') == 'none') { $("#chatbox_"+user_id).css('display','block'); @@ -350,7 +350,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) { return; } - user_is_online = return_online_user(user_id, online); + user_is_online = return_online_user(user_id, online, userImage); var chatbox = $('
') .attr({ @@ -363,11 +363,18 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) { .addClass('chatboxhead') .append(user_is_online); + $('
') + .addClass('chatimage') + .append('') + .appendTo(chatboxHead); + $('
') .addClass('chatboxtitle') .append(chatboxtitle) .appendTo(chatboxHead); + + var chatboxoptions = $('
') .addClass('chatboxoptions') .appendTo(chatboxHead); @@ -508,7 +515,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online) { * @param int user id * @param int status 1 or 0 */ -function return_online_user(user_id, status) { +function return_online_user(user_id, status, userImage) { var div_wrapper = $("
" ); var new_div = $("
" ); diff --git a/main/inc/lib/javascript/chat/video.php b/main/inc/lib/javascript/chat/video.php index ab27a62d88..10b034a4c0 100644 --- a/main/inc/lib/javascript/chat/video.php +++ b/main/inc/lib/javascript/chat/video.php @@ -14,6 +14,12 @@ if ($room === false) { Header::location(api_get_path(WEB_PATH)); } +$friend_html = SocialManager::listMyFriendsBlock( + $user_id, + $link_shared, + $show_full_profile +); + $isSender = $room['from_user'] == api_get_user_id(); $isReceiver = $room['to_user'] == api_get_user_id(); @@ -26,18 +32,22 @@ if ($isSender) { } elseif ($isReceiver) { $chatUser = api_get_user_info($room['from_user']); } - +$idUserLocal = api_get_user_id(); +$userLocal = api_get_user_info($idUserLocal, true); $htmlHeadXtra[] = '' . "\n"; $template = new Template(); -$template->assign('room_name', $room['room_name']); +$template->assign('room', $room); $template->assign('chat_user', $chatUser); +$template->assign('user_local', $userLocal); +$template->assign('block_friends', $friend_html); $content = $template->fetch('default/chat/video.tpl'); -$template->assign('header', $room['room_name']); +//$template->assign('header', $room['room_name']); $template->assign('content', $content); $template->assign('message', Display::return_message(get_lang('BroswerDoesNotSupportWebRTC'), 'warning')); $template->display_one_col_template(); +//$template->display_no_layout_template(); diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 4493be4120..d1be28c843 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -457,30 +457,48 @@ class SocialManager extends UserManager $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); $course_code = $my_course['code']; + $course_directory = $my_course['course_info']['directory']; $course_title = $my_course['course_info']['title']; $course_access_settings = CourseManager :: get_access_settings($course_code); $course_visibility = $course_access_settings['visibility']; $user_in_course_status = CourseManager :: get_user_in_course_status(api_get_user_id(), $course_code); - - $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')); + + //$valor = api_get_settings_params(); + $course_path = api_get_path(SYS_COURSE_PATH).$course_directory; // course path + if (api_get_setting('course_images_in_courses_list') === 'true') { + if (file_exists($course_path.'/course-pic85x85.png')) { + $image = $my_course['course_info']['course_image']; + $imageCourse = Display::img($image, $course_title, array('class'=>'img-course')); + } else { + $imageCourse = Display::return_icon('session_default_small.png', $course_title, array('class' => 'img-course')); + + } + } else { + $imageCourse = Display::return_icon('course.png', get_lang('Course'), array('class' => 'img-default')); + } + //$imageCourse = Display::return_icon('course.png', get_lang('Course')); //display course entry - $result .= '
'; - $result .= $s_htlm_status_icon; + if (api_get_setting('course_images_in_courses_list') === 'true') { + $result .= '
  • '; + } else { + $result .= '
  • '; + } + $result .= $imageCourse; //show a hyperlink to the course, unless the course is closed and user is not course admin if ($course_visibility != COURSE_VISIBILITY_HIDDEN && ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER) ) { - $result .= $course_title; + $result .= '' . $course_title . ''; } else { $result .= $course_title." "." ".get_lang('CourseClosed').""; } - $result .= ''; + $result .= '
    • '; - $result .= '
    '; + $session = ''; $active = false; @@ -591,13 +609,14 @@ class SocialManager extends UserManager ), 'normal' => UserManager::getUserPicture( $user_id, - USER_IMAGE_SIZE_ORIGINAL + USER_IMAGE_SIZE_MEDIUM ) ] ); } - + $skillBlock = $template->get_template('social/avatar_block.tpl'); + return $template->fetch($skillBlock); } @@ -753,7 +772,7 @@ class SocialManager extends UserManager // Chat //@todo check if user is online and if it's a friend to show the chat link - if (api_is_global_chat_enabled()) { + /*if (api_is_global_chat_enabled()) { $user_name = $user_info['complete_name']; if ($user_friend_relation == USER_RELATION_TYPE_FRIEND) { @@ -787,7 +806,7 @@ class SocialManager extends UserManager } } } - } + }*/ $html .= '
    '; @@ -1524,7 +1543,7 @@ class SocialManager extends UserManager } $userInfo = api_get_user_info($userId, true, false, true); - + $template->assign('user', $userInfo); $template->assign('socialAvatarBlock', $socialAvatarBlock); $template->assign('profileEditionLink', $profileEditionLink); @@ -1537,7 +1556,9 @@ class SocialManager extends UserManager $template->assign('gamification_points', $gamificationPoints); } - + $chatEnabled = api_is_global_chat_enabled(); + $templateName = $template->assign('chat_enabled', $chatEnabled); + $templateName = $template->get_template('social/user_block.tpl'); if (in_array($groupBlock, ['groups', 'group_edit', 'member_list'])) { @@ -1613,6 +1634,68 @@ class SocialManager extends UserManager return $friendHtml; } + /** + * @param int $user_id + * @param $link_shared + * @param $show_full_profile + * @return string + */ + public static function listMyFriendsBlock($user_id, $link_shared, $show_full_profile) + { + //SOCIALGOODFRIEND , USER_RELATION_TYPE_FRIEND, USER_RELATION_TYPE_PARENT + $friends = SocialManager::get_friends($user_id, USER_RELATION_TYPE_FRIEND); + $number_of_images = 30; + $number_friends = count($friends); + $friendHtml = ''; + + if ($number_friends != 0) { + + $friendHtml.= ''; + } else { + $friendHtml.= '
    '.get_lang('NoFriendsInYourContactList').'
    ' + .' '. get_lang('TryAndFindSomeFriends').'
    '; + } + + return $friendHtml; + } + /** * @return string */ diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index ec2e24245c..55dc1df81c 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -729,8 +729,8 @@ class Template } } - $this->assign('online_button', Display::return_icon('online.png')); - $this->assign('offline_button',Display::return_icon('offline.png')); + $this->assign('online_button', Display::return_icon('statusonline.png')); + $this->assign('offline_button',Display::return_icon('statusoffline.png')); // Get language iso-code for this page - ignore errors $this->assign('document_language', api_get_language_isocode()); diff --git a/main/social/profile.php b/main/social/profile.php index 76f8cbbfd6..00624b4f32 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -255,7 +255,7 @@ foreach ($sessionList as $session) { } // My friends -$friend_html = SocialManager::listMyFriends( +$friend_html = SocialManager::listMyFriendsBlock( $user_id, $link_shared, $show_full_profile @@ -478,15 +478,15 @@ if ($show_full_profile) { // Courses without sessions $my_course = ''; $i = 1; + foreach ($list as $key => $value) { if ( empty($value[2]) ) { //if out of any session $my_courses .= $value[1]; - $my_courses .= ''; $i++; } } $social_course_block .= $my_courses; - $social_course_block = Display::panel($my_courses, get_lang('MyCourses')); + //$social_course_block = Display::panel($my_courses, get_lang('MyCourses')); } //Block Social Sessions diff --git a/main/template/default/agenda/month.tpl b/main/template/default/agenda/month.tpl index 174f92e575..265c9274d5 100755 --- a/main/template/default/agenda/month.tpl +++ b/main/template/default/agenda/month.tpl @@ -455,8 +455,8 @@ $(document).ready(function() { } if (calEvent.course_name) { $("#calendar_course_info_simple").html( - '
    ' + - '
    ' + calEvent.course_name+"
    " + '
    ' + + '
    ' + calEvent.course_name+"
    " ); } else { $("#calendar_course_info_simple").html(''); @@ -464,8 +464,8 @@ $(document).ready(function() { if (calEvent.session_name) { $("#calendar_session_info").html( - '
    ' + - '
    ' + calEvent.session_name+"
    " + '
    ' + + '
    ' + calEvent.session_name+"
    " ); } else { @@ -536,36 +536,36 @@ $(document).ready(function() {
    -