Fix exercise view

main/inc/lib/template.lib.php

@@ -1387,6 +1387,7 @@ class Template
             'web_lib' => api_get_path(WEB_LIBRARY_PATH),
             'web_upload' => api_get_path(WEB_UPLOAD_PATH),
             'web_self' => api_get_self(),
+            'self_basename' => basename(api_get_self()),
             'web_query_vars' => api_htmlentities($queryString),
             'web_self_query_vars' => api_htmlentities($requestURI),
             'web_cid_query' => api_get_cidreq(),

main/template/rainbow/layout/show_header.tpl

@@ -42,17 +42,17 @@
         <!-- END DISPLAY COOKIES VALIDATION -->
     {% endif %}
 
-    <!-- START HEADER -->
-    <header id="cm-header">
-        {% if show_header == true %}
-            {% include 'layout/page_header.tpl'|get_template %}
-        {% endif %}
-    </header>
-    <!-- END HEADER -->
+    {% if show_header == true %}
+        <!-- START HEADER -->
+        <header id="cm-header">
+        {% include 'layout/page_header.tpl'|get_template %}
+        </header>
+        <!-- END HEADER -->
+    {% endif %}
 
     <!-- START CONTENT -->
     <section id="cm-content">
-        {% if (section_name == 'section-exercise' or section_name == 'section-results') %}
+        {% if (_p.self_basename == 'exercise_submit.php' or _p.self_basename == 'result.php') %}
             <div class="container-fluid">
         {% else %}
             <div class="container">