codeforlife-portal 5.32.2__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/templates/portal/partials/footer.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 <div class="footer">
@@ -9,46 +9,77 @@
                     <div class="col-sm-4 col-xs-12">
                         <p><a href="{% url 'about' %}">About us</a></p>
                         <p><a class="freshdesk__contact-us">Help and support</a></p>
-                        <p><a class="optanon-toggle-display">Cookie settings</a></p>
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FHx2kJLPwUER9Ez7gdQFp%2F2023_Impact_Report_Final.pdf?alt=media"
+                              target="_blank">Impact Report 2023</a></p>
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FzLy8JN9TSFpzunetkWET%2FImpact_Report_24.V.10.pdf?alt=media"
+                              target="_blank">Impact Report 2024</a></p>
                     </div>
                     <div class="col-sm-4 col-xs-12">
-                        <p><a href="{% url 'privacy_policy' %}">Privacy policy</a></p>
+                        <p><a href="{% url 'privacy_notice' %}">Privacy notice</a></p>
                         <p><a href="{% url 'terms' %}">Terms of use</a></p>
+                        <p><a class="optanon-toggle-display">Cookie settings</a></p>
+                        <p><a href="https://docs.codeforlife.education/">CFL community</a></p>
                     </div>
                     <div class="col-sm-4 col-xs-12">
                         <p><a href="{% url 'home-learning' %}">Home learning</a></p>
                         <p><a href="{% url 'getinvolved' %}">Get involved</a></p>
+                        <p><a href="{% url 'codingClub' %}">Coding clubs</a></p>
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FPavvCifcuUeZZZLkV01C%2FOpportunities%20with%20Code%20for%20Life.pdf?alt=media"
+                              target="_blank">Opportunities with CFL</a></p>
                     </div>
                 </div>
-                <form id="newsletter_form" action="{% url 'process_newsletter_form' %}" method="post">
-                    {{ news_form.non_field_errors }}
-                    <div class="form--row">
-                        <div class="form--row__input">
-                            <label>{{ news_form.email.label }}</label>
-                            <div class="input--icon">
-                                {{ news_form.email }}
-                                <span class="iconify" data-icon="mdi:email-outline"></span>
+            </div>
+            <div class="col-sm-4 hidden-xs">
+                <a target="_blank" href="https://www.ocadogroup.com/sustainability/sustainability">
+                    <img title="Ocado Group" alt="Ocado Group" src="{% static 'portal/img/logo_cfl_powered.svg' %}">
+                </a>
+            </div>
+        </div>
+        <div class="row">
+            <form id="newsletter_form" action="{% url 'process_newsletter_form' %}" method="post">
+                <div class="col-sm-8">
+                    <div>
+                        {{ news_form.non_field_errors }}
+                        <div class="form--row">
+                            <div class="form--row__input">
+                                <label>{{ news_form.email.label }}</label>
+                                <div class="input--icon">
+                                    {{ news_form.email }}
+                                    <span class="iconify" data-icon="mdi:email-outline"></span>
+                                </div>
+                                <small>{{ news_form.email.help_text }}</small>
+                                {{ news_form.email.errors }}
                             </div>
-                            <small>{{ news_form.email.help_text }}</small>
-                            {{ news_form.email.errors }}
                         </div>
-                        <button type="submit" id="submit_newsletter" name="submit" value="Submit" class="button button--primary">Sign up</button>
+                        <div class="form--row justify-content-between">
+                            <div class="form__checkbox">
+                                <div class="form__checkbox-input">
+                                    {{ news_form.age_verification }}
+                                </div>
+                                <p class="p-0">Please confirm that you are over 18.</p>
+                            </div>
+                            <button type="submit" id="submit_newsletter" name="submit" value="Submit" class="button button--primary m-0">Sign up</button>
+                        </div>
                     </div>
-                </form>
-            </div>
-            <div class="col-sm-4">
-                <img class="landscape-logo hidden-sm hidden-xs" title="Code for Life" alt="Code for Life" src="{% static 'portal/img/logo_cfl_white_landscape.png' %}">
-                <div class="external-links">
                     <div class="social-media">
