codeforlife-portal 8.1.1__py2.py3-none-any.whl → 8.1.3__py2.py3-none-any.whl

cfl_common/setup.py

@@ -17,7 +17,7 @@ setup(
     version=version,
     include_package_data=True,
     install_requires=[
-        "django==4.2.17",
+        "django==4.2.18",
         "django-countries==7.6.1",
         "django-csp==3.8",
         "django-import-export==4.2.0",

{codeforlife_portal-8.1.1.dist-info → codeforlife_portal-8.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.1.1
+Version: 8.1.3
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -9,7 +9,7 @@ License-File: LICENSE.md
 Requires-Dist: django-recaptcha==4.0.0
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: importlib-metadata==4.13.0
-Requires-Dist: reportlab==3.6.13
+Requires-Dist: reportlab==4.2.5
 Requires-Dist: django-formtools==2.5.1
 Requires-Dist: django-otp==1.5.4
 Requires-Dist: requests==2.32.2

{codeforlife_portal-8.1.1.dist-info → codeforlife_portal-8.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/setup.py,sha256=0Bbnt2gvlq6PnI5wMZ3hPuccY-CtdKQIy5RSSmbja4U,978
+cfl_common/setup.py,sha256=T8DMxXoniOYHNZpgks4TvYvAt4lDnZxDHAwVBH-02iM,978
 cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
 cfl_common/common/app_settings.py,sha256=Bw1DXkZpNIdwUJ-cIOjZnngH5_NbMXC0koW7NgQ0pKY,2495
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
@@ -106,23 +106,23 @@ deploy/static/robots.txt,sha256=5cS4RITuQhbpNzvpk4AyDCXdlIBfmfCoBYRvCHY2VT8,24
 deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuwuivF8V2K1SgM,412
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example_project/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
-example_project/portal_test_settings.py,sha256=7Q7SdosA0Ba85qz-xkAe3EHyMPpSIQ61CSlwYL4uNog,7321
-example_project/settings.py,sha256=NjFhtDNLwdY5vhUAtqk9a9m3GRfcuWRVqIqnJ3u0o6E,5658
+example_project/portal_test_settings.py,sha256=_Xrz5gtfZvHLybXOWPJGVaoOvtMT9BATJV6V6Rj0hDo,7256
+example_project/settings.py,sha256=8eEzp2qS3xvHOO0gcZCP7deSa1BW-8sTIA23eKPm3vA,5593
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=8YlEPKK1Cm5T4dPa2BQPpPwVVTzjPLnmqAeNcTb5nOw,22
+portal/__init__.py,sha256=gnc1sclqzDLnQB9vbqA0LgSMz4H-bYCuu--_P-HWhAc,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
 portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
-portal/context_processors.py,sha256=Q68UhmArLPRchS2KmfVR4hKrijllXal3sO5cHYWC2Fc,222
+portal/context_processors.py,sha256=1TrUZqnMqGa5f7ERph9EpBqojSMJvOrcpnJzTdeCLDI,133
 portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/urls.py,sha256=_EJQ7XNVzeqN6g9pbtKg7DHZHlz31-HgWgft6_kOwXw,18415
+portal/urls.py,sha256=pNOIcaNPxoPqrnIvF2BR_Mz0vdPyvU_vcAveX1AXwbM,18072
 portal/wsgi.py,sha256=3yRcNxBQG30NhzrVi93bX-DrbXtsIQBc70HiW5wbOyE,401
 portal/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/forms/admin.py,sha256=Cdl8-wvasAzvMfgUlFYzQjYeuyC7gIsSiy8V_-jMp7w,2080
-portal/forms/dotmailer.py,sha256=j-o9qthQc7xmOsHSQGEEoHvaEyOpzlWrj6bOnV0PpsI,1567
+portal/forms/dotmailer.py,sha256=AiHoN8ZRl3A69FYSldkjlhICGx_l4BujP5HjYdSRCok,897
 portal/forms/error_messages.py,sha256=8d3z_3e2L-5zwj5hFhnUByC5k2CEpIVVuJg2nYkCUQ8,148
 portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1w,880
 portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
@@ -268,7 +268,7 @@ portal/static/portal/img/colorboxImages/loading_background.png,sha256=lZ7Mxrcb7-
 portal/static/portal/img/colorboxImages/overlay.png,sha256=qy73bf_q55z4kktuaTaMhVrxDzVRCIjgmBQ5cbOmLtE,182
 portal/static/portal/js/bootstrap.min.js,sha256=nuL8_2cJ5NDSSwnKD8VqreErSWHtnEP9E7AySL-1ev4,39680
 portal/static/portal/js/carouselCards.js,sha256=IByMjKk37E-TCc3vx9nfF-IJWl9BOFPNVqf4WuD75GI,778
-portal/static/portal/js/common.js,sha256=kVUdm0luaqMLElbDq3Mht1k5DfkYHXAmJtce1Rekogg,7554
+portal/static/portal/js/common.js,sha256=S39e0B75gycBQ2KEULPD-i-yZdM7vP-jvW3gIFTn5GU,6980
 portal/static/portal/js/independentLogin.js,sha256=wjjJBAF5arJ2iwW30lHTraG_f2FJ9UMGnXGpUSXwXIs,538
 portal/static/portal/js/independentRegistration.js,sha256=YWhIzwJcl0acU9weAKB7pWK76J1dpAuAQkI7DrUm3uA,2622
 portal/static/portal/js/join_create_game_toggle.js,sha256=eWxhMfzVKu1oft9iUFV4w8CgqMRv9-unb5P5cGi1h_4,393
@@ -395,19 +395,19 @@ portal/static/portal/sass/modules/_all.scss,sha256=k1U_FAKajqT8B3U53UT9B1Hc4jn5P
 portal/static/portal/sass/modules/_animation.scss,sha256=s75-4xRmPSmqwHUuyVy0OcnbS5jreRnotMXm-CuTLkE,39
 portal/static/portal/sass/modules/_breakpoints.scss,sha256=Nc7nrvjzQ0eK844ITuqwYcybIJxpYVFU5s30mz3BGOg,498
 portal/static/portal/sass/modules/_card_constants.scss,sha256=FUojcT5Fs-IYErt-frahD3HnVb06A515k4SQJrqVUfQ,107
-portal/static/portal/sass/modules/_colours.scss,sha256=Wen7UlF98ijyDjIEsLeIzLx0fcgXOLjavAVIh8PfqX0,4350
+portal/static/portal/sass/modules/_colours.scss,sha256=6Wz1ev8T0nDmftQBWzUiCvOcJUrbkqQTCTisfnb-0Go,4250
 portal/static/portal/sass/modules/_homepage_constants.scss,sha256=GfSppJtWNxufu4hKO6vHX7YBQgmU1oB0KBonh-ltgv0,44
 portal/static/portal/sass/modules/_levels.scss,sha256=-PrZ21k_-sQAxYZB0uJd7macz46-VVwsQdmtxYyZYnA,106
 portal/static/portal/sass/modules/_mixins.scss,sha256=8xDWuApUG6B3pjadB4iHpJ87ehXCg0qqpabnVd2cgxU,1987
 portal/static/portal/sass/modules/_spacing.scss,sha256=WHBcd8ZSl4UHqPAOmW_JLt_MOfww44Hj8W42dWOpTO8,31
 portal/static/portal/sass/partials/_banners.scss,sha256=Q13Mybarzkq0GWvhStiqIuK_bgKku8wkqC6qCFIruEg,5658
 portal/static/portal/sass/partials/_base.scss,sha256=cUvskrzNXLA-Xg1EgpL-S0wTWDnRn86AcdMbE2_aLMM,26
-portal/static/portal/sass/partials/_buttons.scss,sha256=UR0a6ne8nZQyyWlWzVDD5RG2vfVe8w9rM5yWLBav3qM,9572
+portal/static/portal/sass/partials/_buttons.scss,sha256=IoExpRV7Ng7wQ--jpOgnXC3D9SZqV95hM4bLEwNKNAw,8913
 portal/static/portal/sass/partials/_carousel.scss,sha256=m8N6jSuHBzeKyMUNGGc48NlNYTmotKlaiy10hwFnyWY,3500
 portal/static/portal/sass/partials/_footer.scss,sha256=oqt-Qvz7vtUFNnpe4FkQkaZk3J3fojCy9cKCxqGTWoM,2493
 portal/static/portal/sass/partials/_forms.scss,sha256=cbonSxhtfaHR-4R6i0u65AaIZRG_25C837CgZlLuwCI,7101
 portal/static/portal/sass/partials/_grids.scss,sha256=pnMQht5lZ65MRB-0_nl8yn655hlKC_oWCwZopillVwc,4968
-portal/static/portal/sass/partials/_header.scss,sha256=NmVmNasogxhrygApoqAY1KSmq_37eJROj0lstVr6MEY,7422
+portal/static/portal/sass/partials/_header.scss,sha256=P2Sb3dyJjiPCpzbNE83HYWomBPfak8wHTO-q5S-qyQA,7339
 portal/static/portal/sass/partials/_images.scss,sha256=Fro4a0VfLo6FyrvGk5yjsjzzGKWVdHeMFJiVC96C7vk,6213
 portal/static/portal/sass/partials/_popup.scss,sha256=GQ6Vtmj3vdOP4Hvsf8ZxKdEtuL8gqoClYpDgQ19kvnQ,2280
 portal/static/portal/sass/partials/_progress-bars.scss,sha256=cTyRa9WLeIE0rETmY58Rcyf-8O6JE3iDTa_jw3mk23g,144
@@ -435,9 +435,9 @@ portal/templates/email.txt,sha256=z3bkT2WnkCrVa1RLVbGd-pE81cLEHlZ_QowfbSQAOvg,19
 portal/templates/django_recaptcha/widget_v2_invisible.html,sha256=3t5JHgyr_so5FQEUtbq501kEjz80KYBOoVz3PuU1JOc,318
 portal/templates/django_recaptcha/includes/js_v2_invisible.html,sha256=QQnBzZBqdtPeJeYFOIihJM18YoSUWbsGjuoMy-5gxNM,1408
 portal/templates/portal/about.html,sha256=_iD0GCP6q3-XuZ2LC-9O0KYY-mKL6c9qk3O-NRRqsRM,10321
-portal/templates/portal/base.html,sha256=4xLACNgKmRQTdEsdNNGYhLzMozzYzWIIzk31HrLGBf0,12109
+portal/templates/portal/base.html,sha256=7fkLX5l48Puf63zlnhxdrD0utw8FwOAHCuXKvyijtuQ,11690
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
-portal/templates/portal/coding_club.html,sha256=CJS1dEKMQ70AQ9U05wTctmvXYJngs18qxbyzNJmkfHk,5449
+portal/templates/portal/coding_club.html,sha256=DhPSIhxxzo6w0v80jXKVo_fjZ_TKnv7_u5cQq0woW8Q,5324
 portal/templates/portal/contribute.html,sha256=UIC_N3Lun9wB_6jEra0wvlT9fDiiIeMby7_onXYo6k0,4176
 portal/templates/portal/dotmailer_consent_form.html,sha256=UDdizPoKYZGybr6z9nzDV4WPhJPa-S3bIKywvVgFrxg,918
 portal/templates/portal/email_invitation_sent.html,sha256=hAMzQXE3NFGnOsQlCGuo3Aps-vazSJb5BhAN7bWT48M,641
@@ -470,9 +470,8 @@ portal/templates/portal/partials/benefits.html,sha256=TZm4U_XimgivkPMjDXxxkV7PLf
 portal/templates/portal/partials/card_list.html,sha256=yHcp4oc0WRG9H6Ek871VCHbwYkDRcwQYbZ320gtsFn8,1550
 portal/templates/portal/partials/character_list.html,sha256=SnNFHzbIkOSaiRPIvSdplEf_B87UYgJ1pOvMltNDxLE,415
 portal/templates/portal/partials/delete_popup.html,sha256=nEhnwgnmKoFzb6LlCwdX973Em9bVOFh6MON36RPteYs,1275
-portal/templates/portal/partials/donate_popup.html,sha256=iPxXqIwZ-9_n4ssdUEiZ_GY3nbpes2AlcEKphL2Plno,2151
 portal/templates/portal/partials/footer.html,sha256=mJFsBJY1jfDUdujuceh0Y1bIXccIEWzbvEfsmNGl6D4,5036
-portal/templates/portal/partials/header.html,sha256=Qba01GARPeb5XAbZkWY__vA7D1LMFJ39085bLlOkaM0,20643
+portal/templates/portal/partials/header.html,sha256=aRFgTy5JSQTqXSGUo7XQWd3a4Ia4auvJl3D3iNgJhm0,20250
 portal/templates/portal/partials/headline.html,sha256=xKb-WtkT0FyQqT0smyNSKkXFvU7KQ5Czad8ca6YKQg4,89
 portal/templates/portal/partials/hero_card.html,sha256=UN5hyxrw-McuXFsDzPBIECB9yGrv9VjsFf8SEBowwXc,786
 portal/templates/portal/partials/info_popup.html,sha256=gzffd5MBVb7p2hGQuZMNDudThrRgs847hCu9ziT9uLE,566
@@ -538,7 +537,7 @@ portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,1381
 portal/tests/test_captcha_forms.py,sha256=Yn_VYO_6jbq6AeKeLcv-YFL1YwXZpU0C3y7SK8fRUm4,1033
 portal/tests/test_class.py,sha256=MfR8fRsi0XjqS5cbeV19y3Be2RVhOLUHsAy_mjm7P70,17644
 portal/tests/test_emails.py,sha256=pLr06j3uMBxP1raoZQWzUTBVFvsEDFtUh85J8OnqCwE,9238
-portal/tests/test_global_forms.py,sha256=A5JpAe4AYK-wpu0o1qU4THmeNv_wr7lhzaMbjz5czpY,1543
+portal/tests/test_global_forms.py,sha256=GIm_oSN4VsfaO--E2SMRu8CwVraan0UBj-_LE_tu8w0,833
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
 portal/tests/test_independent_student.py,sha256=NrRjTEr6V4WXpCE74N8LYNVocvLSvddkjuo3dYpfAZc,27245
 portal/tests/test_invite_teacher.py,sha256=gUe1spFp60v3i6kMqGoNgJd0OlBEcwplPPNYLomTJS4,12269
@@ -609,9 +608,9 @@ portal/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/about.py,sha256=-muXy17UhxCSKkjnMAkSLXiCvT_pBPlf2ykTYr794dI,443
 portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
-portal/views/dotmailer.py,sha256=x49p89TtwA1MLysRLtq5yRRzVtIpzGoU__Xb5hPuHak,3208
+portal/views/dotmailer.py,sha256=OH06IXuqqjhQbEie8g8y2ZY1oZvsCtNHhkQRLa-julg,2467
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
-portal/views/home.py,sha256=cKCby5xDYImMeJqNnrnfkDbb3tAcQX-lw6IgBS7RmR4,10050
+portal/views/home.py,sha256=8leK4ADxRg-gK-bm7D08CR44bhV3I8lt5pCV59HXMkk,9619
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
@@ -633,8 +632,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.1.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.1.1.dist-info/METADATA,sha256=e4FNA5qvh6-VVZ05ztRGRDfdcZARBc_U0XYDh1J3Pws,3078
-codeforlife_portal-8.1.1.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-codeforlife_portal-8.1.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.1.1.dist-info/RECORD,,
+codeforlife_portal-8.1.3.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.1.3.dist-info/METADATA,sha256=WDrFE-Tgdzw0QFNII4sEzxhnay313FCTlhPVMrByFes,3077
+codeforlife_portal-8.1.3.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+codeforlife_portal-8.1.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.1.3.dist-info/RECORD,,

example_project/portal_test_settings.py

@@ -172,7 +172,6 @@ TEMPLATES = [
                 "common.context_processors.module_name",
                 "common.context_processors.cookie_management_enabled",
                 "portal.context_processors.process_newsletter_form",
-                "portal.context_processors.process_donate_form",
             ]
         },
     }

example_project/settings.py

@@ -130,7 +130,6 @@ TEMPLATES = [
                 "common.context_processors.module_name",
                 "common.context_processors.cookie_management_enabled",
                 "portal.context_processors.process_newsletter_form",
-                "portal.context_processors.process_donate_form",
             ]
         }
     }

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.1.1"
+__version__ = "8.1.3"

