codeforlife-portal 8.6.9__tar.gz → 8.6.10__tar.gz

{codeforlife_portal-8.6.9/codeforlife_portal.egg-info → codeforlife_portal-8.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.6.9
+Version: 8.6.10
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6"
-Requires-Dist: cfl-common==8.6.9
+Requires-Dist: cfl-common==8.6.10
 Requires-Dist: chardet==5.2.0; python_version >= "3.7"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
@@ -60,7 +60,7 @@ Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6" and extra == "dev"
-Requires-Dist: cfl-common==8.6.9; extra == "dev"
+Requires-Dist: cfl-common==8.6.10; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.1.8; python_version >= "3.7" and extra == "dev"
 Requires-Dist: coverage[toml]==7.8.0; python_version >= "3.9" and extra == "dev"

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.6.9
+Version: 8.6.10
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6"
-Requires-Dist: cfl-common==8.6.9
+Requires-Dist: cfl-common==8.6.10
 Requires-Dist: chardet==5.2.0; python_version >= "3.7"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
@@ -60,7 +60,7 @@ Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.4.26; python_version >= "3.6" and extra == "dev"
-Requires-Dist: cfl-common==8.6.9; extra == "dev"
+Requires-Dist: cfl-common==8.6.10; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.2; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.1.8; python_version >= "3.7" and extra == "dev"
 Requires-Dist: coverage[toml]==7.8.0; python_version >= "3.9" and extra == "dev"

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/codeforlife_portal.egg-info/SOURCES.txt

@@ -144,7 +144,6 @@ portal/static/portal/img/logo_python_den.svg
 portal/static/portal/img/long_europe_map.png
 portal/static/portal/img/mc_saatchi_logo.png
 portal/static/portal/img/nigel.png
-portal/static/portal/img/ocado-swirl.svg
 portal/static/portal/img/oval_blue.svg
 portal/static/portal/img/oval_pink.svg
 portal/static/portal/img/oval_yellow.svg

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/codeforlife_portal.egg-info/requires.txt

@@ -1,4 +1,4 @@
-cfl-common==8.6.9
+cfl-common==8.6.10
 django-countries==7.6.1
 django-csp==3.8
 django-preventconcurrentlogins==0.8.2
@@ -68,7 +68,7 @@ urllib3==2.4.0
 zipp==3.21.0
 
 [dev]
-cfl-common==8.6.9
+cfl-common==8.6.10
 django-countries==7.6.1
 django-csp==3.8
 django-selenium-clean==1.0.1

codeforlife_portal-8.6.10/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "8.6.10"

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/portal/static/portal/sass/partials/_images.scss

@@ -30,13 +30,6 @@ img {
   margin-top: 1.5em;
 }
 
-.background--swirl {
-  background-image: url("../img/ocado-swirl.svg");
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
 .image-row {
   align-items: baseline;
   display: flex;
@@ -70,7 +63,6 @@ img {
 
 .logo {
   @include _padding($spacing * 3, $spacing * 14, $spacing * 3, $spacing * 3);
-  content: url("../img/logo_cfl.png");
 }
 
 .map-pin {
@@ -386,53 +378,33 @@ img {
 }
 
 .educate-homepage {
-  content: url("../img/home_educate.png");
   width: 70%;
   object-fit: contain;
 }
 
 .play-homepage {
-  content: url("../img/home_play.png");
   width: 70%;
   object-fit: contain;
 }
 
-.oval-blue {
-  content: url("../img/oval_blue.svg");
-}
-
-.oval-pink {
-  content: url("../img/oval_pink.svg");
-}
-
-.oval-yellow {
-  content: url("../img/oval_yellow.svg");
-}
-
-.polygon-blue {
-  content: url("../img/polygon_blue.svg");
-}
-
-.polygon-pink {
-  content: url("../img/polygon_pink.svg");
-}
-
-.polygon-yellow {
-  content: url("../img/polygon_yellow.svg");
-}
-
 .login-shape-left {
-  @include _top(250px);
-  @include _margin(-250px, 0px, 0px, 0px);
+  @include _top(300px);
   position: relative;
   left: -17vw;
+
+  img {
+    @include _margin(-250px, 0px, 0px, 0px);
+  }
 }
 
 .login-shape-right {
-  @include _top(500px);
-  @include _margin(-500px, 0px, 0px, 0px);
+  @include _top(550px);
   position: relative;
   left: 17vw;
+
+  img {
+    @include _margin(-250px, 0px, 0px, 0px);
+  }
 }
 
 @media (max-width: $tablet-large-max-width) {

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/portal/templates/portal/form_shapes.html

@@ -10,16 +10,28 @@ other templates to add custom content. -->
 {% block content %}
 <section class="row mx-0">
 {% if usertype == "TEACHER" %}
-    <span class="oval-blue login-shape-left"></span>
-    <span class="polygon-yellow login-shape-right"></span>
+    <span class="login-shape-left">
+        <img src="{% static 'portal/img/oval_blue.svg' %}" alt="Blue oval">
+    </span>
+    <span class="login-shape-right">
+        <img src="{% static 'portal/img/polygon_yellow.svg' %}" alt="Yellow polygon">
+    </span>
     <div class="form--login is-flex form--register--teacher">
 {% elif usertype == "SCHOOL_STUDENT" %}
-    <span class="oval-yellow login-shape-left"></span>
-    <span class="polygon-pink login-shape-right"></span>
+    <span class="login-shape-left">
+        <img src="{% static 'portal/img/oval_yellow.svg' %}" alt="Yellow oval">
+    </span>
+    <span class="login-shape-right">
+        <img src="{% static 'portal/img/polygon_pink.svg' %}" alt="Pink polygon">
+    </span>
     <div class="form--login is-flex form--register--student">
 {% else %}
-    <span class="oval-pink login-shape-left"></span>
-    <span class="polygon-blue login-shape-right"></span>
+    <span class="login-shape-left">
+        <img src="{% static 'portal/img/oval_pink.svg' %}" alt="Pink oval">
+    </span>
+    <span class="login-shape-right">
+        <img src="{% static 'portal/img/polygon_blue.svg' %}" alt="Blue polygon">
+    </span>
     <div class="form--login is-flex form--register--indep-student">
 {% endif %}
         <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/portal/templates/portal/home.html

@@ -9,9 +9,12 @@
     <div class="banner--homepage banner--homepage--teacher col-sm-6">
         <div class="banner col-sm-11">
             <div class="banner__item">
-                <a href="{% url 'teach' %}" class="educate-homepage"
-                alt="Male teacher helping young female student"
-                ></a>
+                <a href="{% url 'teach' %}">
+                    <img src="{% static 'portal/img/home_educate.png' %}" class="educate-homepage"
+                         alt="Male teacher helping young female student"
+                         title="Male teacher helping young female student"
+                    >
+                </a>
             </div>
             <div class="banner-home-content">
                 <div class="banner-home-text">
@@ -29,9 +32,12 @@
     <div class="banner--homepage banner--homepage--student col-sm-6">
         <div class="banner col-sm-11">
             <div class="banner__item">
-                <a href="{% url 'play' %}" class="play-homepage"
-                alt="Two young boys playing on a laptop"
-                ></a>
+                <a href="{% url 'play' %}">
+                    <img src="{% static 'portal/img/home_play.png' %}" class="play-homepage"
+                         alt="Two young boys playing on a laptop"
+                         title="Two young boys playing on a laptop"
+                    >
+                </a>
             </div>
             <div class="banner-home-content">
                 <div class="banner-home-text">

{codeforlife_portal-8.6.9 → codeforlife_portal-8.6.10}/portal/templates/portal/login/teacher.html

@@ -20,8 +20,12 @@
 
 {% if wizard.steps.current == 'auth' %}
     <section class="row mx-0">
-        <span class="oval-blue login-shape-left"></span>
-        <span class="polygon-yellow login-shape-right"></span>
+        <span class="login-shape-left">
+            <img src="{% static 'portal/img/oval_blue.svg' %}" alt="Blue oval">
+        </span>
+        <span class="login-shape-right">
+            <img src="{% static 'portal/img/polygon_yellow.svg' %}" alt="Yellow polygon">
+        </span>
         <div class="form--login is-flex form--register--teacher">
             <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
                 <h4 class="center-block">Welcome</h4>

codeforlife_portal-8.6.10/portal/templates/two_factor/core/login.html

@@ -0,0 +1,75 @@
+{# Overriden the original "two_factor" template to remove extending base template and slightly adjust style #}
+
+{% load i18n %}
+{% load static %}
+{% load two_factor_tags %}
+
+{% block extra_media %}
+{{ form.media }}
+{% endblock %}
+
+{% block content %}
+
+<section class="row mx-0">
+    <span class="login-shape-left">
+        <img src="{% static 'portal/img/oval_blue.svg' %}" alt="Blue oval">
+    </span>
+    <span class="login-shape-right">
+        <img src="{% static 'portal/img/polygon_yellow.svg' %}" alt="Yellow polygon">
+    </span>
+    <div class="form--login is-flex form--register--teacher">
+        <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
+            <h4>{% block title %}{% trans "Welcome" %}{% endblock %}</h4>
+
+            {% if wizard.steps.current == 'auth' %}
+            <p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
+            {% elif wizard.steps.current == 'token' %}
+            <p>{{ device|as_verbose_action }}</p>
+            {% elif wizard.steps.current == 'backup' %}
+            <p>{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
+                These tokens have been generated for you to print and keep safe. Please
+                enter one of these backup tokens to log into your account.{% endblocktrans %}</p>
+            {% endif %}
+
+            <form action="" method="post">
+                {% block main_form_content %}
+                {% csrf_token %}
+                {% include "two_factor/_wizard_forms.html" %}
+
+                {# hidden submit button to enable [enter] key #}
+                <input type="submit" value="" hidden />
+
+                {% if other_devices %}
+                <p>{% trans "Or, alternatively, use one of your other authentication methods:" %}</p>
+                <p>
+                    {% for other in other_devices %}
+                    <button name="challenge_device" value="{{ other.persistent_id }}"
+                            class="btn btn-secondary btn-block" type="submit">
+                        {{ other|as_action }}
+                    </button>
+                    {% endfor %}</p>
+                {% endif %}
+
+                {% include "two_factor/_wizard_actions.html" %}
+                {% endblock %}
+            </form>
+
+            {% block 'backup_tokens' %}
+            {% if backup_tokens %}
+            <hr>
+            <div class="backup_tokens_form">
+                <form action="" method="post">
+                    {% csrf_token %}
+                    <p>{% trans "As a last resort, you can use a backup token:" %}</p>
+                    <p>
+                        <button name="wizard_goto_step" type="submit" value="backup"
+                                class="button button--primary">{% trans "Use Backup Token" %}</button>
+                    </p>
+                </form>
+            </div>
+            {% endif %}
+            {% endblock %}
+        </div>
+    </div>
+</section>
+{% endblock %}

codeforlife_portal-8.6.9/portal/__init__.py

@@ -1 +0,0 @@
-__version__ = "8.6.9"

codeforlife_portal-8.6.9/portal/static/portal/img/ocado-swirl.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="670px" height="670px" viewBox="0 0 670 670" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>ocado-swirl</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <polygon id="path-1" points="5.17780764e-14 0 670 0 670 670 0 670"></polygon>
-    </defs>
-    <g id="Play-landing-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="AIMMO-Prototype-landing---L-Desktops" transform="translate(-566.000000, -1829.000000)">
-            <g id="Deliver-through-time-Copy" transform="translate(0.000000, 1829.000000)">
-                <g id="ocado-swirl" transform="translate(566.000000, 0.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <g id="Clip-2"></g>
-                    <path d="M658.260758,254.973547 C674.312291,312.597644 673.719847,369.91571 657.606601,427.057142 C614.658514,579.343237 470.873555,679.663717 310.541302,669.260735 C156.532567,659.268533 27.1699201,539.8612 3.90825914,386.229804 C-28.5815422,171.653161 145.926171,-15.4115496 362.664044,1.00523855 C421.599894,5.46835385 477.814203,18.1573213 528.562804,49.3950207 C579.57677,80.7970316 617.72359,122.756066 631.654256,182.735982 C654.510668,281.150447 570.864961,412.905801 427.11703,374.563676 C370.388446,359.432627 332.965724,305.567159 334.165012,247.189282 C335.341672,189.838353 374.768007,138.897632 428.873791,125.00919 C446.291238,120.537859 463.73954,119.673169 479.651191,124.787369 C472.920367,137.546169 463.840338,149.321153 460.263045,162.576996 C450.370462,199.222602 471.498913,234.781698 507.712061,246.16028 C543.176426,257.304718 580.146586,238.480764 594.317932,201.288821 C605.61757,171.634676 600.09632,143.516844 583.246632,117.572034 C561.624478,84.2804387 528.931024,66.8942118 491.901208,55.983918 C363.661736,18.1983992 220.981439,115.8406 238.084149,280.285757 C249.902176,393.925751 356.017561,459.58058 441.267805,460.679414 C542.250732,461.981584 635.392002,386.601559 653.712515,287.460014 C655.697614,276.71814 656.767305,265.805792 658.260758,254.973547" id="Fill-1" fill="#F0F0F0" opacity="0.468353714" mask="url(#mask-2)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

codeforlife_portal-8.6.9/portal/templates/two_factor/core/login.html

@@ -1,70 +0,0 @@
-{# Overriden the original "two_factor" template to remove extending base template and slightly adjust style #}
-
-{% load i18n %}
-{% load two_factor_tags %}
-
-{% block extra_media %}
-{{ form.media }}
-{% endblock %}
-
-{% block content %}
-
-<section class="row mx-0">
-  <span class="oval-blue login-shape-left"></span>
-  <span class="polygon-yellow login-shape-right"></span>
-  <div class="form--login is-flex form--register--teacher">
-    <div class="form col-xs-12 col-sm-8 col-md-8 col-lg-9 center-block">
-      <h4>{% block title %}{% trans "Welcome" %}{% endblock %}</h4>
-
-{% if wizard.steps.current == 'auth' %}
-<p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
-{% elif wizard.steps.current == 'token' %}
-<p>{{ device|as_verbose_action }}</p>
-{% elif wizard.steps.current == 'backup' %}
-<p>{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
-  These tokens have been generated for you to print and keep safe. Please
-  enter one of these backup tokens to log into your account.{% endblocktrans %}</p>
-{% endif %}
-
-<form action="" method="post">
-  {% block main_form_content %}
-  {% csrf_token %}
-  {% include "two_factor/_wizard_forms.html" %}
-
-  {# hidden submit button to enable [enter] key #}
-  <input type="submit" value="" hidden />
-
-  {% if other_devices %}
-  <p>{% trans "Or, alternatively, use one of your other authentication methods:" %}</p>
-  <p>
-    {% for other in other_devices %}
-    <button name="challenge_device" value="{{ other.persistent_id }}"
-            class="btn btn-secondary btn-block" type="submit">
-      {{ other|as_action }}
-    </button>
-    {% endfor %}</p>
-  {% endif %}
-
-  {% include "two_factor/_wizard_actions.html" %}
-  {% endblock %}
-</form>
-
-{% block 'backup_tokens' %}
-{% if backup_tokens %}
-<hr>
-<div class="backup_tokens_form">
-  <form action="" method="post">
-    {% csrf_token %}
-    <p>{% trans "As a last resort, you can use a backup token:" %}</p>
-    <p>
-      <button name="wizard_goto_step" type="submit" value="backup"
-              class="button button--primary">{% trans "Use Backup Token" %}</button>
-    </p>
-  </form>
-</div>
-    </div>
-  </div>
-</section>
-{% endif %}
-{% endblock %}
-{% endblock %}