-                        <a target="_blank" href="https://www.facebook.com/codeforlifeuk/"><span class="iconify" data-icon="mdi:facebook"></span></a>
-                        <a target="_blank" href="https://twitter.com/codeforlifeuk"><span class="iconify" data-icon="ant-design:twitter-circle-filled"></span></a>
+                        <a target="_blank" href="https://www.facebook.com/codeforlifeuk/"><span class="iconify" data-icon="simple-icons:facebook"></span></a>
+                        <a target="_blank" href="https://www.instagram.com/codeforlife_uk/"><span class="iconify" data-icon="simple-icons:instagram"></span></a>
+                        <a target="_blank" href="https://www.linkedin.com/company/code-for-life-uk/"><span class="iconify" data-icon="simple-icons:linkedin"></span></a>
+                        <a target="_blank" href="https://twitter.com/codeforlifeuk"><span class="iconify" data-icon="ri:twitter-x-line"></span></a>
+                        <a target="_blank" href="https://www.youtube.com/@CodeForLife-uk"><span class="iconify" data-icon="simple-icons:youtube"></span></a>
+                    </div>
+                    <div class="visible-xs">
+                        <a target="_blank" href="https://www.ocadogroup.com/sustainability/sustainability">
+                            <img title="Ocado Group" alt="Ocado Group" src="{% static 'portal/img/logo_cfl_powered.svg' %}">
+                        </a>
                     </div>
-                    <img class="landscape-logo visible-sm visible-xs" title="Code for Life" alt="Code for Life" src="{% static 'portal/img/logo_cfl_white_landscape.png' %}">
-                    <a target="_blank" href="https://www.ocadogroup.com/our-responsible-business/corporate-responsibility/skills-for-the-future">
-                        <img title="Ocado Group" alt="Ocado Group" src="{% static 'portal/img/logo_ocado_group_white.svg' %}">
-                    </a>
                 </div>
-            </div>
+                <div class="col-sm-4">
+                    <div class="is-flex justify-content-center justify-content-sm-end">
+                        <img title="10 years anniversary" alt="10 years anniversary" src="{% static 'portal/img/10_years_anniversary.png' %}">
+                    </div>
+                </div>
+            </form>
         </div>
         <p class="copyright">&copy; Ocado Group {% now "Y" %}</p>
     </div>

portal/templates/portal/partials/header.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
 <div class="header">
@@ -15,98 +15,91 @@
             {% else %}
                 <a href="{% url 'home' %}">
             {% endif %}
-                    <img class="logo" src="{% static 'portal/img/logo_cfl.png' %}">
+                    <img class="logo" src="{% static 'portal/img/logo_cfl.png' %}" alt="Code for Life logo">
                 </a>
-            <a class="menu__brand--ocado" target="_blank" href="https://www.ocadogroup.com/our-responsible-business/corporate-responsibility/skills-for-the-future">
-                <img title="Proudly developed by Ocado Group" alt="Proudly developed by Ocado Group"
+            <a class="menu__brand--ocado" target="_blank" href="https://www.ocadogroup.com/sustainability/sustainability">
+                <img title="Proudly developed by Ocado Group" alt="Ocado Group logo"
                 src="{% static 'portal/img/logo_ocado_group.svg' %}">
             </a>
             <span class="material-icons-outlined visible-sm visible-xs" data-toggle="collapse" data-target="#menu-items">
                 menu
             </span>
-        </div>
-        {% if user|is_logged_in %}
-        <div class="menu__left-side col-md-7">
-            {% if user|is_logged_in_as_teacher %}
-                <div class="menu--title">Teacher</div>
-                {% if user|has_teacher_finished_onboarding %}
-                    <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
-                    <div class="dropdown">
-                        <a id="games_button"
-                            class="button--menu button--menu--secondary button--menu--enabled">
-                            Games <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
-                        <div class="dropdown-content">
-                            <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
-                            <a href="{% url_for_aimmo_dashboard %}" id="teacher_kurono_dashboard_button"><small>Kurono</small></a>
+            <div class="menu__left-side hidden-sm hidden-xs">
+            {% if user|is_logged_in %}
+                {% if user|is_logged_in_as_teacher %}
+                    {% if user|has_teacher_finished_onboarding %}
+                        <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
+                        <div class="dropdown">
+                            <a id="games_button"
+                               class="button--menu button--menu--secondary button--menu--enabled">
+                                Games <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
+                            <div class="dropdown-content">
+                                <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
+                                <a href="{% url 'python_levels' %}"><small>Python Den</small></a>
+                            </div>
                         </div>
