diff --git a/assets/css/app.scss b/assets/css/app.scss index b85951db7f..0bb3369b91 100644 --- 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"; diff --git a/public/main/exercise/admin.php b/public/main/exercise/admin.php index 944ef44c45..6e5482a261 100644 --- 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[] = ''; +$htmlHeadXtra[] = ''; + +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'); diff --git a/src/CoreBundle/Resources/views/Layout/base-layout.html.twig b/src/CoreBundle/Resources/views/Layout/base-layout.html.twig index f77267eb46..6fff0cc1d2 100644 --- 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 %} -
+ {%- block chamilo_wrap -%} {%- block page_content %}