Add CSS style for embeddable quiz - refs BT#16576

6 years ago · 0135ecb154
parent c315b77f52
commit 0135ecb154
6 changed files with 40 additions and 37 deletions
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@ -64,6 +64,14 @@ body {
    margin-bottom: 60px;
 }

+body.page_origin_embeddable {
+    padding-top: 10px;
+}
+body.page_origin_embeddable #cm-content > .container {
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+}
+
 .footer > .container {
    padding-right: 15px;
    padding-left: 15px;
--- a/main/exercise/exercise_result.php
+++ b/main/exercise/exercise_result.php
@ -86,11 +86,6 @@ if (!in_array($origin, ['learnpath', 'embeddable'])) {
    // So we are not in learnpath tool
    Display::display_header($nameTools, get_lang('Exercise'));
 } else {
-    $htmlHeadXtra[] = "
-    <style>
-    body { background: none;}
-    </style>
-    ";
    Display::display_reduced_header();
 }

--- a/main/exercise/exercise_submit.php
+++ b/main/exercise/exercise_submit.php
@ -862,7 +862,6 @@ if (!in_array($origin, ['learnpath', 'embeddable'])) { //so we are not in learnp

    Display::display_header(null, 'Exercises');
 } else {
-    $htmlHeadXtra[] = "<style> body { background: none;} </style> ";
    Display::display_reduced_header();
    echo '<div style="height:10px">&nbsp;</div>';
 }
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@ -963,6 +963,7 @@ class Template
     */
    public function display($template, $clearFlashMessages = true)
    {
+        $this->assign('page_origin', api_get_origin());
        $this->assign('flash_messages', Display::getFlashToString());

        if ($clearFlashMessages) {
--- a/main/template/default/layout/page.tpl
+++ b/main/template/default/layout/page.tpl
@ -9,7 +9,7 @@
    {% include 'layout/head.tpl'|get_template %}
 {% endblock %}
 </head>
-<body>
+<body class="{{ 'page_origin' ? ('page_origin_' ~ page_origin) : '' }}">
    <!-- START MAIN -->
    <main id="main" dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
    <noscript>{{ "NoJavascript"|get_lang }}</noscript>
--- a/main/template/default/layout/show_header.tpl
+++ b/main/template/default/layout/show_header.tpl
@ -9,7 +9,7 @@
        {% include 'layout/head.tpl'|get_template %}
    {% endblock %}
 </head>
-<body>
+<body class="{{ 'page_origin' ? ('page_origin_' ~ page_origin) : '' }}">

 <!-- START MAIN -->
 <main id="main" dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">