-                    </div>
-                    <div class="dropdown">
-                        <a id="teaching_resources_button"
-                            class="button--menu button--menu--secondary button--menu--enabled">
-                            Teaching Resources <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
-                        <div class="dropdown-content">
-                            <a id="rapid_router_resources_button" href="{% url 'teaching_resources' %}">
-                                <small>Rapid Router</small></a>
-                            <a id="kurono_resources_button" href="{% url 'kurono_teaching_resources' %}">
-                                <small>Kurono</small></a>
+                        <div class="dropdown">
+                            <a id="teaching_resources_button"
+                               class="button--menu button--menu--secondary button--menu--enabled">
+                                Resources <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
+                            <div class="dropdown-content">
+                                <a id="rapid_router_resources_button" href="https://code-for-life.gitbook.io/teaching-resources/" target="_blank">
+                                    <small>Rapid Router</small> <span class="iconify" data-icon="mdi:open-in-new"></span></a>
+                                <a href="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/DGiFT28ihVJK7ghZQHqu" target="_blank">
+                                    <small>Python Den</small> <span class="iconify" data-icon="mdi:open-in-new"></span></a>
+                                <a href="{% url 'codingClub' %}"><small>Coding Clubs</small></a>
+                            </div>
                         </div>
-                    </div>
-                {% else %}
-                    <a href="{% url 'onboarding-organisation' %}" class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
-                    <a class="button--menu button--menu--secondary button--menu--disabled">Games</a>
-                    <a class="button--menu button--menu--secondary button--menu--disabled">Teaching Resources</a>
-                {% endif %}
-            {% else %}
-                {% if user|is_independent_student %}
-                    <div class="menu--title">Independent</div>
+                    {% else %}
+                        <a href="{% url 'onboarding-organisation' %}" class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
+                        <a class="button--menu button--menu--secondary button--menu--disabled">Games</a>
+                        <a class="button--menu button--menu--secondary button--menu--disabled">Resources</a>
+                    {% endif %}
                 {% else %}
-                    <div class="menu--title">Student</div>
-                {% endif %}
-                <a
-                    {% if user|is_independent_student %}
+                    <a
+                        {% if user|is_independent_student %}
                         href="{% url 'independent_student_details' %}"
-                    {% else %}
+                        {% else %}
                         href="{% url 'student_details' %}"
-                    {% endif %}
-                    id="student_dashboard_button"
-                    class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
-                <div class="dropdown">
-                    <a class="button--menu button--menu--secondary button--menu--enabled">
-                        Games
-                        <span class="material-icons-outlined md-32">arrow_drop_down</span>
-                    </a>
-                    <div class="dropdown-content">
-                        <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
-                        {% if not user|is_independent_student %}
-                            <a href="{% url_for_aimmo_dashboard %}"><small>Kurono</small></a>
                         {% endif %}
-                    </div>
-                </div>
-                {% if user|is_logged_in_as_school_user %}
-                <a href="{% url 'scoreboard' %}" id="student_scoreboards_button"
-                    class="button--menu button--menu--secondary button--menu--enabled">Scoreboard</a>
-                {% endif %}
-                <!-- independent student -->
-                {% if not user.new_student.class_field %}
+                        id="student_dashboard_button"
+                        class="button--menu button--menu--secondary button--menu--enabled">Dashboard</a>
                     <div class="dropdown">
-                        <a id="teaching_resources_button"
-                            class="button--menu button--menu--secondary button--menu--enabled">
-                            Learning Resources <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
+                        <a class="button--menu button--menu--secondary button--menu--enabled">
+                            Games
+                            <span class="material-icons-outlined md-32">arrow_drop_down</span>
+                        </a>
                         <div class="dropdown-content">
-                            <a href="https://code-for-life.gitbook.io/independent-student-resources/" target="_blank">
-                                <small>Rapid Router</small></a>
+                            <a href="{% url 'levels' %}"><small>Rapid Router</small></a>
+                            <a href="{% url 'python_levels' %}"><small>Python Den</small></a>
                         </div>
                     </div>
