From cdd57cb1d708fdf2cb0a4395f90c8fda69089a24 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 16:12:17 -0500 Subject: [PATCH 01/12] Add trailing slash to redirection path to avoid missed redirection failure --- main/inc/local.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php index 9e9e37d7ae..5989a05ce5 100755 --- a/main/inc/local.inc.php +++ b/main/inc/local.inc.php @@ -1368,7 +1368,7 @@ if ((isset($cas_login) && $cas_login && exist_firstpage_parameter()) || if (!isset($_SESSION['request_uri'])) { if (CourseManager::get_course_id_from_path($redirectCourseDir)) { $_SESSION['noredirection'] = false; - $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir; + $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/'; } } } elseif (api_user_is_login() && exist_firstpage_parameter()) { @@ -1376,7 +1376,7 @@ if ((isset($cas_login) && $cas_login && exist_firstpage_parameter()) || api_delete_firstpage_parameter(); // delete the cookie if (CourseManager::get_course_id_from_path($redirectCourseDir)) { $_SESSION['noredirection'] = false; - $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir; + $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/'; } } From 7dce094def31970b2cf538b8dac803caa69857a2 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 17:35:09 -0500 Subject: [PATCH 02/12] Update languages --- main/lang/english/trad4all.inc.php | 6 ++++-- main/lang/french/trad4all.inc.php | 2 +- main/lang/spanish/trad4all.inc.php | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index b7d104997a..5375ad86be 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -2851,7 +2851,7 @@ $ExerciseStored = "Proceed by clicking on a question type, then enter the approp $ChooseAtLeastOneCheckbox = "Choose at least one good answer"; $ExerciseEdited = "Test name and settings have been saved."; $ExerciseDeleted = "The test has been deleted"; -$ClickToCommentAndGiveFeedback = "Click the following link to check the answer and give feedback"; +$ClickToCommentAndGiveFeedback = "Click this link to check the answer and/or give feedback"; $OpenQuestionsAttempted = "A learner has answered an open question"; $AttemptDetails = "Attempt details"; $TestAttempted = "Test attempted"; @@ -5953,7 +5953,7 @@ $NewHomeworkEmailAlertEnable = "Enable email users on assignment submission"; $NewHomeworkEmailAlertDisable = "Disable email users on assignment submission"; $MaximumOfParticipants = "Maximum number of members"; $HomeworkCreated = "An assignment was created"; -$HomeworkHasBeenCreatedForTheCourse = "An assignment was created for the course"; +$HomeworkHasBeenCreatedForTheCourse = "An assignment has been added to course"; $PleaseCheckHomeworkPage = "Please check the assignments page."; $ScormNotEnoughSpaceInCourseToInstallPackage = "There is not enough space left in this course to uncompress the current package."; $ScormPackageFormatNotScorm = "The package you are uploading doesn't seem to be in SCORM format. Please check that the imsmanifest.xml is inside the ZIP file you are trying to upload."; @@ -7557,4 +7557,6 @@ $XDays = "%s days"; $SkillProfile = "Skill profile"; $AchievedSkills = "Achieved skills"; $BusinessCard = "Business card"; +$BadgeDetails = "Badge details"; +$TheUserXNotYetAchievedTheSkillX = "The user %s not yet achieved the skill \"%s\""; ?> \ No newline at end of file diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index 16d9a1df4d..03b5647674 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -2842,7 +2842,7 @@ $ExerciseStored = "Le test a bien été ajouté"; $ChooseAtLeastOneCheckbox = "Choisissez une bonne réponse"; $ExerciseEdited = "Le test a bien été édité"; $ExerciseDeleted = "Le test a bien été supprimé"; -$ClickToCommentAndGiveFeedback = "Cliquez sur le lien suivant pour corriger la réponse et la commenter"; +$ClickToCommentAndGiveFeedback = "Cliquez sur ce lien suivant pour corriger la réponse et/ou la commenter"; $OpenQuestionsAttempted = "Un apprenant a répondu à une question ouverte"; $AttemptDetails = "Détails de l'essai"; $TestAttempted = "Nom du test"; diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index 5b5942e8ea..52e51e8542 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -2851,7 +2851,7 @@ $ExerciseStored = "Proceda haciendo clic sobre el tipo de pregunta e introducien $ChooseAtLeastOneCheckbox = "Escoger al menos una respuesta correcta"; $ExerciseEdited = "El ejercicio ha sido modificado"; $ExerciseDeleted = "El ejercicio ha sido borrado"; -$ClickToCommentAndGiveFeedback = "Haga clic en el siguiente enlace para corregir y proporcionar un feedback a la respuesta"; +$ClickToCommentAndGiveFeedback = "Haga clic en este enlace para corregir y/o dar feedback a la respuesta"; $OpenQuestionsAttempted = "Un alumno ha contestado a una pregunta abierta"; $AttemptDetails = "Detalles de los intentos"; $TestAttempted = "Ejercicio"; From 029f2961d41c1a331b547b3e8e611ba6bc64e775 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 17:54:46 -0500 Subject: [PATCH 03/12] Finetune the exercise submission e-mail (add space between label and content) - refs CT#7885 --- main/exercice/exercise.class.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index ba8d0b90a5..f3e0045c5e 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -4040,19 +4040,19 @@ class Exercise '' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'
'.get_lang('CourseName').'#course# #course#
'.get_lang('TestAttempted').'#exercise# #exercise#
'.get_lang('StudentName').'#firstName# #lastName# #firstName# #lastName#
'.get_lang('StudentEmail').'#email# #email#
'; $open_question_list = null; @@ -4115,19 +4115,19 @@ class Exercise .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'
'.get_lang('CourseName').'#course# #course#
'.get_lang('TestAttempted').'#exercise# #exercise#
'.get_lang('StudentName').'#firstName# #lastName# #firstName# #lastName#
'.get_lang('StudentEmail').'#mail# #mail#
'; $open_question_list = null; @@ -4231,19 +4231,19 @@ class Exercise .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'' .'' - .'' + .'' .'' .'
'.get_lang('CourseName').'#course# #course#
'.get_lang('TestAttempted').'#exercise# #exercise#
'.get_lang('StudentName').'#firstName# #lastName# #firstName# #lastName#
'.get_lang('StudentEmail').'#mail# #mail#
'; $msg .= '
'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'
'; From 07d93646ce32b0a249ba24b0479ff7577c1c9ffd Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 18:23:18 -0500 Subject: [PATCH 04/12] Fix e-mail sending when students register to a course all by themselves - refs CT#7885 --- main/inc/lib/auth.lib.php | 4 ++-- main/inc/lib/course.lib.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php index f383426116..db34036c41 100755 --- a/main/inc/lib/auth.lib.php +++ b/main/inc/lib/auth.lib.php @@ -614,9 +614,9 @@ class Auth if (CourseManager::add_user_to_course($user_id, $course_code, $status_user_in_new_course)) { $send = api_get_course_setting('email_alert_to_teacher_on_new_user_in_course', $course_code); if ($send == 1) { - CourseManager::email_to_tutor($user_id, $course_code, $send_to_tutor_also = false); + CourseManager::email_to_tutor($user_id, $all_course_information['real_id'], $send_to_tutor_also = false); } else if ($send == 2) { - CourseManager::email_to_tutor($user_id, $course_code, $send_to_tutor_also = true); + CourseManager::email_to_tutor($user_id, $all_course_information['real_id'], $send_to_tutor_also = true); } $url = Display::url($all_course_information['title'], api_get_course_url($course_code)); $message = sprintf(get_lang('EnrollToCourseXSuccessful'), $url); diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 0706c9946f..fbc7575523 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -2384,11 +2384,9 @@ class CourseManager if ($user_id != strval(intval($user_id))) { return false; } - $courseId = intval($courseId); $information = api_get_course_info_by_id($courseId); $course_code = $information['code']; - $courseId = $information['id']; $student = api_get_user_info($user_id); @@ -2432,7 +2430,6 @@ class CourseManager 'userUsername' => $student['username'], 'courseCode' => $course_code ); - api_mail_html( $recipient_name, $emailto, From 6947c989c833f1930954fae02913181801330b6a Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 18:36:11 -0500 Subject: [PATCH 05/12] Minor: add link on student e-mail info inside e-mail - refs CT#7885 --- main/inc/lib/course.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index fbc7575523..7454f08b00 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -2417,7 +2417,7 @@ class CourseManager $emailbody .= get_lang('LastName') . ': ' . $student['lastname'] . "\n"; $emailbody .= get_lang('FirstName') . ': ' . $student['firstname'] . "\n"; } - $emailbody .= get_lang('Email') . ': ' . $student['email'] . "\n\n"; + $emailbody .= get_lang('Email') . ': ' . $student['email'] ."\n\n"; $recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); $sender_name = api_get_person_name(api_get_setting('administratorName'), From 0182e1f28b3919de100423bf08bff5477f9277b9 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 19:25:19 -0500 Subject: [PATCH 06/12] Add badges to skills list + remove text from action buttons to increase space for description - refs CT#7883 --- main/template/default/skill/list.tpl | 44 +++++++++++++++++----------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/main/template/default/skill/list.tpl b/main/template/default/skill/list.tpl index 8a20667935..8dc59c2412 100644 --- a/main/template/default/skill/list.tpl +++ b/main/template/default/skill/list.tpl @@ -6,44 +6,54 @@ + - - - + + + + - - - + + + {% for skill in skills %} + - + From 3cb74208b95031de454ee074cc5f70303c87b303 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 19:36:21 -0500 Subject: [PATCH 07/12] Slightly change skills list style on skill wheel's left panel - refs CT#7883 --- app/Resources/public/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 828117082e..8da000d69f 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2701,7 +2701,7 @@ form .formw .freeze { } #skill_holder li { - float:left; + float: none; padding-right: 10px; margin-bottom: .5em; } @@ -4340,7 +4340,7 @@ ul.holder li.bit-input input{ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset; } ul.holder li.bit-box{ - padding: 5px; + padding-right: 15px; margin-bottom: 5px; color: #8a6d3b; background-color:#FCF8E3; From 39a1704cf8457bea6bad9a6ed1ab670f81e10484 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 20:43:59 -0500 Subject: [PATCH 08/12] Minor - Add info about Angel's contrib --- plugin/buycourses/src/buy_course_plugin.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php index 28b417d03a..10545c7fbb 100644 --- a/plugin/buycourses/src/buy_course_plugin.class.php +++ b/plugin/buycourses/src/buy_course_plugin.class.php @@ -46,7 +46,7 @@ class BuyCoursesPlugin extends Plugin Francis Gonzales and Yannick Warnier - BeezNest (integration), Alex Aragón - BeezNest (Design icons and css styles), Imanol Losada - BeezNest (introduction of sessions purchase), - Angel Fernando Quiroz Campos - BeezNest + Angel Fernando Quiroz Campos - BeezNest (cleanup and new reports) ", array( 'show_main_menu_tab' => 'boolean', From 6bae8e3897261448d059e08c3187c3626cd9e15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Tue, 13 Oct 2015 20:50:25 -0500 Subject: [PATCH 09/12] Fixes create new document that fails when select a destination - Refs #7897 --- main/document/create_document.php | 24 ++++++++++++++++++++++++ main/inc/ajax/document.ajax.php | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/main/document/create_document.php b/main/document/create_document.php index 8185e36ee9..4443e6f3bb 100755 --- a/main/document/create_document.php +++ b/main/document/create_document.php @@ -52,6 +52,16 @@ $(document).ready(function() { }); }); +$(document).on("click", ".dropdown-menu li a", function () { + var textValue = $(this).text(); + $.ajax({ + contentType: "application/x-www-form-urlencoded", + data: "textValue="+textValue, + url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=documentDestination", + type: "POST" + }); +}); + function setFocus() { $("#document_title").focus(); } @@ -432,6 +442,20 @@ if ($form->validate()) { $values = $form->exportValues(); $readonly = isset($values['readonly']) ? 1 : 0; $values['title'] = trim($values['title']); + + $textValue = $_SESSION['textValue']; + $homeDirectory = get_lang('HomeDirectory'); + if ($textValue === $homeDirectory){ + $dir = "/"; + } else if ($dir != "/") { + $posTextValue = strpos($textValue, '—'); + $textValue = substr($textValue, ($posTextValue + 4)); + foreach ($folder_titles as $dirValue => $dirText) { + if ($dirText === $textValue) { + $dir = $dirValue; + } + } + } if ($dir[strlen($dir) - 1] != '/') { $dir .= '/'; diff --git a/main/inc/ajax/document.ajax.php b/main/inc/ajax/document.ajax.php index cbe7490f72..697c52fa84 100755 --- a/main/inc/ajax/document.ajax.php +++ b/main/inc/ajax/document.ajax.php @@ -73,5 +73,10 @@ switch ($action) { ); } break; + case 'documentDestination': + //obtained the bootstrap-select selected value via ajax + $textValue = isset($_POST['textValue']) ? $_POST['textValue'] : null; + $_SESSION['textValue'] = $textValue; + break; } exit; From 44ab79dc46059df0a63a910b2e0c22079d0002b1 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 13 Oct 2015 23:47:23 -0500 Subject: [PATCH 10/12] Minor (but widespread) changes of to for WCAG support - refs CT#7898 --- main/admin/access_url_edit_courses_to_url.php | 6 ++-- .../access_url_edit_usergroup_to_url.php | 6 ++-- main/admin/access_url_edit_users_to_url.php | 6 ++-- main/admin/add_courses_to_usergroup.php | 6 ++-- main/admin/add_sessions_to_promotion.php | 6 ++-- main/admin/add_sessions_to_usergroup.php | 6 ++-- main/admin/add_users_to_group.php | 8 ++--- main/admin/add_users_to_usergroup.php | 6 ++-- main/admin/configure_homepage.php | 6 ++-- main/admin/course_list.php | 2 +- main/admin/dashboard_add_courses_to_user.php | 4 +-- main/admin/dashboard_add_sessions_to_user.php | 6 ++-- main/admin/dashboard_add_users_to_user.php | 6 ++-- main/admin/event_type.php | 4 +-- main/admin/index.php | 8 ++--- main/admin/settings.lib.php | 6 ++-- main/admin/subscribe_user2course.php | 2 +- main/auth/courses_controller.php | 2 +- main/blog/blog.php | 2 +- main/course_info/tools.php | 4 +-- main/coursecopy/copy_course_session.php | 2 +- main/document/showinframes.php | 4 +-- main/document/webcam_clip.php | 6 ++-- main/exercice/exercise.php | 2 +- main/exercice/hotspot_admin.inc.php | 10 +++---- main/forum/viewthread_flat.inc.php | 10 +++---- main/forum/viewthread_nested.inc.php | 10 +++---- main/inc/ajax/user_manager.ajax.php | 2 +- main/inc/global_error_message.inc.php | 4 +-- main/inc/introductionSection.inc.php | 12 ++++---- main/inc/lib/AnnouncementManager.php | 8 ++--- main/inc/lib/dashboard.lib.php | 2 +- main/inc/lib/javascript/chat/js/chat.js | 14 ++++----- main/inc/lib/nanogong.lib.php | 2 +- .../pear/HTML/QuickForm/advanced_settings.php | 2 +- .../pear/HTML/QuickForm/advmultiselect.php | 4 +-- main/inc/lib/pear/HTML/QuickForm/button.php | 2 +- main/inc/lib/pear/HTML/QuickForm/text.php | 2 +- main/inc/lib/social.lib.php | 6 ++-- main/inc/lib/template.lib.php | 6 ++-- main/install/index.php | 6 ++-- main/install/install.lib.php | 30 +++++++++---------- main/newscorm/blank.php | 2 +- main/newscorm/embed.php | 2 +- main/newscorm/learnpath.class.php | 2 +- main/session/add_courses_to_session.php | 6 ++-- main/session/add_many_session_to_category.php | 4 +-- main/session/add_users_to_session.php | 6 ++-- main/session/session_category_add.php | 2 +- main/session/session_category_list.php | 2 +- main/session/session_course_edit.php | 2 +- main/session/session_course_user.php | 4 +-- main/social/friends.php | 2 +- main/social/invitations.php | 10 +++---- main/social/profile.php | 2 +- main/social/search.php | 4 +-- .../default/admin/resource_sequence.tpl | 2 +- .../default/auth/courses_categories.php | 2 +- .../template/default/auth/session_catalog.tpl | 16 +++++----- main/template/default/chat/video.tpl | 16 +++++----- .../default/course_description/edit.tpl | 2 +- .../default/course_description/index.tpl | 10 +++---- .../default/course_description/upload.tpl | 2 +- .../default/create_course/add_course.tpl | 8 ++--- .../default/gamification/my_progress.tpl | 8 ++--- .../default/gradebook/certificate_report.tpl | 4 +-- .../default/gradebook/my_certificates.tpl | 4 +-- main/template/default/gradebook/search.tpl | 6 ++-- main/template/default/layout/menu.tpl | 2 +- main/template/default/learnpath/view.tpl | 12 ++++---- main/template/default/link/edit_category.tpl | 2 +- main/template/default/link/edit_link.tpl | 2 +- main/template/default/link/index.tpl | 26 ++++++++-------- .../session_requirements.tpl | 6 ++-- main/template/default/session/about.tpl | 16 +++++----- main/template/default/skill/badge_create.tpl | 4 +-- main/template/default/skill/drh_report.tpl | 2 +- main/template/default/skill/list.tpl | 10 +++---- main/template/default/skill/profile.tpl | 2 +- main/template/default/skill/skill_wheel.tpl | 26 ++++++++-------- .../default/skill/skill_wheel_student.tpl | 10 +++---- main/template/default/social/form_modals.tpl | 2 +- main/template/default/social/user_block.tpl | 2 +- main/template/default/user_portal/session.tpl | 2 +- main/user/add_users_to_session.php | 6 ++-- main/work/add_user.php | 4 +-- main/work/work.php | 2 +- .../views/open_session.tpl | 4 +-- plugin/buycourses/view/catalog.tpl | 18 +++++------ plugin/buycourses/view/configuration.tpl | 12 ++++---- plugin/buycourses/view/paymentsetup.tpl | 2 +- plugin/buycourses/view/process.tpl | 4 +-- plugin/buycourses/view/process_confirm.tpl | 4 +-- plugin/buycourses/view/sales_report.tpl | 4 +-- plugin/buycourses/view/success.tpl | 4 +-- .../block_course/block_course.class.php | 2 +- .../block_daily/block_daily.class.php | 2 +- .../block_evaluation_graph.class.php | 2 +- .../block_global_info.class.php | 2 +- .../block_session/block_session.class.php | 2 +- .../block_student/block_student.class.php | 2 +- .../block_student_graph.class.php | 2 +- .../block_teacher/block_teacher.class.php | 2 +- .../block_teacher_graph.class.php | 2 +- 104 files changed, 293 insertions(+), 293 deletions(-) diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php index 02f3ebc8f9..95da58fb89 100755 --- a/main/admin/access_url_edit_courses_to_url.php +++ b/main/admin/access_url_edit_courses_to_url.php @@ -226,17 +226,17 @@ $url_list = UrlManager::get_url_data(); if($ajax_search) { ?>





diff --git a/main/admin/add_courses_to_usergroup.php b/main/admin/add_courses_to_usergroup.php index e6a396aabe..acda43459d 100755 --- a/main/admin/add_courses_to_usergroup.php +++ b/main/admin/add_courses_to_usergroup.php @@ -249,17 +249,17 @@ if (!empty($errorMsg)) { if ($ajax_search) { ?>





- + - +

- + @@ -473,7 +473,7 @@ if (!empty($errorMsg)) { diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php index 4eab9a1ddf..22367ed007 100755 --- a/main/admin/add_users_to_usergroup.php +++ b/main/admin/add_users_to_usergroup.php @@ -427,11 +427,11 @@ echo Display::input('hidden', 'add_type', null);


@@ -453,7 +453,7 @@ echo Display::input('hidden', 'add_type', null); '. + echo ''; ?> diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index bc0d8fdf9d..8dc8f70af6 100755 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -472,7 +472,7 @@ if (!empty($action)) { // If the requested action is to create a link, make some room // for the new link in the home_menu array at the requested place // and insert the new link there - $icon = ''; + $icon = ''; if ($action == 'insert_link' || $action == 'insert_tabs') { for ($i = sizeof($home_menu); $i; $i--) { if ($i > $insert_where) { @@ -1012,11 +1012,11 @@ switch ($action) {
-
+
-
+
diff --git a/main/admin/course_list.php b/main/admin/course_list.php index add47189d7..e16f23ddc9 100755 --- a/main/admin/course_list.php +++ b/main/admin/course_list.php @@ -368,7 +368,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE); $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword')); $form->addButtonSearch(get_lang('SearchCourse')); - $advanced = ' '.get_lang('AdvancedSearch').''; + $advanced = ' '.get_lang('AdvancedSearch').''; // Create a filter by session $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE); diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php index 4fd9cae73f..a67e566915 100755 --- a/main/admin/dashboard_add_courses_to_user.php +++ b/main/admin/dashboard_add_courses_to_user.php @@ -272,11 +272,11 @@ if(!empty($msg)) { "; echo ""; echo "
{{ "Badges" | get_lang }} {{ "Name" | get_lang }}{{ "ShortCode" | get_lang }}{{ "Description" | get_lang }}{{ "Options" | get_lang }}{{ "ShortCode" | get_lang }}{{ "Description" | get_lang }}{{ "Options" | get_lang }}
{{ "Badges" | get_lang }} {{ "Name" | get_lang }}{{ "ShortCode" | get_lang }}{{ "Description" | get_lang }}{{ "Options" | get_lang }}{{ "ShortCode" | get_lang }}{{ "Description" | get_lang }}{{ "Options" | get_lang }}
+ {% if skill.icon is empty %} + {{ skill.name }} + {% else %} + {{ skill.name }} + {% endif %} + + {{ skill.name }} {{ skill.short_code }}{{ skill.description }}{{ skill.description }} - - {{ "Edit" | get_lang }} + + - - {{ "CreateChildSkill" | get_lang }} + + - - {{ "CreateBadge" | get_lang }} + + {% if skill.status == 0 %} - - {{ 'Enable' }} + + {% else %} - - {{ 'Disable' }} + + {% endif %}
'.get_lang('SubscribeUsersToGroup').''; + echo ''; ?>










' . get_lang('AdvancedSearch'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')); +$actionsRight = Display::url(' ' . get_lang('AdvancedSearch'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')); $toolbar = Display::toolbarAction('toolbar-dashboard', $content = array( 0 => $actionsLeft, 1 => $actionsRight )); echo $toolbar; @@ -439,11 +439,11 @@ if(!empty($msg)) {

- +

- +
diff --git a/main/admin/index.php b/main/admin/index.php index 9d83564b26..a9aa82c247 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -96,7 +96,7 @@ if (api_is_platform_admin()) {
'; @@ -149,7 +149,7 @@ if (api_is_platform_admin()) {
'; @@ -209,7 +209,7 @@ if (api_is_platform_admin()) {
'; @@ -282,7 +282,7 @@ $search_form = '
'; diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 1a1f8aa488..52efadebce 100755 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -173,13 +173,13 @@ function handle_plugins() echo '
'; if (in_array($plugin, $installed_plugins)) { - echo Display::url(' '.get_lang('Configure'), 'configure_plugin.php?name='.$plugin, array('class' => 'btn btn-default')); - echo Display::url(' '.get_lang('Regions'), 'settings.php?category=Regions&name='.$plugin, array('class' => 'btn btn-default')); + echo Display::url(' '.get_lang('Configure'), 'configure_plugin.php?name='.$plugin, array('class' => 'btn btn-default')); + echo Display::url(' '.get_lang('Regions'), 'settings.php?category=Regions&name='.$plugin, array('class' => 'btn btn-default')); } if (file_exists(api_get_path(SYS_PLUGIN_PATH).$plugin.'/readme.txt')) { echo Display::url( - " readme.txt", + " readme.txt", api_get_path(WEB_PLUGIN_PATH) . $plugin . "/readme.txt", [ 'class' => 'btn btn-default ajax', diff --git a/main/admin/subscribe_user2course.php b/main/admin/subscribe_user2course.php index 9ff241792e..fedaf42ca0 100755 --- a/main/admin/subscribe_user2course.php +++ b/main/admin/subscribe_user2course.php @@ -304,7 +304,7 @@ if (is_array($extra_field_list)) {
diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php index 4a5866da7b..fa61d16704 100755 --- a/main/auth/courses_controller.php +++ b/main/auth/courses_controller.php @@ -590,7 +590,7 @@ class CoursesController */ public function getAlreadyRegisteredInSessionLabel() { - $icon = ''; + $icon = ''; return Display::div( $icon . ' ' . get_lang("AlreadyRegisteredToSession"), diff --git a/main/blog/blog.php b/main/blog/blog.php index bb9d50fa12..0bc481f2ef 100755 --- a/main/blog/blog.php +++ b/main/blog/blog.php @@ -333,7 +333,7 @@ Display::display_introduction_section(TOOL_BLOGS); - + diff --git a/main/course_info/tools.php b/main/course_info/tools.php index e69ae4dcaf..41d0c51978 100644 --- a/main/course_info/tools.php +++ b/main/course_info/tools.php @@ -145,8 +145,8 @@ switch ($action) { $delete = (!empty($tool['custom_icon'])) ? " - " : ""; - $edit = ''; + " : ""; + $edit = ''; $iconsTools .= '
'. $icon . '
'; $iconsTools .= '
' . $toolIconName . '
'; diff --git a/main/coursecopy/copy_course_session.php b/main/coursecopy/copy_course_session.php index 04bb2d1658..53cab3db5c 100755 --- a/main/coursecopy/copy_course_session.php +++ b/main/coursecopy/copy_course_session.php @@ -128,7 +128,7 @@ function display_form() $html .= Display::panel($options, get_lang('TypeOfCopy')); $html .= '
'; - $html .= ''; + $html .= ''; // Add Security token $html .= ''; diff --git a/main/document/showinframes.php b/main/document/showinframes.php index f7aa3f307f..7f0036c179 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -350,7 +350,7 @@ if ($show_web_odf) { echo '
'; } else { // ViewerJS already have download button - echo ' + echo ' '.get_lang('Download').''; } @@ -430,7 +430,7 @@ if ($is_freemind_available) { if ($is_nanogong_available) { $file_url_web = DocumentManager::generateAudioTempFolder($file_url_sys); echo '
'; - echo ' '.get_lang('Download').''; + echo ' '.get_lang('Download').''; echo '
'; echo '
'; echo DocumentManager::readNanogongFile($to_url); diff --git a/main/document/webcam_clip.php b/main/document/webcam_clip.php index d6209f5be6..841044c8c7 100755 --- a/main/document/webcam_clip.php +++ b/main/document/webcam_clip.php @@ -237,15 +237,15 @@ echo '
';

  ||   diff --git a/main/exercice/exercise.php b/main/exercice/exercise.php index 38d8bfa695..2cd8fde0a2 100644 --- a/main/exercice/exercise.php +++ b/main/exercice/exercise.php @@ -1011,7 +1011,7 @@ if (empty($exercise_list) && $hotpotatoes_exist == false) { echo '

'.get_lang('Quiz').'

'; echo Display::return_icon('quiz.png', '', array(), 64); echo '
'; - echo Display::url(' '.get_lang('NewEx'), 'exercise_admin.php?'.api_get_cidreq(), array('class' => 'btn btn-primary')); + echo Display::url(' '.get_lang('NewEx'), 'exercise_admin.php?'.api_get_cidreq(), array('class' => 'btn btn-primary')); echo '
'; echo '
'; } diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php index 897062a709..1e09ab4798 100755 --- a/main/exercice/hotspot_admin.inc.php +++ b/main/exercice/hotspot_admin.inc.php @@ -567,21 +567,21 @@ if ($modifyAnswers) {
diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php index b25f73e49d..99e0f4b2c8 100755 --- a/main/forum/viewthread_flat.inc.php +++ b/main/forum/viewthread_flat.inc.php @@ -55,7 +55,7 @@ if (isset($current_thread['thread_id'])) { $buttonReply = Display::tag( 'a', - ' ' . get_lang('ReplyToMessage'), + ' ' . get_lang('ReplyToMessage'), array( 'href' => 'reply.php?' . api_get_cidreq() . "&forum=$clean_forum_id&thread=$clean_thread_id&post=" @@ -66,7 +66,7 @@ if (isset($current_thread['thread_id'])) { $buttonQuote = Display::tag( 'a', - ' ' . get_lang('QuoteMessage'), + ' ' . get_lang('QuoteMessage'), array( 'href' => 'reply.php?' . api_get_cidreq() . "&forum=$clean_forum_id&thread=$clean_thread_id" @@ -81,21 +81,21 @@ if (isset($current_thread['thread_id'])) { if (($current_forum_category && $current_forum_category['locked'] == 1)) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ForumcategoryLocked'), + ' ' . get_lang('ForumcategoryLocked'), array('class' => 'alert alert-warning post-closed') ); } if ($current_forum['locked'] == 1) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ForumLocked'), + ' ' . get_lang('ForumLocked'), array('class' => 'alert alert-warning post-closed') ); } if ($current_thread['locked'] == 1) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ThreadLocked'), + ' ' . get_lang('ThreadLocked'), array('class' => 'alert alert-warning post-closed') ); } diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php index 3a86b7e72c..692ba209fc 100755 --- a/main/forum/viewthread_nested.inc.php +++ b/main/forum/viewthread_nested.inc.php @@ -179,7 +179,7 @@ foreach ($rows as $post) { $buttonReply = Display::tag( 'a', - ' ' . get_lang('ReplyToMessage'), + ' ' . get_lang('ReplyToMessage'), array( 'href' => 'reply.php?' . api_get_cidreq() . "&forum=$clean_forum_id'&thread=$clean_thread_id" @@ -190,7 +190,7 @@ foreach ($rows as $post) { $buttonQuote = Display::tag( 'a', - ' ' . get_lang('QuoteMessage'), + ' ' . get_lang('QuoteMessage'), array( 'href' => 'reply.php?' . api_get_cidreq() . "&forum=$clean_forum_id&thread=$clean_thread_id" @@ -204,21 +204,21 @@ foreach ($rows as $post) { if ($current_forum_category && $current_forum_category['locked'] == 1) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ForumcategoryLocked'), + ' ' . get_lang('ForumcategoryLocked'), array('class' => 'alert alert-warning post-closed') ); } if ($current_forum['locked'] == 1) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ForumLocked'), + ' ' . get_lang('ForumLocked'), array('class' => 'alert alert-warning post-closed') ); } if ($current_thread['locked'] == 1) { $closedPost = Display::tag( 'div', - ' ' . get_lang('ThreadLocked'), + ' ' . get_lang('ThreadLocked'), array('class' => 'alert alert-warning post-closed') ); } diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php index b6732ffa8d..05c503c803 100755 --- a/main/inc/ajax/user_manager.ajax.php +++ b/main/inc/ajax/user_manager.ajax.php @@ -58,7 +58,7 @@ switch ($action) {
- ' . get_lang('Send') . ' + ' . get_lang('Send') . '
diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index b1e03ee6ea..812d4d23b5 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -130,8 +130,8 @@ if (is_int($global_error_code) && $global_error_code > 0) {

Welcome to the Chamilo installation wizard

Let\'s start hunting skills down with Chamilo LMS! This wizard will guide you through the Chamilo installation and configuration process.

- - '.$read_installation_guide.' + + '.$read_installation_guide.'

'; diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index c983dde1e8..29ace677d2 100755 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -309,7 +309,7 @@ if (!empty($thematic_advance_info)) { $editIconButton = ''; if (api_is_allowed_to_edit() && empty($session_id)) { $editIconButton = Display::url( - ' ', + ' ', api_get_path(WEB_CODE_PATH).'course_info/tools.php?'.api_get_cidreq(), ['class' => 'btn btn-default', 'title' => get_lang('CustomizeIcons') ] ); @@ -323,7 +323,7 @@ if ($intro_dispCommand) { $toolbar = '
'; if (!empty($courseId)) { $textIntro = ''; - $textIntro .= ' '; + $textIntro .= ' '; $textIntro .= ""; $toolbar .= $textIntro . $editIconButton; } else { @@ -338,21 +338,21 @@ if ($intro_dispCommand) { if (!empty($courseId)) { $toolbar .= ' - '; + '; $toolbar .= $editIconButton; $toolbar .=""; + "')) return false;\">"; } else { $toolbar .= ' - + "'; $toolbar .= $editIconButton; $toolbar .= ""; + "')) return false;\">"; } $toolbar .= "
"; // Fix for chrome XSS filter for videos in iframes - BT#7930 diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php index f37f991ac0..a01a360b1f 100755 --- a/main/inc/lib/AnnouncementManager.php +++ b/main/inc/lib/AnnouncementManager.php @@ -801,9 +801,9 @@ class AnnouncementManager // the buttons for adding or removing groups/users echo '		'; - echo ''; + echo ''; echo '

'; - echo ''; + echo ''; echo "		"; @@ -836,9 +836,9 @@ class AnnouncementManager // the buttons for adding or removing groups/users echo ""; - echo ''; + echo ''; echo '

'; - echo ''; + echo ''; echo "		"; diff --git a/main/inc/lib/dashboard.lib.php b/main/inc/lib/dashboard.lib.php index 8538e65ffb..5df8787c52 100755 --- a/main/inc/lib/dashboard.lib.php +++ b/main/inc/lib/dashboard.lib.php @@ -399,7 +399,7 @@ class DashboardManager echo '
'; echo '
'; - echo ''; echo '
'; } else { diff --git a/main/inc/lib/javascript/chat/js/chat.js b/main/inc/lib/javascript/chat/js/chat.js index 16d4cb5451..0af44e45f5 100755 --- a/main/inc/lib/javascript/chat/js/chat.js +++ b/main/inc/lib/javascript/chat/js/chat.js @@ -389,13 +389,13 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage href: ajax_url + '?action=create_room&to=' + user_id }) .data({ - title: '', + title: '', size: 'sm' }) .on('click', function () { $(this).data('title', $('.chatboxtitle').text()); }) - .html('') + .html('') .appendTo(chatboxoptions); } @@ -405,7 +405,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage href: 'javascript:void(0)', rel: user_id }) - .html('') + .html('') .appendTo(chatboxoptions); $('') @@ -414,7 +414,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage href: 'javascript:void(0)', rel: user_id }) - .html('') + .html('') .appendTo(chatboxoptions); $('
') @@ -471,7 +471,7 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage } if (minimize == 1) { - $('.togglelink').html(''); + $('.togglelink').html(''); $('#chatbox_'+user_id+' .chatboxcontent').css('display','none'); $('#chatbox_'+user_id+' .chatboxinput').css('display','none'); } @@ -556,7 +556,7 @@ function toggleChatBoxGrowth(user_id) { $('#chatbox_'+user_id+' .chatboxinput').css('display','block'); $("#chatbox_"+user_id+" .chatboxcontent").scrollTop($("#chatbox_"+user_id+" .chatboxcontent")[0].scrollHeight); - $('.togglelink').html(''); + $('.togglelink').html(''); } else { var newCookie = user_id; if ($.cookie('chatbox_minimized')) { @@ -566,7 +566,7 @@ function toggleChatBoxGrowth(user_id) { $('#chatbox_'+user_id+' .chatboxcontent').css('display','none'); $('#chatbox_'+user_id+' .chatboxinput').css('display','none'); - $('.togglelink').html(''); + $('.togglelink').html(''); } } diff --git a/main/inc/lib/nanogong.lib.php b/main/inc/lib/nanogong.lib.php index 9eb381a1f3..fc6e7402c0 100755 --- a/main/inc/lib/nanogong.lib.php +++ b/main/inc/lib/nanogong.lib.php @@ -606,7 +606,7 @@ class Nanogong //$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning'); $html .= ''; $html .= ''; $html .= ''; diff --git a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php index 7ed301664a..cd4dd4d96c 100755 --- a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php +++ b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php @@ -50,7 +50,7 @@ class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static
- '.$text.' + '.$text.'
'; diff --git a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php index 5eff2a013b..56c2bda323 100755 --- a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php +++ b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php @@ -865,7 +865,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select $this->_removeButtonAttributes = array_merge($this->_removeButtonAttributes, $attributes); $attrStrRemove = $this->_getAttrString($this->_removeButtonAttributes); - $strHtmlRemove = ""; + $strHtmlRemove = ""; // build the add button with all its attributes $attributes @@ -877,7 +877,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select "'add', '{$this->_sort}'); return false;"); $this->_addButtonAttributes = array_merge($this->_addButtonAttributes, $attributes); $attrStrAdd = $this->_getAttrString($this->_addButtonAttributes); - $strHtmlAdd = "

"; + $strHtmlAdd = "

"; // build the select all button with all its attributes $attributes diff --git a/main/inc/lib/pear/HTML/QuickForm/button.php b/main/inc/lib/pear/HTML/QuickForm/button.php index 6c89297443..603e88ee9a 100755 --- a/main/inc/lib/pear/HTML/QuickForm/button.php +++ b/main/inc/lib/pear/HTML/QuickForm/button.php @@ -94,7 +94,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input $icon = $this->getIcon(); if (!empty($icon)) { - $icon = ' '; + $icon = ' '; } $class = $this->getClass().' '.$this->getStyle().' '.$this->getSize(); diff --git a/main/inc/lib/pear/HTML/QuickForm/text.php b/main/inc/lib/pear/HTML/QuickForm/text.php index 40bd06e77b..668d321a88 100755 --- a/main/inc/lib/pear/HTML/QuickForm/text.php +++ b/main/inc/lib/pear/HTML/QuickForm/text.php @@ -90,7 +90,7 @@ class HTML_QuickForm_text extends HTML_QuickForm_input return '
- +
'; } diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index c9a9685455..37fa2b2c49 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -1411,7 +1411,7 @@ class SocialManager extends UserManager + class="pull-right btn btn-default" /> '.get_lang('Post').' '; $formattedList .= ''; @@ -1746,7 +1746,7 @@ class SocialManager extends UserManager $friendHtml.=''; } else { $friendHtml.= '
'.get_lang('NoFriendsInYourContactList').'
' - .' '. get_lang('TryAndFindSomeFriends').'
'; + .' '. get_lang('TryAndFindSomeFriends').''; } $friendHtml = Display::panel($friendHtml, get_lang('SocialFriend').' (' . $number_friends . ')' ); @@ -1811,7 +1811,7 @@ class SocialManager extends UserManager $friendHtml.=''; } else { $friendHtml.= '
'.get_lang('NoFriendsInYourContactList').' ' - .' '. get_lang('TryAndFindSomeFriends').'
'; + .' '. get_lang('TryAndFindSomeFriends').''; } return $friendHtml; diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 5e57da4831..f35967c0b9 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -862,9 +862,9 @@ class Template if (api_get_setting('accessibility_font_resize') == 'true') { $resize .= '
'; $resize .= '
'; - $resize .= ''; - $resize .= ''; - $resize .= ''; + $resize .= ''; + $resize .= ''; + $resize .= ''; $resize .= '
'; $resize .= '
'; } diff --git a/main/install/index.php b/main/install/index.php index 981c1f86d9..ef8d12d136 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -416,7 +416,7 @@ if ($encryptPassForm == '1') { @@ -636,14 +636,14 @@ if (@$_POST['step2']) { diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 9072c129be..edf5e4a6e8 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -646,7 +646,7 @@ function display_language_selection()
@@ -988,11 +988,11 @@ function display_requirements(

@@ -1061,17 +1061,17 @@ function display_requirements( ?>

'.get_lang('UpgradeFromLMS19x').''; + echo ' > '.get_lang('UpgradeFromLMS19x').''; echo '

'; } @@ -1102,11 +1102,11 @@ function display_license_agreement() @@ -1242,7 +1242,7 @@ function get_contact_registration_form()
 
-
+
 
@@ -1405,7 +1405,7 @@ function display_database_settings_form(
@@ -1458,18 +1458,18 @@ function display_database_settings_form(
@@ -1715,11 +1715,11 @@ function display_configuration_settings_form( ?>
- +
- +
diff --git a/main/newscorm/blank.php b/main/newscorm/blank.php index 8841f98938..74f74ba4e8 100755 --- a/main/newscorm/blank.php +++ b/main/newscorm/blank.php @@ -36,7 +36,7 @@ if (isset($_GET['error'])) { case 'x_frames_options': if (isset($_SESSION['x_frame_source'])) { $src = $_SESSION['x_frame_source']; - $icon = ' '; + $icon = ' '; echo Display::return_message( Display::url($icon.$src, $src, ['class' => 'btn generated', 'target' => '_blank']), diff --git a/main/newscorm/embed.php b/main/newscorm/embed.php index 41d108aa80..b1bb1b3a7d 100755 --- a/main/newscorm/embed.php +++ b/main/newscorm/embed.php @@ -24,7 +24,7 @@ switch ($type) { $iframe .= '
'; break; case 'nonhttps': - $icon = ' '; + $icon = ' '; $iframe = Display::return_message( Display::url($src.$icon, $src, ['class' => 'btn', 'target' => '_blank']), 'normal', diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 1873353e93..d08877f455 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -5461,7 +5461,7 @@ class learnpath // We need to close the form when we are updating the mp3 files. if ($update_audio == 'true') { $return .= '
'; - $return .= Display::button('save_audio',' '. get_lang('SaveAudioAndOrganization'),array('class'=>'btn btn-primary','type'=>'submit')); + $return .= Display::button('save_audio',' '. get_lang('SaveAudioAndOrganization'),array('class'=>'btn btn-primary','type'=>'submit')); $return .= '
'; //$return .= '
'; // TODO: What kind of language variable is this? } diff --git a/main/session/add_courses_to_session.php b/main/session/add_courses_to_session.php index 07d3e8fe51..025a962861 100644 --- a/main/session/add_courses_to_session.php +++ b/main/session/add_courses_to_session.php @@ -261,7 +261,7 @@ unset($Courses); ?>
diff --git a/main/session/add_many_session_to_category.php b/main/session/add_many_session_to_category.php index 5d9063d287..9ce025b20c 100644 --- a/main/session/add_many_session_to_category.php +++ b/main/session/add_many_session_to_category.php @@ -230,11 +230,11 @@ if (!empty($OkMsg)) {







@@ -665,12 +665,12 @@ if (!empty($errorMsg)) { ?>
diff --git a/main/session/session_category_add.php b/main/session/session_category_add.php index 0b841f50f2..0d7a173589 100644 --- a/main/session/session_category_add.php +++ b/main/session/session_category_add.php @@ -221,7 +221,7 @@ if (!empty($return)) {
- +
diff --git a/main/session/session_category_list.php b/main/session/session_category_list.php index 1c6c527ca4..74d05c5057 100644 --- a/main/session/session_category_list.php +++ b/main/session/session_category_list.php @@ -118,7 +118,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
- +
diff --git a/main/session/session_course_edit.php b/main/session/session_course_edit.php index d36d00822f..fe120da6c4 100644 --- a/main/session/session_course_edit.php +++ b/main/session/session_course_edit.php @@ -182,7 +182,7 @@ api_display_tool_title($tool_name);
diff --git a/main/session/session_course_user.php b/main/session/session_course_user.php index 8936b2ce26..1d26091bd7 100644 --- a/main/session/session_course_user.php +++ b/main/session/session_course_user.php @@ -196,11 +196,11 @@ unset($Courses);







'; if (count($friends) == 0) { $social_right_content .= get_lang('NoFriendsInYourContactList').'
'; $social_right_content .= ' - '.get_lang('TryAndFindSomeFriends').''; + '.get_lang('TryAndFindSomeFriends').''; } else { $social_right_content .= get_lang('Search').'   :   '; $social_right_content .= ''; diff --git a/main/social/invitations.php b/main/social/invitations.php index cd09624ee6..64159bf2a1 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -86,7 +86,7 @@ $total_invitations = $number_loop + count($list_get_invitation_sent) + count($pe if ($total_invitations == 0 && count($_GET) <= 0) { $socialInvitationsBlock .= '
- '. + '. get_lang('TryAndFindSomeFriends').'
@@ -116,9 +116,9 @@ if ($number_loop != 0) { $invitationHtml .= '
'.get_lang('DateSend').' : '.$date.'
'; $invitationHtml .= '
+ '.get_lang('AcceptInvitation').' + '.get_lang('DenyInvitation').' '; $invitationHtml .= '
'; $invitationHtml .= '
'; @@ -174,8 +174,8 @@ if (count($pending_invitations) > 0) { $waitingInvitation .= '

'.$invitation['name'].'

'; $waitingInvitation .= '
'.$invitation['description'].'
'; $waitingInvitation .= '
'; - $waitingInvitation .= ' '.get_lang('AcceptInvitation').''; - $waitingInvitation .= ' '.get_lang('DenyInvitation').''; + $waitingInvitation .= ' '.get_lang('AcceptInvitation').''; + $waitingInvitation .= ' '.get_lang('DenyInvitation').''; $waitingInvitation .='
'; $waitingInvitation .= ''; } diff --git a/main/social/profile.php b/main/social/profile.php index 730c9201d5..f4d07f6dc8 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -302,7 +302,7 @@ $(document).ready(function() { $(".panel-preview").hide(); $(".spinner").html("'. '
'. - ''. + ''. '

'. get_lang('Loading') . ' ' . get_lang('Preview') .'

'. '
'. '"); diff --git a/main/social/search.php b/main/social/search.php index 95458f4440..6b7f42f256 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -77,7 +77,7 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) $results .= '
'; $buttonClass = 'btn btn-default btn-sm'; foreach ($users as $user) { - $send_inv = ''; + $send_inv = ''; $relation_type = intval(SocialManager::get_relation_between_contacts(api_get_user_id(), $user['user_id'])); $user_info = api_get_user_info($user['user_id'], true); $url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id']; @@ -85,7 +85,7 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) // Show send invitation icon if they are not friends yet if ($relation_type != 3 && $relation_type != 4 && $user['user_id'] != api_get_user_id()) { $send_inv = ' - '.get_lang('SendInvitation').''; + '.get_lang('SendInvitation').''; } $sendMesssageUrl = api_get_path(WEB_AJAX_PATH) diff --git a/main/template/default/admin/resource_sequence.tpl b/main/template/default/admin/resource_sequence.tpl index 54a43c66a5..42319c0f53 100644 --- a/main/template/default/admin/resource_sequence.tpl +++ b/main/template/default/admin/resource_sequence.tpl @@ -54,7 +54,7 @@ $('#parents').append(arguments[i][0]); if (i !== arguments.length - 1) { - $('#parents').append(''); + $('#parents').append(''); } } }); diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php index f26240968f..4b96175c0c 100755 --- a/main/template/default/auth/courses_categories.php +++ b/main/template/default/auth/courses_categories.php @@ -118,7 +118,7 @@ $code = isset($code) ? $code : null;
diff --git a/main/template/default/auth/session_catalog.tpl b/main/template/default/auth/session_catalog.tpl index 09bd6351b4..43601b78b3 100644 --- a/main/template/default/auth/session_catalog.tpl +++ b/main/template/default/auth/session_catalog.tpl @@ -23,7 +23,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -91,15 +91,15 @@
    {% if show_tutor %}
  • - {{ session.coach_name }} + {{ session.coach_name }}
    • {% endif %}
  • - {{ session.date }} + {{ session.date }}
    • {% if session.tags %}
  • - {{ session.tags|join(', ')}} + {{ session.tags|join(', ')}}
    • {% endif %}
@@ -138,7 +138,7 @@ content += '

{{ sequence.name }}

'; {% if sequence.requirements %} - content += '

{{ 'RequiredSessions'|get_lang }}

'; + content += '

{{ 'RequiredSessions'|get_lang }}

'; content += '
    '; {% for requirement in sequence.requirements %} @@ -151,7 +151,7 @@ {% endif %} {% if sequence.dependencies %} - content += '

    {{ 'DependentSessions'|get_lang }}

    '; + content += '

    {{ 'DependentSessions'|get_lang }}

    '; content += '
      '; {% for dependency in sequence.dependencies %} diff --git a/main/template/default/chat/video.tpl b/main/template/default/chat/video.tpl index 4b85599c69..3e17758cdd 100644 --- a/main/template/default/chat/video.tpl +++ b/main/template/default/chat/video.tpl @@ -5,7 +5,7 @@

      {{ 'Warning'|get_lang }}

      - {{ 'AvoidChangingPageAsThisWillCutYourCurrentVideoChatSession'|get_lang }} + {{ 'AvoidChangingPageAsThisWillCutYourCurrentVideoChatSession'|get_lang }}

      @@ -80,29 +80,29 @@ case 'checking': alertDiv .addClass('alert-info') - .html(' ' + "{{ 'ConnectingToPeer'|get_lang }}"); + .html(' ' + "{{ 'ConnectingToPeer'|get_lang }}"); break; case 'connected': //no break case 'completed': alertDiv .addClass('alert-success') - .html(' ' + "{{ 'ConnectionEstablished'|get_lang }}"); + .html(' ' + "{{ 'ConnectionEstablished'|get_lang }}"); break; case 'disconnected': alertDiv .addClass('alert-info') - .html(' ' + "{{ 'Disconnected'|get_lang }}"); + .html(' ' + "{{ 'Disconnected'|get_lang }}"); break; case 'failed': alertDiv .addClass('alert-danger') - .html(' ' + "{{ 'ConnectionFailed'|get_lang }}"); + .html(' ' + "{{ 'ConnectionFailed'|get_lang }}"); break; case 'closed': alertDiv .addClass('alert-danger') - .html(' ' + "{{ 'ConnectionClosed'|get_lang }}"); + .html(' ' + "{{ 'ConnectionClosed'|get_lang }}"); break; } @@ -116,14 +116,14 @@ webRTC.on('iceFailed', function (peer) { var alertDiv = $('
      ') .addClass('alert-danger') - .html(' ' + "{{ 'LocalConnectionFailed'|get_lang }}"); + .html(' ' + "{{ 'LocalConnectionFailed'|get_lang }}"); $('#connection-status').html(alertDiv); }); webRTC.on('connectivityError', function (peer) { var alertDiv = $('
      ') .addClass('alert-danger') - .html(' ' + "{{ 'RemoteConnectionFailed'|get_lang }}"); + .html(' ' + "{{ 'RemoteConnectionFailed'|get_lang }}"); $('#connection-status').html(alertDiv); }); diff --git a/main/template/default/course_description/edit.tpl b/main/template/default/course_description/edit.tpl index 38c0a3ce9e..aa6456c5c4 100755 --- a/main/template/default/course_description/edit.tpl +++ b/main/template/default/course_description/edit.tpl @@ -8,7 +8,7 @@
      - +
      diff --git a/main/template/default/course_description/index.tpl b/main/template/default/course_description/index.tpl index b859a5fca1..4cae45b079 100755 --- a/main/template/default/course_description/index.tpl +++ b/main/template/default/course_description/index.tpl @@ -60,13 +60,13 @@
      - + - + - +
      @@ -82,12 +82,12 @@ - + - + {% else %}
      - +
      diff --git a/main/template/default/create_course/add_course.tpl b/main/template/default/create_course/add_course.tpl index 55a33cf191..1a3f877717 100755 --- a/main/template/default/create_course/add_course.tpl +++ b/main/template/default/create_course/add_course.tpl @@ -13,7 +13,7 @@
      - {{'AddCourseDescription'|get_lang}} + {{'AddCourseDescription'|get_lang}}
      @@ -23,7 +23,7 @@
      - {{'UploadADocument'|get_lang}} + {{'UploadADocument'|get_lang}}
      @@ -33,7 +33,7 @@
      - {{ 'AddForum'|get_lang }} + {{ 'AddForum'|get_lang }}
      @@ -44,7 +44,7 @@
      - {{ 'SubscribeUserToCourse'|get_lang }} + {{ 'SubscribeUserToCourse'|get_lang }}
      diff --git a/main/template/default/gamification/my_progress.tpl b/main/template/default/gamification/my_progress.tpl index 1d9d1b9d7f..a20eeffd78 100644 --- a/main/template/default/gamification/my_progress.tpl +++ b/main/template/default/gamification/my_progress.tpl @@ -10,13 +10,13 @@ {% if gamification_stars > 0 %} {% for i in 1..gamification_stars %} - + {% endfor %} {% endif %} {% if 4 - gamification_stars > 0 %} {% for i in 1..(4 - gamification_stars) %} - + {% endfor %} {% endif %} @@ -39,7 +39,7 @@
        {% for session in sessions %}
      • - {{ session.getName }} + {{ session.getName }}
        • {% endfor %} @@ -52,7 +52,7 @@ {% if current_session %}
        -
        {{ current_session.getName() }}
        +
        {{ current_session.getName() }}
        {% for course_id, course in session_data %}

        {{ course.title }}

        diff --git a/main/template/default/gradebook/certificate_report.tpl b/main/template/default/gradebook/certificate_report.tpl index 8f9aa2acb1..8e3fa96254 100644 --- a/main/template/default/gradebook/certificate_report.tpl +++ b/main/template/default/gradebook/certificate_report.tpl @@ -43,7 +43,7 @@ {% if not exportAllLink is null %}
        - {{ 'ExportAllCertificatesToPDF' | get_lang }} + {{ 'ExportAllCertificatesToPDF' | get_lang }}
        {% endif %} @@ -80,7 +80,7 @@ {% for certificate in student.certificates %} - {{ 'Certificate' | get_lang }} + {{ 'Certificate' | get_lang }} {% endfor %} diff --git a/main/template/default/gradebook/my_certificates.tpl b/main/template/default/gradebook/my_certificates.tpl index 6977274c0d..84ef6bf428 100644 --- a/main/template/default/gradebook/my_certificates.tpl +++ b/main/template/default/gradebook/my_certificates.tpl @@ -19,7 +19,7 @@ {{ row.date }} - {{ 'Certificate'|get_lang }} + {{ 'Certificate'|get_lang }} @@ -52,7 +52,7 @@ {{ row.date }} - {{ 'Certificate'|get_lang }} + {{ 'Certificate'|get_lang }} diff --git a/main/template/default/gradebook/search.tpl b/main/template/default/gradebook/search.tpl index fb37b5d6b3..ad569ee849 100644 --- a/main/template/default/gradebook/search.tpl +++ b/main/template/default/gradebook/search.tpl @@ -17,7 +17,7 @@ {{ user.lastname }} - {{ "Certificates"|get_lang }} + {{ "Certificates"|get_lang }} @@ -51,7 +51,7 @@ {{ row.date }} - {{ 'Certificate'|get_lang }} + {{ 'Certificate'|get_lang }} @@ -84,7 +84,7 @@ {{ row.date }} - {{ 'Certificate'|get_lang }} + {{ 'Certificate'|get_lang }} diff --git a/main/template/default/layout/menu.tpl b/main/template/default/layout/menu.tpl index 7cf36dcd54..0f4e41389b 100755 --- a/main/template/default/layout/menu.tpl +++ b/main/template/default/layout/menu.tpl @@ -34,7 +34,7 @@ {% if logout_link is not null %}
      • - {{ "Logout"|get_lang }} + {{ "Logout"|get_lang }}
        • {% endif %} diff --git a/main/template/default/learnpath/view.tpl b/main/template/default/learnpath/view.tpl index 48c2a4ed83..9f959c3bf5 100644 --- a/main/template/default/learnpath/view.tpl +++ b/main/template/default/learnpath/view.tpl @@ -13,14 +13,14 @@
        - - + +
        {# Author image preview #}
        - {{ button_home_text }} + {{ button_home_text }}
        @@ -49,13 +49,13 @@
        {% if gamification_stars > 0 %} {% for i in 1..gamification_stars %} - + {% endfor %} {% endif %} {% if gamification_stars < 4 %} {% for i in 1..4 - gamification_stars %} - + {% endfor %} {% endif %}
        @@ -90,7 +90,7 @@ {# TOC layout #}
        -
        {{ lp_title_scorm }}
        +
        {{ lp_title_scorm }}
        {{ lp_html_toc }}
        diff --git a/main/template/default/link/edit_category.tpl b/main/template/default/link/edit_category.tpl index 0ca67905b2..02b575ff50 100755 --- a/main/template/default/link/edit_category.tpl +++ b/main/template/default/link/edit_category.tpl @@ -4,7 +4,7 @@
        - +
        diff --git a/main/template/default/link/edit_link.tpl b/main/template/default/link/edit_link.tpl index 0ca67905b2..02b575ff50 100755 --- a/main/template/default/link/edit_link.tpl +++ b/main/template/default/link/edit_link.tpl @@ -4,7 +4,7 @@
        - +
        diff --git a/main/template/default/link/index.tpl b/main/template/default/link/index.tpl index a030f27d8b..eb54e48d23 100755 --- a/main/template/default/link/index.tpl +++ b/main/template/default/link/index.tpl @@ -191,28 +191,28 @@ function validate_link(name, btn){ {% if is_allowed_to_edit %}
        - + - + - + - + - +
        {% endif %}
        - + - +
        @@ -248,14 +248,14 @@ function validate_link(name, btn){ - + - +
        {% endif %} @@ -274,13 +274,13 @@ function validate_link(name, btn){ onclick="event.stopPropagation();" title="{{'Edit'|get_lang}}" class=""> - + - +
        {% endif %} @@ -319,7 +319,7 @@ function validate_link(name, btn){ onclick="" title="{{'Edit'|get_lang}}" class=""> - + - +
        {% endif %} diff --git a/main/template/default/sequence_resource/session_requirements.tpl b/main/template/default/sequence_resource/session_requirements.tpl index 459a6c056c..4b27520b7b 100644 --- a/main/template/default/sequence_resource/session_requirements.tpl +++ b/main/template/default/sequence_resource/session_requirements.tpl @@ -13,9 +13,9 @@ {% if _u.logged %} {% if session.status %} - {{ 'Complete'|get_lang }} + {{ 'Complete'|get_lang }} {% else %} - {{ 'Incomplete'|get_lang }} + {{ 'Incomplete'|get_lang }} {% endif %} {% endif %} @@ -23,7 +23,7 @@
        {% if loop.index != item.requirements|length %} - + {% endif %} {% endfor %}
        diff --git a/main/template/default/session/about.tpl b/main/template/default/session/about.tpl index de0d719588..0a5e43ddfd 100644 --- a/main/template/default/session/about.tpl +++ b/main/template/default/session/about.tpl @@ -1,11 +1,11 @@
        -

        {{ session_date.display }}

        +

        {{ session_date.display }}

        {% if show_tutor %}

        - {{ 'SessionGeneralCoach'|get_lang }}: {{ session.generalCoach.getCompleteName() }} + {{ 'SessionGeneralCoach'|get_lang }}: {{ session.generalCoach.getCompleteName() }}

        {% endif %} @@ -92,7 +92,7 @@
        {% if course_data.objectives %}
        -

        {{ "Objectives"|get_lang }}

        +

        {{ "Objectives"|get_lang }}

        {{ course_data.objectives.getContent }}
        @@ -101,7 +101,7 @@ {% if course_data.topics %}
        -

        {{ "Topics"|get_lang }}

        +

        {{ "Topics"|get_lang }}

        {{ course_data.topics.getContent }}
        @@ -161,13 +161,13 @@
        - + - + - +
        @@ -185,7 +185,7 @@ {% elseif not _u.logged %} {% if 'allow_registration'|get_setting == 'true' %} - {{ 'SignUp'|get_lang }} + {{ 'SignUp'|get_lang }} {% endif %} {% endif %} diff --git a/main/template/default/skill/badge_create.tpl b/main/template/default/skill/badge_create.tpl index acc1bd68a6..26520c5106 100644 --- a/main/template/default/skill/badge_create.tpl +++ b/main/template/default/skill/badge_create.tpl @@ -98,7 +98,7 @@
        - +
        @@ -106,7 +106,7 @@

        {{'BadgePreview' | get_lang }}

        diff --git a/main/template/default/skill/drh_report.tpl b/main/template/default/skill/drh_report.tpl index deaea710a8..b741e17226 100644 --- a/main/template/default/skill/drh_report.tpl +++ b/main/template/default/skill/drh_report.tpl @@ -31,7 +31,7 @@ {% endfor %} - +
        diff --git a/main/template/default/skill/list.tpl b/main/template/default/skill/list.tpl index 8dc59c2412..990085c32b 100644 --- a/main/template/default/skill/list.tpl +++ b/main/template/default/skill/list.tpl @@ -38,22 +38,22 @@ {{ skill.description }} - + - + - + {% if skill.status == 0 %} - + {% else %} - + {% endif %} diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index 880ec8b8a9..3f1b779a5d 100755 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -9,7 +9,7 @@ {% endfor %}
      - {{"SaveThisSearch"|get_lang}} + {{"SaveThisSearch"|get_lang}} {% endif %} diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 9adf9a8c98..4b77665b4f 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -452,7 +452,7 @@
      - {{ "ReturnToCourseList"|get_lang }} + {{ "ReturnToCourseList"|get_lang }}
      @@ -469,13 +469,13 @@

      {{ 'IsThisWhatYouWereLookingFor'|get_lang }}

      @@ -483,7 +483,7 @@

      - {{ "ViewSkillsWheel"|get_lang }} + {{ "ViewSkillsWheel"|get_lang }}

      @@ -501,13 +501,13 @@
      • - {{ "BasicSkills"|get_lang }} + {{ "BasicSkills"|get_lang }}
      • - {{ "SkillsYouCanLearn"|get_lang }} + {{ "SkillsYouCanLearn"|get_lang }}
      • - {{ "SkillsSearchedFor"|get_lang }} + {{ "SkillsSearchedFor"|get_lang }}
      @@ -559,16 +559,16 @@
      @@ -589,10 +589,10 @@
      diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index 10046aa142..4b918a39f1 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -149,7 +149,7 @@

      - {{ "ReturnToCourseList"|get_lang }} + {{ "ReturnToCourseList"|get_lang }}

      @@ -204,7 +204,7 @@

      - {{ "ViewSkillsWheel"|get_lang }} + {{ "ViewSkillsWheel"|get_lang }}

      @@ -224,13 +224,13 @@
      • - {{ "SkillsYouAcquired"|get_lang }} + {{ "SkillsYouAcquired"|get_lang }}
      • - {{ "SkillsYouCanLearn"|get_lang }} + {{ "SkillsYouCanLearn"|get_lang }}
      • - {{ "SkillsSearchedFor"|get_lang }} + {{ "SkillsSearchedFor"|get_lang }}
      diff --git a/main/template/default/social/form_modals.tpl b/main/template/default/social/form_modals.tpl index 527e551ac8..d853e6f0ed 100644 --- a/main/template/default/social/form_modals.tpl +++ b/main/template/default/social/form_modals.tpl @@ -13,7 +13,7 @@
      diff --git a/main/template/default/social/user_block.tpl b/main/template/default/social/user_block.tpl index a2f0d44184..9b980df5aa 100644 --- a/main/template/default/social/user_block.tpl +++ b/main/template/default/social/user_block.tpl @@ -49,7 +49,7 @@ {% if not profile_edition_link is empty %}
    • - {{ "EditProfile" | get_lang }} + {{ "EditProfile" | get_lang }}
      • {% endif %} diff --git a/main/template/default/user_portal/session.tpl b/main/template/default/user_portal/session.tpl index f8584d5117..cb744544a9 100644 --- a/main/template/default/user_portal/session.tpl +++ b/main/template/default/user_portal/session.tpl @@ -60,7 +60,7 @@
      {% if session.subtitle %}
      - {{ session.subtitle }} + {{ session.subtitle }}
      {% endif %} {% if session.show_description %} diff --git a/main/user/add_users_to_session.php b/main/user/add_users_to_session.php index 0f4d3dd3da..32d19ea9ce 100755 --- a/main/user/add_users_to_session.php +++ b/main/user/add_users_to_session.php @@ -565,16 +565,16 @@ if($allowTutors == 'true') { - +

      ' . get_lang('Delete'), $url, array('class' => 'btn btn-danger btn-sm')); + $link = Display::url(' ' . get_lang('Delete'), $url, array('class' => 'btn btn-danger btn-sm')); echo '
    • ' . $userInfo['complete_name_with_username'] . '
      ' . $link . '
      • '; } echo '
    '; @@ -108,7 +108,7 @@ if (!empty($userToAddList)) { foreach ($userToAddList as $user) { $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') '; $url = api_get_path(WEB_CODE_PATH).'work/add_user.php?action=add&id='.$workId.'&user_id='.$user['user_id']; - $link = Display::url(' ' . get_lang('Add'), $url, array('class' => 'btn btn-primary btn-sm')); + $link = Display::url(' ' . get_lang('Add'), $url, array('class' => 'btn btn-primary btn-sm')); echo '
  • ' . $userName . '
    ' . $link . '
    • '; } echo '
'; diff --git a/main/work/work.php b/main/work/work.php index e530ee6796..2233b39aae 100755 --- a/main/work/work.php +++ b/main/work/work.php @@ -330,7 +330,7 @@ switch ($action) { $content .= ''; $content .= ''; $content .= ''; } else { diff --git a/plugin/advanced_subscription/views/open_session.tpl b/plugin/advanced_subscription/views/open_session.tpl index bef2f0be75..c4473b0037 100644 --- a/plugin/advanced_subscription/views/open_session.tpl +++ b/plugin/advanced_subscription/views/open_session.tpl @@ -34,7 +34,7 @@ - + {{ "AcceptInfinitive"|get_plugin_lang('AdvancedSubscriptionPlugin') }} @@ -47,7 +47,7 @@ - + {{ "GoToSessionX"|get_plugin_lang('AdvancedSubscriptionPlugin')|format(session.name) }} diff --git a/plugin/buycourses/view/catalog.tpl b/plugin/buycourses/view/catalog.tpl index 1bea2bce23..e6f0d6f939 100644 --- a/plugin/buycourses/view/catalog.tpl +++ b/plugin/buycourses/view/catalog.tpl @@ -32,21 +32,21 @@
    {% for teacher in course.teachers %} -
  • {{ teacher }}
    • +
  • {{ teacher }}
    • {% endfor %}

{{ course.currency }} {{ course.price }}

{% if course.enrolled == "YES" %}
- {{ 'TheUserIsAlreadyRegisteredInTheCourse'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'TheUserIsAlreadyRegisteredInTheCourse'|get_plugin_lang('BuyCoursesPlugin') }}
{% elseif course.enrolled == "NO" %}
- {{ 'SeeDescription'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'SeeDescription'|get_plugin_lang('BuyCoursesPlugin') }} - {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }}
{% elseif course.enrolled == "TMP" %} @@ -68,14 +68,14 @@ {{ session.name }} {% if 'show_session_coach'|get_setting == 'true' %} -

{{ session.coach }}

+

{{ session.coach }}

{% endif %} -

{{ session.dates.display }}

+

{{ session.dates.display }}

{{ session.currency }} {{ session.price }}

    {% for course in session.courses %}
  • - {{ course.title }} + {{ course.title }} {% if course.coaches|length %}
      {% for coach in course.coaches %} @@ -88,12 +88,12 @@
    {% if session.enrolled == "YES" %}
    - {{ 'TheUserIsAlreadyRegisteredInTheSession'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'TheUserIsAlreadyRegisteredInTheSession'|get_plugin_lang('BuyCoursesPlugin') }}
    {% elseif session.enrolled == "NO" %}
    - {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'Buy'|get_plugin_lang('BuyCoursesPlugin') }}
    {% elseif session.enrolled == "TMP" %} diff --git a/plugin/buycourses/view/configuration.tpl b/plugin/buycourses/view/configuration.tpl index 3d1c4f7d62..a41d6289c2 100644 --- a/plugin/buycourses/view/configuration.tpl +++ b/plugin/buycourses/view/configuration.tpl @@ -51,9 +51,9 @@ {% if item.visible %} - + {% else %} - + {% endif %} @@ -61,7 +61,7 @@ - {{ 'Configure'|get_lang }} + {{ 'Configure'|get_lang }} @@ -111,9 +111,9 @@ {% if item.visible %} - + {% else %} - + {% endif %} @@ -121,7 +121,7 @@ - {{ 'Configure'|get_lang }} + {{ 'Configure'|get_lang }} diff --git a/plugin/buycourses/view/paymentsetup.tpl b/plugin/buycourses/view/paymentsetup.tpl index 435bc912d7..f859e7d97f 100644 --- a/plugin/buycourses/view/paymentsetup.tpl +++ b/plugin/buycourses/view/paymentsetup.tpl @@ -61,7 +61,7 @@ {{ account.swift }} - {{ 'Delete'|get_lang }} + {{ 'Delete'|get_lang }} diff --git a/plugin/buycourses/view/process.tpl b/plugin/buycourses/view/process.tpl index e3335f005d..fc38e02acd 100644 --- a/plugin/buycourses/view/process.tpl +++ b/plugin/buycourses/view/process.tpl @@ -15,7 +15,7 @@

    {{ course.title }}

      {% for teacher in course.teachers %} -
    • {{ teacher }}
      • +
    • {{ teacher }}
      • {% endfor %}

    @@ -38,7 +38,7 @@ {% for course in session.courses %}

    {{ course.title }}
    {% for coach in course.coaches %} -
    {{ coach }}
    +
    {{ coach }}
    {% endfor %} {% endfor %} diff --git a/plugin/buycourses/view/process_confirm.tpl b/plugin/buycourses/view/process_confirm.tpl index 46f37805a8..4558bafbba 100644 --- a/plugin/buycourses/view/process_confirm.tpl +++ b/plugin/buycourses/view/process_confirm.tpl @@ -23,7 +23,7 @@

    {{ course.title }}

      {% for teacher in course.teachers %} -
    • {{ teacher }}
      • +
    • {{ teacher }}
      • {% endfor %}

    @@ -48,7 +48,7 @@ {% for course in session.courses %}

    {{ course.title }}
    {% for coach in course.coaches %} -
    {{ coach }}
    +
    {{ coach }}
    {% endfor %} {% endfor %} diff --git a/plugin/buycourses/view/sales_report.tpl b/plugin/buycourses/view/sales_report.tpl index 9496bfcc91..e602274d39 100644 --- a/plugin/buycourses/view/sales_report.tpl +++ b/plugin/buycourses/view/sales_report.tpl @@ -37,10 +37,10 @@ {% if sale.status == sale_status_pending %} - {{ 'SubscribeUser'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'SubscribeUser'|get_plugin_lang('BuyCoursesPlugin') }} - {{ 'DeleteOrder'|get_plugin_lang('BuyCoursesPlugin') }} + {{ 'DeleteOrder'|get_plugin_lang('BuyCoursesPlugin') }} {% endif %} diff --git a/plugin/buycourses/view/success.tpl b/plugin/buycourses/view/success.tpl index 8785a8ca42..c7c72d06f4 100644 --- a/plugin/buycourses/view/success.tpl +++ b/plugin/buycourses/view/success.tpl @@ -26,7 +26,7 @@

    {{ course.title }}

      {% for teacher in course.teachers %} -
    • {{ teacher }}
      • +
    • {{ teacher }}
      • {% endfor %}

    @@ -51,7 +51,7 @@ {% for course in session.courses %}

    {{ course.title }}
    {% for coach in course.coaches %} -
    {{ coach }}
    +
    {{ coach }}
    {% endfor %} {% endfor %} diff --git a/plugin/dashboard/block_course/block_course.class.php b/plugin/dashboard/block_course/block_course.class.php index 4fb8c8f550..81f39276c0 100755 --- a/plugin/dashboard/block_course/block_course.class.php +++ b/plugin/dashboard/block_course/block_course.class.php @@ -71,7 +71,7 @@ class BlockCourse extends Block $charset ) ) . '\')) return false;" href="index.php?action=disable_block&path=' . $this->path . '"> - +
    diff --git a/plugin/dashboard/block_daily/block_daily.class.php b/plugin/dashboard/block_daily/block_daily.class.php index efa079d887..e675ba3aae 100755 --- a/plugin/dashboard/block_daily/block_daily.class.php +++ b/plugin/dashboard/block_daily/block_daily.class.php @@ -80,7 +80,7 @@ class BlockDaily extends Block $charset ) ) . '\')) return false;" href="index.php?action=disable_block&path=' . $this->path . '"> - +
    diff --git a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php index f1b2fa0e11..d6d65028fe 100755 --- a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php +++ b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php @@ -79,7 +79,7 @@ class BlockEvaluationGraph extends Block
    '.get_lang('EvaluationsGraph').'
    - +
    '; diff --git a/plugin/dashboard/block_global_info/block_global_info.class.php b/plugin/dashboard/block_global_info/block_global_info.class.php index aa071b9b23..95b41d6a1d 100755 --- a/plugin/dashboard/block_global_info/block_global_info.class.php +++ b/plugin/dashboard/block_global_info/block_global_info.class.php @@ -70,7 +70,7 @@ class BlockGlobalInfo extends Block
    '.get_lang('GlobalPlatformInformation').'
    - +
    diff --git a/plugin/dashboard/block_session/block_session.class.php b/plugin/dashboard/block_session/block_session.class.php index 1d8c40c8b4..207409d94b 100755 --- a/plugin/dashboard/block_session/block_session.class.php +++ b/plugin/dashboard/block_session/block_session.class.php @@ -67,7 +67,7 @@ class BlockSession extends Block
    '.get_lang('SessionsInformation').'
    - +
    diff --git a/plugin/dashboard/block_student/block_student.class.php b/plugin/dashboard/block_student/block_student.class.php index a1d50d2b0f..19d6ddd9ff 100755 --- a/plugin/dashboard/block_student/block_student.class.php +++ b/plugin/dashboard/block_student/block_student.class.php @@ -62,7 +62,7 @@ class BlockStudent extends Block
    '.get_lang('StudentsInformationsList').'
    - +
    diff --git a/plugin/dashboard/block_student_graph/block_student_graph.class.php b/plugin/dashboard/block_student_graph/block_student_graph.class.php index 4718589916..6a57156e66 100755 --- a/plugin/dashboard/block_student_graph/block_student_graph.class.php +++ b/plugin/dashboard/block_student_graph/block_student_graph.class.php @@ -76,7 +76,7 @@ class BlockStudentGraph extends Block
    '.get_lang('StudentsInformationsGraph').'
    - +
    diff --git a/plugin/dashboard/block_teacher/block_teacher.class.php b/plugin/dashboard/block_teacher/block_teacher.class.php index 0d8f7e5efb..152d624992 100755 --- a/plugin/dashboard/block_teacher/block_teacher.class.php +++ b/plugin/dashboard/block_teacher/block_teacher.class.php @@ -70,7 +70,7 @@ class BlockTeacher extends Block
    '.get_lang('TeachersInformationsList').'
    - +
    diff --git a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php index 38ec5fd4f2..20f55d7c8f 100755 --- a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php +++ b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php @@ -69,7 +69,7 @@ class BlockTeacherGraph extends Block
    '.get_lang('TeachersInformationsGraph').'
    - +
    From 6ce0372c50938ef2140ba8dabc968d5f75e6763e Mon Sep 17 00:00:00 2001 From: Julio Date: Wed, 14 Oct 2015 08:52:44 +0200 Subject: [PATCH 11/12] Add fill in blanks + matching in excel see BT#10023 --- main/exercice/upload_exercise.php | 321 ++++++++++++++++++++---------- 1 file changed, 219 insertions(+), 102 deletions(-) diff --git a/main/exercice/upload_exercise.php b/main/exercice/upload_exercise.php index 49038af972..5841a7b3d0 100755 --- a/main/exercice/upload_exercise.php +++ b/main/exercice/upload_exercise.php @@ -37,9 +37,7 @@ lp_upload_quiz_action_handling(); $interbreadcrumb[]= array ("url"=>"exercise.php", "name"=> get_lang('Exercises')); -// Display the header - -Display :: display_header(get_lang('ImportExcelQuiz'), 'Exercises'); +Display::display_header(get_lang('ImportExcelQuiz'), 'Exercises'); if (isset($_GET['message'])) { if (in_array($_GET['message'], array('ExerciseEdited'))) { @@ -61,18 +59,17 @@ function lp_upload_quiz_actions() { return $return; } -function lp_upload_quiz_secondary_actions() { - $lp_id = Security::remove_XSS($_GET['lp_id']); - $return = ''; - $return .= '' . - Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . ''; +function lp_upload_quiz_secondary_actions() +{ + $return = '' . + Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . ''; return $return; } function lp_upload_quiz_main() { // variable initialisation - $lp_id = isset($_GET['lp_id']) ? Security::remove_XSS($_GET['lp_id']) : null; + $lp_id = isset($_GET['lp_id']) ? intval($_GET['lp_id']) : null; $form = new FormValidator( 'upload', @@ -85,7 +82,7 @@ function lp_upload_quiz_main() { $form->addElement('file', 'user_upload_quiz', get_lang('FileUpload')); $link = ''. - Display::return_icon('export_excel.png', get_lang('DownloadExcelTemplate')).get_lang('DownloadExcelTemplate').''; + Display::return_icon('export_excel.png', get_lang('DownloadExcelTemplate')).get_lang('DownloadExcelTemplate').''; $form->addElement('label', '', $link); $form->addElement('checkbox', 'user_custom_score', null, get_lang('UseCustomScoreForAllQuestions'), array('id'=> 'user_custom_score')); $form->addElement('html', '