Merge remote-tracking branch 'origin/master'

# Conflicts: # assets/css/app.scss
11 months ago · 45f289415c
parent 021f7c2461 22da540f27
commit 45f289415c
3 changed files with 19 additions and 1 deletions
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@ -850,6 +850,12 @@ form .field {
  }
 }

+@layer components {
+  .tiny-content table {
+    @apply w-auto table-auto;
+  }
+}
+
 //@import "~jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
@import "~@fancyapps/fancybox/dist/jquery.fancybox.css";
@import "~timepicker/jquery.timepicker.min.css";
--- a/public/main/exercise/admin.php
+++ b/public/main/exercise/admin.php
@ -281,7 +281,15 @@ $htmlHeadXtra[] = api_get_build_js('legacy_exercise.js');
 $template = new Template();
 $templateName = $template->get_template('exercise/submit.js.tpl');
 $htmlHeadXtra[] = $template->fetch($templateName);
+$htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 $htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
+
+if (isset($_GET['message'])) {
+    if (in_array($_GET['message'], ['ExerciseStored', 'ItemUpdated', 'ItemAdded'])) {
+        Display::addFlash(Display::return_message(get_lang($_GET['message']), 'confirmation'));
+    }
+}

 Display::display_header($nameTools, 'Exercise');

--- a/src/CoreBundle/Resources/views/Layout/base-layout.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/base-layout.html.twig
@ -10,7 +10,11 @@
 {% block chamilo_head %}
    {%- include "@ChamiloCore/Layout/head.html.twig" %}
 {% endblock %}
-<body class="font-sans antialiased {{ section_name }}">
+<body class="font-sans antialiased {{ section_name }}"
+      data-in-course="{{ course ? 'true' : 'false' }}"
+      data-course-id="{{ course ? course.id : '' }}"
+      data-session-id="{{ session ? session.id : '' }}"
+>
 <noscript>{{ "Your browser does not support Javascript"|trans }}</noscript>
 {%- block chamilo_wrap -%}
    {%- block page_content %}