diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php index 834fdefa8b..a1d7c209a5 100755 --- a/main/chat/chat_message.php +++ b/main/chat/chat_message.php @@ -215,21 +215,15 @@ if (!empty($course) && !empty($_user['user_id'])) { $fp = fopen($chat_path.$basename_chat.'.log.html', 'a'); // view user picture - $user_image = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true); - $user_photo = $user_image['dir'].'medium_'.$user_image['file']; - $file_photo = ''; + $userImage = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true); + $userPhoto = $userImage['dir'].'medium_'.$userImage['file']; + $filePhoto = ''; if ($isMaster) { - - // $photo = ''.get_lang('Teacher').''; - fputs($fp, '
'.$message.'
'.$timeNow.'
'.$file_photo.'
'."\n"); - //fputs($fp, '['.$timeNow.']'.$file_photo.' '.api_get_person_name($firstname, $lastname).' : '.$message.'
'."\n"); + fputs($fp, '
'.$message.'
'.$timeNow.'
'.$filePhoto.'
'."\n"); } else { - // $photo = ''.get_lang('Student').''; - //fputs($fp, '['.$timeNow.']'.$file_photo.' '.api_get_person_name($firstname, $lastname).' : '.$message.'
'."\n"); - fputs($fp, '
'.$file_photo.'
'.$message.'
'.$timeNow.'
'."\n"); + fputs($fp, '
'.$filePhoto.'
'.$message.'
'.$timeNow.'
'."\n"); } - fclose($fp); $chat_size = filesize($chat_path.$basename_chat.'.log.html'); @@ -250,7 +244,7 @@ if (!empty($course) && !empty($_user['user_id'])) { - + @@ -287,11 +281,6 @@ if (!empty($course) && !empty($_user['user_id'])) { ?> -
-
-
    +
    • - +
      - '18')).' '; else echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18')); ?> + '18')); + }else{ + echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18')); + } + ?>
      -
      - +
    diff --git a/main/chat/footer_frame.inc.php b/main/chat/footer_frame.inc.php index 2fcad3d02e..6414692e3e 100755 --- a/main/chat/footer_frame.inc.php +++ b/main/chat/footer_frame.inc.php @@ -9,9 +9,9 @@ */ ?> \ No newline at end of file diff --git a/main/chat/header_frame.inc.php b/main/chat/header_frame.inc.php index 78f034e4d0..7040771e7a 100755 --- a/main/chat/header_frame.inc.php +++ b/main/chat/header_frame.inc.php @@ -18,7 +18,7 @@ $bodyXtra = ' class="course_chat" dir="'.api_get_text_direction().'" '; if (FRAME == 'hidden') { $bodyXtra .= 'onload="javascript: updateChat(); updateConnected(); setTimeout(\'submitHiddenForm();\', 5000);"'; - // Change timeout to change refresh time of the chat window + // Change timeout to change refresh time of the chat window } elseif (FRAME == 'message') { $bodyXtra .= 'onload="javascript: eventMessage();"'; } @@ -45,91 +45,53 @@ header('Content-Type: text/html; charset='.api_get_system_encoding()); ?> - - Chat - - - - - + +Chat + + + > \ No newline at end of file diff --git a/main/chat/sound/notification.mp3 b/main/chat/sound/notification.mp3 new file mode 100644 index 0000000000..8df4788ec6 Binary files /dev/null and b/main/chat/sound/notification.mp3 differ diff --git a/main/chat/sound/notification.ogg b/main/chat/sound/notification.ogg new file mode 100644 index 0000000000..af63db8730 Binary files /dev/null and b/main/chat/sound/notification.ogg differ diff --git a/main/chat/sound/notification.wav b/main/chat/sound/notification.wav new file mode 100644 index 0000000000..7e504a6366 Binary files /dev/null and b/main/chat/sound/notification.wav differ diff --git a/main/chat/sound/sonido_notificacion.mp3 b/main/chat/sound/sonido_notificacion.mp3 deleted file mode 100644 index 52bd455bcc..0000000000 Binary files a/main/chat/sound/sonido_notificacion.mp3 and /dev/null differ diff --git a/main/chat/sound/sonido_notificacion.ogg b/main/chat/sound/sonido_notificacion.ogg deleted file mode 100644 index b4027e5b3f..0000000000 Binary files a/main/chat/sound/sonido_notificacion.ogg and /dev/null differ diff --git a/main/chat/sound/sonido_notificacion.wav b/main/chat/sound/sonido_notificacion.wav deleted file mode 100644 index 36d2dba930..0000000000 Binary files a/main/chat/sound/sonido_notificacion.wav and /dev/null differ diff --git a/main/css/chat.css b/main/css/chat.css index 38b5f48bf2..c0720c3dff 100644 --- a/main/css/chat.css +++ b/main/css/chat.css @@ -135,15 +135,15 @@ textarea { text-align: left; margin-top: 10px; } -.user-online .perfil{ +.user-online .profile{ list-style: none; padding: 0; margin:0; } -.user-online .perfil li{ +.user-online .profile li{ margin-bottom: 5px; } -.user-online .perfil li a{ +.user-online .profile li a{ color: #fff; text-decoration: none; } @@ -206,7 +206,7 @@ li.list-group-item:hover a{ #user-online-scroll .disable { display: none; } .noSelect { user-select: none; -o-user-select: none; -moz-user-select: none; -khtml-user-select: none; -webkit-user-select: none; } -.btn-enviar { +.btn-send { background: #fc585d; /* Old browsers */ background: -moz-linear-gradient(top, #fc585d 0%, #fd3746 99%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fc585d), color-stop(99%,#fd3746)); /* Chrome,Safari4+ */ @@ -232,15 +232,15 @@ li.list-group-item:hover a{ text-align:center; cursor: pointer; } -.btn-enviar:hover { +.btn-send:hover { opacity: 0.8; -}.btn-enviar:active { +}.btn-send:active { position:relative; top:1px; } .emoticons-chat img{ - width: 24px; - border: none; + width: 24px; + border: none; } .message-form-chat{ margin-top: 20px; diff --git a/main/css/lp_section.png b/main/css/lp_section.png new file mode 100644 index 0000000000..fe5080decc Binary files /dev/null and b/main/css/lp_section.png differ