+                    {% if user|is_logged_in_as_school_user %}
+                        <a href="{% url 'scoreboard' %}" id="student_scoreboards_button"
+                           class="button--menu button--menu--secondary button--menu--enabled">Scoreboard</a>
+                    {% endif %}
+                    <!-- independent student -->
+                    {% if not user.new_student.class_field %}
+                        <div class="dropdown">
+                            <a id="teaching_resources_button"
+                               class="button--menu button--menu--secondary button--menu--enabled">
+                                Resources <span class="material-icons-outlined md-32">arrow_drop_down</span></a>
+                            <div class="dropdown-content">
+                                <a href="https://code-for-life.gitbook.io/independent-student-resources/" target="_blank">
+                                    <small>Rapid Router</small><span class="iconify" data-icon="mdi:open-in-new"></span></a>
+                                <a href="{% url 'codingClub' %}"><small>Coding Clubs</small></a>
+                            </div>
+                        </div>
+                    {% endif %}
                 {% endif %}
-            {% endif %}
-        {% else %}
-            <div class="menu__left-side col-md-5">
+            {% else %}
                 <a href="{% url 'teach' %}" class="button--menu button--menu--primary button--menu--enabled">Teachers</a>
                 <a href="{% url 'play' %}" class="button--menu button--menu--primary  button--menu--enabled">Students</a>
-        {% endif %}
+            {% endif %}
+            </div>
         </div>
         {% if user|is_logged_in %}
-        <div class="menu__right-side col-md-4">
+        <div class="menu__right-side">
             <div class="dropdown header__account-details-dropdown">
                 <button id="logout_menu" class="button--regular button--secondary button--dropdown header__account-details-dropdown"
                         data-toggle="dropdown">
@@ -114,8 +107,7 @@
                 </button>
                 <ul class="dropdown-menu header__account-details-dropdown-menu">
                     <li class="dropdown-menu__option">
-                        <a class="button--regular" id="logout_button" aria-labelledby="Log out"
-                          href="{% url 'logout_view' %}" onclick="deleteAllLocalStorageWorkspaces();">
+                        <a class="button--regular" id="logout_button" aria-labelledby="Log out" href="{% url 'logout_view' %}">
                             <div class="dropdown-menu__option__text">Log out</div>
                             <span class="material-icons-outlined">logout</span></a>
                     </li>