portal/context_processors.py

@@ -1,9 +1,5 @@
-from portal.forms.dotmailer import DonateForm, NewsletterForm
+from portal.forms.dotmailer import NewsletterForm
 
 
 def process_newsletter_form(request):
     return {"news_form": NewsletterForm()}
-
-
-def process_donate_form(request):
-    return {"donate_form": DonateForm()}

portal/forms/dotmailer.py

@@ -19,28 +19,6 @@ class NewsletterForm(forms.Form):
     )
 
 
-class DonateForm(forms.Form):
-    email = forms.EmailField(
-        label="This data will only be used for this purpose and you will be "
-        "able to opt out anytime. Please read our privacy notice for "
-        "further details.",
-        label_suffix="",
-        widget=forms.EmailInput(
-            attrs={
-                "placeholder": "Enter your email address",
-                "id": "donate_email_field",
-            }
-        ),
-        help_text="Enter your email address",
-    )
-
-    age_verification = forms.BooleanField(
-        widget=forms.CheckboxInput(attrs={"id": "donate_age_verification"}),
-        initial=False,
-        required=True,
-    )
-
-
 class ConsentForm(forms.Form):
     email = forms.EmailField(
         label="Email",

portal/static/portal/js/common.js

@@ -38,24 +38,6 @@ function hidePopupConfirmation() {
   $("#popup").find(".popup-text").remove();
 }
 
-function showDonatePopup(title, text) {
-  let popup = $("#donate-popup");
-  popup.find(".popup-box__title").text(title);
-  popup.find(".popup-box__msg").append(text);
-
-  popup.addClass("popup--fade");
-}
-
-function hideDonatePopup() {
-  $("#donate-popup").removeClass("popup--fade");
-  $("#donate-popup").find(".popup-text").remove();
-  $("#donate_email_field").val("");
-  $('#donate_age_verification').prop("checked", false);
-  const donateSubmitButton = $('#confirm_donate_button');
-  donateSubmitButton.addClass("disabled");
-  donateSubmitButton.prop("disabled", true);
-}
-
 function showDonateConfirmation(path) {
   let title = "We would love to have you support our non-profit mission! ❤️";
   let text =

portal/static/portal/sass/modules/_colours.scss

@@ -63,9 +63,6 @@ $color-button-contained-disabled: $color-secondary-100;
 $color-button-outlined-border: $color-secondary-600;
 $color-button-outlined-border-active: $color-secondary-600;
 $color-button-subnav-border: white;
-$color-button-pill: #86ae18;
-$color-button-pill-hover: #82a210;
-$color-button-pill-active: #82a210;
 // Old buttons
 $color-button-primary-action-navigation: $color-secondary;
 $color-button-primary-action-navigation-hover: $color-secondary;

portal/static/portal/sass/partials/_buttons.scss

@@ -138,30 +138,6 @@ table {
   }
 }
 
-/* Green button */
-.button--tertiary {
-  @include _padding(10px, 15px, 10px, 15px);
-  background: $color-button-pill;
-  color: $color-text-secondary;
-
-  &:hover:not(.disabled){
-    @include material-shadow();
-    background: $color-button-pill-hover;
-    color: $color-text-secondary;
-    text-decoration: none;
-  }
-
-  &:active:not(.disabled) {
-    background: $color-button-pill-active;
-    color: $color-text-secondary;
-    box-shadow: none;
-  }
-}
-
-.button--pill {
-  @include _border-radius-all(20px);
-}
-
 .button-right-arrow {
   &:after {
     content: "\e5e1";
@@ -437,13 +413,6 @@ td .button--primary {
       justify-content: center;
     }
 
-    &.button--donate {
-      background: $color-button-pill;
-      border: 0;
-      color: $color-text-secondary;
-      justify-content: center;
-    }
-
     &.button--header--login {
       border: 2px solid $color-secondary-600;
       margin: 0;

portal/static/portal/sass/partials/_header.scss

@@ -265,11 +265,6 @@
       font-weight: normal;
     }
 
-    .button--pill:hover,
-    .button--pill:focus, {
-      font-weight: 600;
-    }
-
     .button--menu--secondary {
       @include _padding($spacing * 3, 0px, $spacing * 3, 0px);
     }

portal/templates/portal/base.html

@@ -81,7 +81,6 @@
         {% include "portal/tag_manager/tag_manager_body.html" %}
         {% render_block "js" %}
         {% include 'portal/mouseflow.html' %}
-        {% include "portal/partials/donate_popup.html" %}
         <div class="content-footer-wrapper">
             {% block contentWrapper %}
                 <div {% block pageID %}id="contentWrapper"{% endblock %}>
@@ -240,25 +239,16 @@
     });
             </script>
             <script>
-    // disable newsletter signup and donate buttons by default
+    // disable newsletter signup button by default
     const newsletterSubmitButton = $('#submit_newsletter');
     newsletterSubmitButton.addClass("disabled");
     newsletterSubmitButton.prop("disabled", true);
 
-    const donateSubmitButton = $('#confirm_donate_button');
-    donateSubmitButton.addClass("disabled");
-    donateSubmitButton.prop("disabled", true);
-
-    // enable them or disable them depending on age verification checkbox
+    // enable them or disable it depending on age verification checkbox
     $('#id_age_verification').on("click", function() {
         newsletterSubmitButton.prop("disabled", !this.checked);
         newsletterSubmitButton.toggleClass("disabled", !this.checked);
     });
-
-    $('#donate_age_verification').on("click", function() {
-        donateSubmitButton.prop("disabled", !this.checked);
-        donateSubmitButton.toggleClass("disabled", !this.checked);
-    })
             </script>
         {% endblock scripts %}
     </body>

portal/templates/portal/coding_club.html

@@ -46,12 +46,9 @@
                     </p>
                 </div>
                 <div>
-                    <form method="post", action="{% url 'download_student_pack' 3 %}" class="non-styled--form">
-                        {% csrf_token %}
-                        <button id="primary_pack" href="" type="submit" class="button button--primary button--icon">
-                            Download the Primary coding club pack<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
-                        </button>
-                    </form>
+                    <a id="primary_pack" download type="submit" class="button button--primary button--icon" href="https://code-for-life.gitbook.io/code-for-life-primary-club-resources">
+                        Download the Primary coding club pack<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
+                    </a>
                 </div>
             </div>
             <div class="col-sm-6 d-flex flex-column">
@@ -77,7 +74,7 @@
                     <h4 class="mt-0">Python coding club</h4>
                     <p>
                         Download your FREE coding club pack for students aged 12 and above.
-                        This pack is a fast paced introduction to Python. It is aimed at students already interested
+                        This pack is a fast-paced introduction to Python. It is aimed at students already interested
                         in learning coding, individuals looking to learn and run their own club, or adults wanting to
                         try coding out. It is designed to be used in face-to-face or online clubs.
                     </p>

portal/templates/portal/partials/header.html

@@ -57,7 +57,6 @@
                     <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 %}
