🪲 fix preview class banner

templates/layout.html

@@ -125,11 +125,6 @@
       {% if menu != False %}
         {% include "incl/menubar.html" %}
       {% endif %}
-      {% if session.preview_class %}
-      <div class="bg-red-500 text-white text-sm font-bold px-4 py-3" data-cy="preview_class_banner" role="alert">
-          <div class="text-center center-text">{{_('previewing_class').format(class_name=session.preview_class["name"])}} <a class="text-white" href="/for-teachers/clear-preview-class">{{_('exit_preview_mode')}}</a></div>
-      </div>
-      {% endif %}
       {# Can't reindent this as it may contain preformatted code blocks whose indentation is important. #}
       {% block full_width_content %}{% endblock %}
 

templates/level-page.html

@@ -2,6 +2,11 @@
 
 {% block full_width_content %}
 {% if not raw %}
+  {% if not raw and session.preview_class %}
+    <div class="bg-red-500 text-white text-sm font-bold px-4 py-3" data-cy="preview_class_banner" role="alert">
+        <div class="text-center center-text">{{_('previewing_class').format(class_name=session.preview_class["name"])}} <a class="text-white" href="/for-teachers/clear-preview-class">{{_('exit_preview_mode')}}</a></div>
+    </div>
+  {% endif %}
 {% if customizations and customizations["teachers_adventure"] %}
   <div class="bg-red-500 text-white text-sm font-bold px-4 py-3" data-cy="preview_adventure_banner" role="alert">
       <div class="text-center center-text">{{_('previewing_adventure')}} 

utils.py

@@ -499,3 +499,10 @@ def replace(match):
         content += "<p>&nbsp;</p>"
 
     return content
+
+
+def remove_class_preview():
+    try:
+        del session["preview_class"]
+    except KeyError:
+        pass

website/auth_pages.py

@@ -6,7 +6,7 @@
 from config import config
 from safe_format import safe_format
 from hedy_content import ALL_LANGUAGES, COUNTRIES
-from utils import extract_bcrypt_rounds, is_heroku, is_testing_request, timems, times
+from utils import extract_bcrypt_rounds, is_heroku, is_testing_request, timems, times, remove_class_preview
 from website.auth import (
     MAILCHIMP_API_URL,
     RESET_LENGTH,
@@ -247,6 +247,7 @@ def logout(self):
         if request.cookies.get(TOKEN_COOKIE_NAME):
             self.db.forget_token(request.cookies.get(TOKEN_COOKIE_NAME))
         session[JUST_LOGGED_OUT] = True
+        remove_class_preview()
         return "", 200
 
     @ route("/destroy", methods=["POST"])

website/for_teachers.py

@@ -230,10 +230,7 @@ def preview_class_as_teacher(self, user, class_id):
     @route("/clear-preview-class", methods=["GET"])
     # Note: we explicitly do not need login here, anyone can exit preview mode
     def clear_preview_class(self):
-        try:
-            del session["preview_class"]
-        except KeyError:
-            pass
+        utils.remove_class_preview()
         return redirect("/for-teachers")
 
     @route("/class/<class_id>/programs/<username>", methods=["GET", "POST"])