@@ -123,8 +115,8 @@
                         {% if user|has_teacher_finished_onboarding %}
                             <li class="dropdown-menu__option">
                                 {# if the current page is teacher dashboard, trigger a tab change instead #}
-                                <a class="button--regular" aria-labelledby="Update account details"
-                                href="{% url 'dashboard' %}#account" {% if request.resolver_match.view_name == 'dashboard' %}onclick="$('#tab-account').click();"{% endif %}>
+                                <a class="button--regular" aria-labelledby="Update account details" id="update_account_detail_button"
+                                href="{% url 'dashboard' %}?account=true#account" {% if request.resolver_match.view_name == 'dashboard' %}onclick="$('#tab-account').click();"{% endif %}>
                                     <div class="dropdown-menu__option__text">Update account details</div>
                                     <span class="material-icons-outlined">manage_accounts</span></a>
                             </li>
@@ -146,36 +138,36 @@
                     {% endif %}
                 </ul>
             </div>
-            {% else %}
-            <div class="menu__right-side col-md-5">
-                <a href="{% url 'register' %}" id="signup_button" class="button button--primary button--register register">Register</a>
-                <div class="dropdown">
-                    <button id="login_dropdown" class="button--regular button--secondary button--header--login button--dropdown"
-                            data-toggle="dropdown">
-                        <div class="dropdown__text">Log in</div>
-                    </button>
-                    <ul class="dropdown-menu header__login-options-dropdown-menu">
-                        <li class="dropdown-menu__option">
-                            <a id="teacher_login_button" class="button--regular" aria-labelledby="Teacher" href="{% url 'teacher_login' %}">
-                                <div class="dropdown-menu__option__text">Teacher</div>
-                                <span class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                        <li class="dropdown-menu__option">
-                            <a id="student_login_button" class="button--regular" aria-labelledby="Student" href="{% url 'student_login_access_code' %}">
-                                <div class="dropdown-menu__option__text">Student</div>
-                                <span class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                        <li class="dropdown-menu__option">
-                            <a id="independent_login_button" class="button--regular" aria-labelledby="Independent" href="{% url 'independent_student_login' %}">
-                                <div class="dropdown-menu__option__text">Independent</div>
-                                <span class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            {% endif %}
+        {% else %}
+        <div class="menu__right-side">
+            <a href="{% url 'register' %}" id="signup_button" class="button button--primary button--register register">Register for FREE</a>
+            <div class="dropdown">
+                <button id="login_dropdown" class="button--regular button--secondary button--header--login button--dropdown"
+                        data-toggle="dropdown">
+                    <div class="dropdown__text">Log in</div>
+                </button>
+                <ul class="dropdown-menu header__login-options-dropdown-menu">
+                    <li class="dropdown-menu__option">
+                        <a id="teacher_login_button" class="button--regular" aria-labelledby="Teacher" href="{% url 'teacher_login' %}">
+                            <div class="dropdown-menu__option__text">Teacher</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                    <li class="dropdown-menu__option">
+                        <a id="student_login_button" class="button--regular" aria-labelledby="Student" href="{% url 'student_login_access_code' %}">
+                            <div class="dropdown-menu__option__text">Student</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                    <li class="dropdown-menu__option">
+                        <a id="independent_login_button" class="button--regular" aria-labelledby="Independent" href="{% url 'independent_student_login' %}">
+                            <div class="dropdown-menu__option__text">Independent</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        {% endif %}
         </div>
     </div>
     <div id="menu-items" class="collapse">
@@ -191,13 +183,15 @@
                       href="{% url 'dashboard' %}">School / Club<span class="material-icons-outlined md-32">chevron_right</span></a>
                     <a class="button button--menu__item button--menu__item__sub"
                       href="{% url 'levels' %}">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
+                    <a class="button button--menu__item button--menu__item__sub"
+                       href="{% url 'python_levels' %}">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     <button class="button--menu__item button--menu__item__sub
                     button--menu__item--sub-header" data-toggle="collapse" data-target="#resources-tabs">Teaching Resources</button>
                     <div id="resources-tabs" class="collapse">
                         <a class="button button--menu__item button--menu__item__sub__sub"
-                          href="{% url 'teaching_resources' %}">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
+                          href="https://code-for-life.gitbook.io/teaching-resources/" target="_blank">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
                         <a class="button button--menu__item button--menu__item__sub__sub"
-                          href="{% url 'kurono_teaching_resources' %}">Kurono<span class="material-icons-outlined md-32">chevron_right</span></a>
+                           href="https://code-for-life.gitbook.io/python-lessons-with-raspberry-pi-ide/DGiFT28ihVJK7ghZQHqu" target="_blank">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     </div>
                 </div>
             {% else %}
@@ -216,10 +210,8 @@
                     <div id="games-tabs" class="collapse">
                         <a class="button button--menu__item button--menu__item--{% if user|is_independent_student %}independent{% else %}student{% endif %} button--menu__item__sub"
                           href="{% url 'levels' %}">Rapid Router<span class="material-icons-outlined md-32">chevron_right</span></a>
-                        {% if not user|is_independent_student %}
-                            <a class="button button--menu__item button--menu__item--student button--menu__item__sub"
-                              href="{% url_for_aimmo_dashboard %}">Kurono<span class="material-icons-outlined md-32">chevron_right</span></a>
-                        {% endif %}
+                        <a class="button button--menu__item button--menu__item--{% if user|is_independent_student %}independent{% else %}student{% endif %} button--menu__item__sub"
+                           href="{% url 'python_levels' %}">Python Den<span class="material-icons-outlined md-32">chevron_right</span></a>
                     </div>
                     {% if user|is_logged_in_as_school_user %}
                     <a class="button button--menu__item button--menu__item--student"
@@ -239,16 +231,16 @@
             {% endif %}
         {% else %}
             <a class="button button--menu__item button--register"
-              href="{% url 'register' %}">Register now</a>
+              href="{% url 'register' %}">Register now for FREE</a>
             <button class="button--menu__item button--menu__item--sub-header login"
                     data-toggle="collapse" data-target="#login-tabs">Log in</button>
             <div id="login-tabs" class="collapse">
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'teacher_login' %}">Teacher<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'teacher_login' %}">Teacher<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'student_login_access_code' %}">Student<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'student_login_access_code' %}">Student<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'independent_student_login' %}">Independent<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'independent_student_login' %}">Independent<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
             </div>
             <a class="button button--menu__item" href="{% url 'teach' %}">Teacher
                 <span class="material-icons-outlined md-32">chevron_right</span></a>
@@ -259,9 +251,15 @@
             <span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item freshdesk__contact-us">Help and support
             <span class="material-icons-outlined md-32">chevron_right</span></a>