-            <button onclick="showDonateConfirmation()" class="button--menu button--pill button--tertiary">Donate</button>
             {% else %}
                 {% if user|is_independent_student %}
                     <div class="menu--title">Independent</div>
@@ -104,7 +103,6 @@
             <div class="menu__left-side col-md-5">
                 <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>
-                <button id="donate" onclick="showDonateConfirmation()" class="button--menu button--pill button--tertiary">Donate</button>
         {% endif %}
         </div>
         {% if user|is_logged_in %}
@@ -241,8 +239,6 @@
         {% else %}
             <a class="button button--menu__item button--register"
               href="{% url 'register' %}">Register now</a>
-            <button onclick="showDonateConfirmation()"
-                    class="button--menu__item button--donate">Donate</button>
             <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">

portal/tests/test_global_forms.py

@@ -18,19 +18,3 @@ class TestGlobalForms(TestCase):
         response = client.post(url, data)
         messages = list(response.wsgi_request._messages)
         assert len([m for m in messages if "error" in m.tags]) == 1
-
-    def test_donate_signup_successful(self):
-        url = reverse("process_donate_form")
-        client = Client()
-        data = {"email": "valid_email@example.com", "age_verification": "on"}
-        response = client.post(url, data)
-        messages = list(response.wsgi_request._messages)
-        assert len([m for m in messages if m.tags == "success"]) == 1
-
-    def test_donate_signup_fail(self):
-        url = reverse("process_donate_form")
-        client = Client()
-        data = {"email": "invalid_email", "age_verification": "on"}
-        response = client.post(url, data)
-        messages = list(response.wsgi_request._messages)
-        assert len([m for m in messages if "error" in m.tags]) == 1

