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

Solve merge with main 1.9.x branch

Browse Source
1.9.x
Francis Gonzales 11 years ago
parent b955126347 d8e31c4a74
commit 5bac205934
4 changed files with 19 additions and 8 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. 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php
  2. 2
      main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.php
  3. 3
      main/lang/spanish/tracking.inc.php
  4. 21
      main/mySpace/index.php

1
main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php
Unescape View File

@ -29,6 +29,7 @@
$language_file = array('document'); $language_file = array('document');
require_once '../../../../../../inc/global.inc.php'; require_once '../../../../../../inc/global.inc.php';
api_block_anonymous_users();
// Disabling access for anonymous users. // Disabling access for anonymous users.
api_block_anonymous_users(); api_block_anonymous_users();

2
main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.php
Unescape View File

@ -2,6 +2,8 @@
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file = array('resourcelinker','document'); $language_file = array('resourcelinker','document');
include('../../../../../../inc/global.inc.php'); include('../../../../../../inc/global.inc.php');
api_block_anonymous_users();
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html> <html>

3
main/lang/spanish/tracking.inc.php
Unescape View File

@ -379,6 +379,9 @@ $FollowedSessions = "Sesiones seguidas";
$FollowedCourses = "Cursos seguidos"; $FollowedCourses = "Cursos seguidos";
$FollowedUsers = "Usuarios seguidos"; $FollowedUsers = "Usuarios seguidos";
$Timeline = "Línea del tiempo"; $Timeline = "Línea del tiempo";
$QuestionId = "ID de pregunta";
$ExerciseId = "ID de ejercicio";
$QuestionTitle = "Título pregunta";
$DisplayGradeOverview = "Reporte de Notas por Curso"; $DisplayGradeOverview = "Reporte de Notas por Curso";
$LpGradeReport = "Reporte de Notas por Curso"; $LpGradeReport = "Reporte de Notas por Curso";
$FinalScore = "Nota Final"; $FinalScore = "Nota Final";

21
main/mySpace/index.php
Unescape View File