+        <a class="button button--menu__item" target="_blank"
+              href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FHx2kJLPwUER9Ez7gdQFp%2F2023_Impact_Report_Final.pdf?alt=media">
+            Impact Report 2023<span class="material-icons-outlined md-32">chevron_right</span></a>
+        <a class="button button--menu__item" target="_blank"
+              href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FzLy8JN9TSFpzunetkWET%2FImpact_Report_24.V.10.pdf?alt=media">
+            Impact Report 2024<span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item optanon-toggle-display">Cookie settings
             <span class="material-icons-outlined md-32">chevron_right</span></a>
-        <a class="button button--menu__item" href="{% url 'privacy_policy' %}">Privacy policy
+        <a class="button button--menu__item" href="{% url 'privacy_notice' %}">Privacy notice
             <span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item" href="{% url 'terms' %}">Terms of use
             <span class="material-icons-outlined md-32">chevron_right</span></a>
@@ -269,6 +267,9 @@
             <span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item" href="{% url 'getinvolved' %}">Get involved
             <span class="material-icons-outlined md-32">chevron_right</span></a>
+        <a class="button button--menu__item" target="_blank"
+           href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FPavvCifcuUeZZZLkV01C%2FOpportunities%20with%20Code%20for%20Life.pdf?alt=media">Opportunities with CFL
+            <span class="material-icons-outlined md-32">chevron_right</span></a>
         {% if user|is_logged_in %}
             {% if user|is_logged_in_as_teacher %}
                 {% if user|has_teacher_finished_onboarding %}

portal/templates/portal/partials/hero_card.html

@@ -1,13 +1,14 @@
-{% load staticfiles %}
+{% load static %}
 {% load app_tags %}
 
-<div class="card">
+<div class="card activated-card">
+    <div class="activated-text">Activated</div>
     <img class="card__image" src="{{ image | cloud_storage }}">
     <div class="card__text">
         <h4 class="card__title">{{ title }}</h4>
         <p>{{ description }}</p>
         <div class="button-group button-group__icon">
-            <a target="_blank" href="{{ button1.url }}" class="button button--primary button--icon">
+            <a target="_blank" href="{{ button1.url }}" class="button button--secondary button--secondary--dark button--icon">
                 {{ button1.text }}<span class="iconify" data-icon="mdi:open-in-new"></span>
             </a>
             <a href="{% url button2.url id=button2.url_args %}" class="button button--primary button-right-arrow">

portal/templates/portal/partials/info_popup.html