portal/urls.py

@@ -5,7 +5,6 @@ from django.views.generic import RedirectView
 from django.views.generic.base import TemplateView
 from django.views.i18n import JavaScriptCatalog
 from game.views.level import play_default_level
-from two_factor.urls import urlpatterns as tf_urls
 from two_factor.views import (
     BackupTokensView,
     ProfileView,
@@ -38,13 +37,11 @@ from portal.views.api import (
 )
 from portal.views.dotmailer import (
     dotmailer_consent_form,
-    process_donate_form,
     process_newsletter_form,
 )
 from portal.views.email import verify_email
 from portal.views.home import (
     coding_club,
-    download_student_pack,
     home,
     home_learning,
     logout_view,
@@ -281,9 +278,6 @@ urlpatterns = [
         process_newsletter_form,
         name="process_newsletter_form",
     ),
-    re_path(
-        r"^donate_signup/$", process_donate_form, name="process_donate_form"
-    ),
     re_path(r"^consent_form/$", dotmailer_consent_form, name="consent_form"),
     re_path(
         r"^verify_email/$",
@@ -527,11 +521,6 @@ urlpatterns = [
         ),
     ),
     re_path(r"^codingClub/$", coding_club, name="codingClub"),
-    re_path(
-        r"^codingClub/(?P<student_pack_type>[3-4])/",
-        download_student_pack,
-        name="download_student_pack",
-    ),
     re_path(
         r"^removeFakeAccounts/",
         RemoveFakeAccounts.as_view(),

portal/views/dotmailer.py

@@ -12,7 +12,7 @@ from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views.decorators.csrf import csrf_exempt
 
-from portal.forms.dotmailer import NewsletterForm, DonateForm, ConsentForm
+from portal.forms.dotmailer import NewsletterForm, ConsentForm
 
 
 @csrf_exempt
@@ -40,27 +40,6 @@ def process_newsletter_form(request):
     return HttpResponse(status=405)
 
 
-@csrf_exempt
-def process_donate_form(request):
-    if request.method == "POST":
-        donate_form = DonateForm(data=request.POST)
-        if donate_form.is_valid():
-            user_email = request.POST.get("email", "")
-            add_to_dotmailer("", "", user_email, address_book_ids["donors"])
-            messages.success(
-                request, "Thank you for registering your interest! 🎉"
-            )
-            return HttpResponseRedirect(reverse_lazy("home"))
-        messages.error(
-            request,
-            "Invalid email address. Please try again.",
-            extra_tags="sub-nav--warning",
-        )
-        return HttpResponseRedirect(reverse_lazy("home"))
-
-    return HttpResponse(status=405)
-
-
 def dotmailer_consent_form(request):
     if request.method == "POST":
         consent_form = ConsentForm(data=request.POST)

portal/views/home.py

@@ -2,8 +2,6 @@ import logging
 import math
 
 from common.helpers.emails import (
-    NOTIFICATION_EMAIL,
-    send_email,
     send_verification_email,
 )
 from common.mail import campaign_ids, send_dotdigital_email
@@ -16,7 +14,7 @@ from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import redirect, render
+from django.shortcuts import render
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.html import format_html
@@ -37,8 +35,6 @@ from portal.strings.ten_year_map import (
     TEN_YEAR_MAP_BANNER,
     TEN_YEAR_MAP_HEADLINE,
 )
-from portal.templatetags.app_tags import cloud_storage
-from portal.views.teacher.teach import count_student_pack_downloads_click
 
 LOGGER = logging.getLogger(__name__)
 
@@ -281,13 +277,6 @@ def coding_club(request):
     )
 
 
-def download_student_pack(request, student_pack_type):
-    if request.method == "POST":
-        count_student_pack_downloads_click(int(student_pack_type))
-        link = cloud_storage("club_packs/PrimaryCodingClub.zip")
-        return redirect(link)
-
-
 def home_learning(request):
     return render(
         request,

portal/templates/portal/partials/donate_popup.html

@@ -1,46 +0,0 @@
-{% load static %}
-{% load app_tags %}
-{# A popup with a form input for email addresses. #}
-<section id="donate-popup" class="popup-wrapper">
-    <div class="popup-box">
-        <div>
-            <button type="button" onclick="hideDonatePopup()" 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>
-        <form id="donate_form" action="{% url 'process_donate_form' %}"
-              method="post">
-            <div class="col-sm-12">
-                {{ donate_form.non_field_errors }}
-                <div class="form--row">
-                    <div class="form--row__input">
-                        <label><small>{{ donate_form.email.label }}</small></label>
-                        <div class="input--icon">
-                            {{ donate_form.email }}
-                            <span class="iconify" data-icon="mdi:email-outline"></span>
-                        </div>
-                        {{ donate_form.email.errors }}
-                        <small>{{ donate_form.email.help_text }}</small>
-                    </div>
-                </div>
-                <div class="form--row justify-content-between">
-                    <div class="form__checkbox">
-                        <div class="form__checkbox-input">
-                            {{ donate_form.age_verification }}
-                        </div>
-                        <p class="p-0">Please confirm that you are over 18.</p>
-                    </div>
-                </div>
-            </div>
-            <div class="popup-box__buttons">
-                <a class="button button--small button--secondary button--secondary--dark"
-                   onclick="hideDonatePopup()" aria-labelledby="cancel_button">Cancel</a>
-                <button type="submit" id="confirm_donate_button"
-                   class='button button--small button--primary'
-                        aria-labelledby="confirm_button">Confirm</button>
-            </div>
-        </form>
-    </div>
-</section>