@ -120,7 +120,7 @@ if ($is_session_admin) {
// Get views // Get views
$views = array('admin', 'teacher', 'coach', 'drh'); $views = array('admin', 'teacher', 'coach', 'drh');
$view = 'teacher'; $view = '';
if (isset($_GET['view']) && in_array($_GET['view'], $views)) { if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
$view = $_GET['view']; $view = $_GET['view'];
} }
@ -135,11 +135,16 @@ if ($is_platform_admin) {
$menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=admin'); $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=admin');
$menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'tracking/exams.php');
$menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php'); $menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php');
} else { } elseif ($view == 'teacher') {
$menu_items[] = Display::url(Display::return_icon('teacher_na.png', get_lang('TeacherInterface'), array(), ICON_SIZE_MEDIUM), ''); $menu_items[] = Display::url(Display::return_icon('teacher_na.png', get_lang('TeacherInterface'), array(), ICON_SIZE_MEDIUM), '');
$menu_items[] = Display::url(Display::return_icon('star.png', get_lang('AdminInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=admin'); $menu_items[] = Display::url(Display::return_icon('star.png', get_lang('AdminInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=admin');
$menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'tracking/exams.php');
$menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php'); $menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php');
} else {
$menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=teacher');
$menu_items[] = Display::url(Display::return_icon('star.png', get_lang('AdminInterface'), array(), ICON_SIZE_MEDIUM), api_get_self().'?view=admin');
$menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'tracking/exams.php');
$menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php');
} }
} }
@ -198,7 +203,7 @@ if (empty($session_id) || in_array($display, array('accessoverview','lpprogresso
echo '</div>'; echo '</div>';
if (empty($session_id)) { if (!empty($view) && empty($session_id)) {
// Getting courses followed by a coach (No session courses) // Getting courses followed by a coach (No session courses)
$courses = CourseManager::get_course_list_as_coach($user_id, false); $courses = CourseManager::get_course_list_as_coach($user_id, false);
@ -303,7 +308,7 @@ if (empty($session_id)) {
} }
} }
if ($nb_students > 0 && $view != 'admin') { if (!empty($view) && $nb_students > 0 && $view != 'admin') {
// average progress // average progress
$avg_total_progress = $avg_total_progress / $nb_students; $avg_total_progress = $avg_total_progress / $nb_students;
@ -594,7 +599,6 @@ if ((api_is_allowed_to_create_course() || api_is_drh()) && in_array($view, array
} }
if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourstudents') { if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourstudents') {
echo '<a href="' . api_get_self() . '?view=admin&amp;display=coaches">' . get_lang('DisplayCoaches') . '</a> | '; echo '<a href="' . api_get_self() . '?view=admin&amp;display=coaches">' . get_lang('DisplayCoaches') . '</a> | ';
echo '<a href="' . api_get_self() . '?view=admin&amp;display=useroverview">' . get_lang('DisplayUserOverview') . '</a>'; echo '<a href="' . api_get_self() . '?view=admin&amp;display=useroverview">' . get_lang('DisplayUserOverview') . '</a>';
if ($display == 'useroverview') { if ($display == 'useroverview') {
@ -763,7 +767,6 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
$studentList[] = array('id' => $studentInfo['user_id'], 'text' => $studentInfo['username'] . ' (' . $studentInfo['firstname'] . ' ' . $studentInfo['lastname'] . ')'); $studentList[] = array('id' => $studentInfo['user_id'], 'text' => $studentInfo['username'] . ' (' . $studentInfo['firstname'] . ' ' . $studentInfo['lastname'] . ')');
} }
$sessionFilter->addElement('select_ajax', 'student_name', get_lang('SearchStudent'), null, array('placeholder' => 'Todos', 'url' => $url, 'defaults' => $studentList, 'width' => '400px', 'class' => 'pull-right', 'minimumInputLength' => $minimumInputLength));
$options = array( $options = array(
'' => get_lang('Select'), '' => get_lang('Select'),
STUDENT => get_lang('Student'), STUDENT => get_lang('Student'),
@ -772,6 +775,8 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
); );
$sessionFilter->addElement('select', 'profile', get_lang('Profile'),$options, array('id' => 'profile', 'class' => 'pull-left')); $sessionFilter->addElement('select', 'profile', get_lang('Profile'),$options, array('id' => 'profile', 'class' => 'pull-left'));
$sessionFilter->addElement('select_ajax', 'student_name', get_lang('SearchUser'), null, array('placeholder' => 'Todos', 'url' => $url, 'defaults' => $studentList, 'width' => '400px', 'class' => 'pull-right', 'minimumInputLength' => $minimumInputLength));
$script = ' $script = '
$("#student_name").on("change", function() { $("#student_name").on("change", function() {
var date_to = $("#date_to").val(); var date_to = $("#date_to").val();
@ -806,7 +811,7 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
} }
//date filter //date filter
if (!in_array($display, array('surveyoverview', 'progressoverview', 'lpgradereport'))) { if (!in_array($display, array('surveyoverview', 'progressoverview', 'exerciseprogress', 'lpgradereport'))) {
$sessionFilter->addElement('text', 'from', get_lang('From'), array('id' => 'date_from', 'value' => (!empty($_GET['date_from']) ? $_GET['date_from'] : ''), 'style' => 'width:75px' )); $sessionFilter->addElement('text', 'from', get_lang('From'), array('id' => 'date_from', 'value' => (!empty($_GET['date_from']) ? $_GET['date_from'] : ''), 'style' => 'width:75px' ));
$sessionFilter->addElement('text', 'to', get_lang('Until'), array('id' => 'date_to', 'value' => (!empty($_GET['date_to']) ? $_GET['date_to'] : ''), 'style' => 'width:75px' )); $sessionFilter->addElement('text', 'to', get_lang('Until'), array('id' => 'date_to', 'value' => (!empty($_GET['date_to']) ? $_GET['date_to'] : ''), 'style' => 'width:75px' ));
} }
@ -1075,7 +1080,7 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
} }
} else if($display == 'courseoverview') { } else if($display == 'courseoverview') {
MySpace::display_tracking_course_overview(); MySpace::display_tracking_course_overview();
} else { } else if(!empty($display)) {
if ($export_csv) { if ($export_csv) {
$is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT); $is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT);
} else { } else {

Write Preview
Loading…
Cancel
Save