@@ -1,13 +1,13 @@
-{% load staticfiles %}
+{% load static %}
 {# An info popup with a close button in the top-right corner. #}
 <section id="info-popup" class="popup-wrapper">
     <div class="popup-box">
         <div class="popup-box__title justify-content-end">
-            <button type="button" onclick="hideInfoPopup()" class="close m-0" aria-label="Close" style="min-width:0;">
+            <button type="button" onclick="hideInfoPopup()" class="close popup-box__close" aria-label="Close">
                 <span class="iconify" data-icon="mdi:close"></span>
             </button>
         </div>
-        <div class="popup-box__title pt-0"><h5 class="mt-1"></h5></div>
+        <div class="popup-box__title"><h5 class="mt-1"></h5></div>
         <div class="popup-box__msg"></div>
     </div>
 </section>

portal/templates/portal/partials/invite_admin_teacher.html

@@ -0,0 +1,23 @@
+{# A popup for inviting teacher as admin #}
+<section id="popup-make-admin-teacher" class="popup-wrapper">
+    <div class="popup-box">
+        <div>
+            <button class="close popup-box__close" type="button" id="close_popup_button" onclick="hideMakeAdminTeacherPopup()" aria-label="Close">
+                <span class="iconify" data-icon="mdi:close"></span>
+            </button>
+        </div>
+        <div class="popup-box__title">Assigning admin permissions</div>
+        <div class="popup-box__msg mt-4">
+            <p>You are about to add admin permissions to another teacher's account.
+            Teachers with admin permissions will have the same permissions as you.
+            </p>
+            <p class="my-4"><strong>Do you wish to proceed?</strong></p>
+            <p><strong class="text-danger">Accepting means you understand class data will be shared.</strong></p>
+        </div>
+        <div class="popup-box__buttons justify-content-center">
+            <a id="cancel_admin_popup_button" class="button button--primary" onclick="hideMakeAdminTeacherPopup()" aria-labelledby="cancel_admin_popup_button">Cancel</a>
+            <a id="add_admin_button" class="button button--primary button--primary--danger button--icon"  onclick="" aria-labelledby="add_admin_button">
+                Add as admin <span class="iconify" data-icon="mdi:add"></span></a>
+        </div>
+    </div>
+</section>

portal/templates/portal/partials/popup.html

@@ -1,8 +1,13 @@
-{% load staticfiles %}
+{% load static %}
 {# A confirmation popup with Cancel and Confirm buttons. #}
 <section id="popup" class="popup-wrapper">
     <div class="popup-box">
-        <div class="popup-box__title"><h3></h3></div>
+        <div>
+            <button type="button" onclick="hidePopupConfirmation()" class="close popup-box__close" aria-label="Close">
+                <span class="iconify" data-icon="mdi:close"></span>
+            </button>
+        </div>
+        <div class="popup-box__title"></div>
         <div class="popup-box__msg"></div>
         <div class="popup-box__buttons">
             <a id="cancel_button" class="button button--small button--secondary button--secondary--dark" onclick="hidePopupConfirmation()" aria-labelledby="cancel_button"> Cancel </a>

portal/templates/portal/partials/register_newsletter_tickbox.html

@@ -2,8 +2,5 @@
     <div class="form__checkbox-input">
         {{ newsletter_ticked }}
     </div>
-    <p class="semi-bold">
-        Please confirm that you are happy for us to send you emails in the future. You can view our
-        <a href="{% url 'terms' %}">privacy policy</a> for more information.
-    </p>
-</div>
+    <p class="semi-bold">Sign up to receive updates about Code for Life games and teaching resources.</p>
+</div>

portal/templates/portal/partials/screentime_popup.html

@@ -0,0 +1,14 @@
+{% load static %}
+{# A screen-time warning popup with a Continue button. #}
+<section id="screentime-popup" class="popup-wrapper text-center">
+    <div class="popup-box">
+        <div class="popup-box__title flex-column justify-content-center">
+            <div><img width="100" src="{% static 'common/img/brain.svg' %}"/></div>
+            <div class="my-4">Time for a break?</div>
+        </div>
+        <div class="popup-box__msg">You have been using the Code for Life website for a while. Remember to take regular screen breaks to recharge those brain cells!</div>
+        <div class="popup-box__buttons mt-0">
+            <a id="screentime_continue_button" class='button button--primary' onclick="hideScreentimePopup()" aria-labelledby="screentime_continue_button"> Continue </a>
+        </div>
+    </div>
+</section>

portal/templates/portal/partials/service_unavailable_popup.html

@@ -0,0 +1,17 @@
+{% load static %}
+{# A screen-time warning popup with a Continue button. #}
+<section id="service-unavailable-popup" class="popup-wrapper">
+  <div class="popup-box">
+    <div class="popup-box__title flex-column justify-content-center">
+      <div class="popup-box__title">
+        <h5 class="mt-1"></h5>
+      </div>
+      <div class="popup-box__msg"></div>
+      <div class="popup-box__buttons mt-0">
+        <a id="screentime_continue_button"
+           class='button button--primary'
+           onclick="hideServiceUnavailable()"
+           aria-labelledby="screentime_continue_button">Confirm</a>
+      </div>
+    </div>
+  </section>

portal/templates/portal/partials/session_popup.html

@@ -0,0 +1,19 @@
+{% load static %}
+{# A session expiry warning popup with a "Wait, I'm still here!" button. #}
+<section id="session-popup" class="popup-wrapper text-center">
+    <div class="popup-box">
+        <div class="popup-box__title d-flex justify-content-center">
+            <h4>Where did you go? 👀</h4>
+        </div>
+        <p class="popup-box__msg">We noticed that you have been inactive for a while. Are you still there? For your
+        online safety we will log you out in:</p>
+        <div class="d-flex justify-content-center">
+            <h4><span id="minutes">2</span> min <span id="seconds">00</span> secs</h4>
+        </div>
+        <p class="popup-box__msg">You may lose progress unless you continue or save.</p>
+        <div class="popup-box__buttons mt-0">
+            <a id="session_continue_button" class="button button--primary" onclick="hideSessionPopup()"
+               aria-labelledby="session_continue_button">Wait, I'm still here!</a>
+        </div>
+    </div>
+</section>