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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (391) hide show
  1. cfl_common/common/__init__.py +1 -0
  2. cfl_common/common/app_settings.py +66 -0
  3. cfl_common/common/apps.py +6 -0
  4. cfl_common/common/context_processors.py +9 -0
  5. cfl_common/common/csp_config.py +85 -0
  6. cfl_common/common/helpers/__init__.py +0 -0
  7. cfl_common/common/helpers/data_migration_loader.py +42 -0
  8. cfl_common/common/helpers/emails.py +393 -0
  9. cfl_common/common/helpers/generators.py +52 -0
  10. cfl_common/common/helpers/organisation.py +10 -0
  11. cfl_common/common/mail.py +201 -0
  12. cfl_common/common/migrations/0001_initial.py +240 -0
  13. cfl_common/common/migrations/0002_emailverification.py +55 -0
  14. cfl_common/common/migrations/0003_aimmocharacter.py +31 -0
  15. cfl_common/common/migrations/0004_add_aimmocharacters.py +17 -0
  16. cfl_common/common/migrations/0005_add_worksheets.py +8 -0
  17. cfl_common/common/migrations/0006_update_aimmo_character_image_path.py +17 -0
  18. cfl_common/common/migrations/0007_add_pdf_names_to_first_two_worksheets.py +8 -0
  19. cfl_common/common/migrations/0008_unlock_worksheet_3.py +11 -0
  20. cfl_common/common/migrations/0009_add_blocked_time_to_teacher_and_student.py +24 -0
  21. cfl_common/common/migrations/0010_remove_teacher_title.py +18 -0
  22. cfl_common/common/migrations/0011_student_login_id.py +18 -0
  23. cfl_common/common/migrations/0012_usersession.py +39 -0
  24. cfl_common/common/migrations/0013_class_school.py +42 -0
  25. cfl_common/common/migrations/0014_login_type.py +29 -0
  26. cfl_common/common/migrations/0015_dailyactivity.py +31 -0
  27. cfl_common/common/migrations/0016_joinreleasestudent.py +42 -0
  28. cfl_common/common/migrations/0017_copy_email_to_username.py +18 -0
  29. cfl_common/common/migrations/0018_update_aimmo_character_image_path.py +15 -0
  30. cfl_common/common/migrations/0019_aimmocharacter_alt.py +16 -0
  31. cfl_common/common/migrations/0020_class_is_active_and_null_access_code.py +23 -0
  32. cfl_common/common/migrations/0021_school_is_active.py +28 -0
  33. cfl_common/common/migrations/0022_school_cleanup.py +29 -0
  34. cfl_common/common/migrations/0023_userprofile_aimmo_badges.py +22 -0
  35. cfl_common/common/migrations/0024_teacher_invited_by.py +25 -0
  36. cfl_common/common/migrations/0025_schoolteacherinvitation.py +47 -0
  37. cfl_common/common/migrations/0026_teacher_remove_join_request.py +22 -0
  38. cfl_common/common/migrations/0027_class_created_by.py +25 -0
  39. cfl_common/common/migrations/0028_coding_club_downloads.py +23 -0
  40. cfl_common/common/migrations/0029_dynamicelement.py +22 -0
  41. cfl_common/common/migrations/0030_add_maintenance_banner.py +25 -0
  42. cfl_common/common/migrations/0031_improve_admin_panel.py +56 -0
  43. cfl_common/common/migrations/0032_dailyactivity_level_control_submits.py +18 -0
  44. cfl_common/common/migrations/0033_password_reset_tracking_fields.py +23 -0
  45. cfl_common/common/migrations/0034_dailyactivity_daily_school_student_lockout_reset.py +18 -0
  46. cfl_common/common/migrations/0035_rename_lockout_fields.py +27 -0
  47. cfl_common/common/migrations/0036_rename_awaiting_email_verification_userprofile_is_verified.py +17 -0
  48. cfl_common/common/migrations/0037_migrate_email_verification.py +21 -0
  49. cfl_common/common/migrations/0038_delete_emailverification.py +16 -0
  50. cfl_common/common/migrations/0039_copy_email_to_username.py +18 -0
  51. cfl_common/common/migrations/0040_school_county.py +18 -0
  52. cfl_common/common/migrations/0041_populate_gb_counties.py +27 -0
  53. cfl_common/common/migrations/0042_totalactivity.py +25 -0
  54. cfl_common/common/migrations/0043_add_total_activity.py +30 -0
  55. cfl_common/common/migrations/0044_update_activity_models.py +33 -0
  56. cfl_common/common/migrations/0045_otp.py +23 -0
  57. cfl_common/common/migrations/0046_alter_school_country.py +19 -0
  58. cfl_common/common/migrations/0047_delete_school_postcode.py +16 -0
  59. cfl_common/common/migrations/0048_unique_school_names.py +42 -0
  60. cfl_common/common/migrations/0049_anonymise_orphan_users.py +29 -0
  61. cfl_common/common/migrations/0050_anonymise_orphan_schools.py +30 -0
  62. cfl_common/common/migrations/0051_verify_returning_users.py +26 -0
  63. cfl_common/common/migrations/0052_add_cse_fields.py +68 -0
  64. cfl_common/common/migrations/0053_clean_class_data.py +24 -0
  65. cfl_common/common/migrations/0054_delete_aimmo_models.py +20 -0
  66. cfl_common/common/migrations/0055_alter_schoolteacherinvitation_token.py +18 -0
  67. cfl_common/common/migrations/0056_set_non_school_teachers_as_non_admins.py +25 -0
  68. cfl_common/common/migrations/0057_teacher_teacher__is_admin.py +19 -0
  69. cfl_common/common/migrations/0058_userprofile_google_refresh_token_and_more.py +24 -0
  70. cfl_common/common/migrations/__init__.py +0 -0
  71. cfl_common/common/models.py +557 -0
  72. cfl_common/common/permissions.py +84 -0
  73. cfl_common/common/tests/__init__.py +0 -0
  74. cfl_common/common/tests/test_migration_anonymise_orphan_schools.py +30 -0
  75. cfl_common/common/tests/test_migration_anonymise_orphan_users.py +30 -0
  76. cfl_common/common/tests/test_migration_blocked_time.py +15 -0
  77. cfl_common/common/tests/test_migration_remove_teacher_title.py +13 -0
  78. cfl_common/common/tests/test_migration_unique_school_names.py +33 -0
  79. cfl_common/common/tests/test_migration_verify_returning_users.py +59 -0
  80. cfl_common/common/tests/test_models.py +87 -0
  81. cfl_common/common/tests/utils/__init__.py +0 -0
  82. cfl_common/common/tests/utils/classes.py +38 -0
  83. cfl_common/common/tests/utils/email.py +67 -0
  84. cfl_common/common/tests/utils/organisation.py +41 -0
  85. cfl_common/common/tests/utils/student.py +123 -0
  86. cfl_common/common/tests/utils/teacher.py +73 -0
  87. cfl_common/common/tests/utils/user.py +27 -0
  88. cfl_common/common/utils.py +56 -0
  89. cfl_common/setup.py +61 -0
  90. codeforlife_portal-8.9.9.dist-info/METADATA +226 -0
  91. {codeforlife_portal-5.33.5.dist-info → codeforlife_portal-8.9.9.dist-info}/RECORD +339 -241
  92. {codeforlife_portal-5.33.5.dist-info → codeforlife_portal-8.9.9.dist-info}/WHEEL +1 -1
  93. codeforlife_portal-8.9.9.dist-info/licenses/LICENSE.md +3 -0
  94. {codeforlife_portal-5.33.5.dist-info → codeforlife_portal-8.9.9.dist-info}/top_level.txt +1 -0
  95. deploy/middleware/maintenance.py +25 -0
  96. deploy/middleware/screentime_warning.py +29 -0
  97. deploy/middleware/security.py +5 -6
  98. deploy/middleware/session_timeout.py +4 -2
  99. deploy/middleware/tmp_basic_auth.py +41 -0
  100. example_project/portal_test_settings.py +239 -0
  101. example_project/settings.py +156 -17
  102. example_project/urls.py +5 -6
  103. portal/__init__.py +1 -1
  104. portal/admin.py +142 -29
  105. portal/app_settings.py +8 -7
  106. portal/forms/dotmailer.py +6 -4
  107. portal/forms/invite_teacher.py +19 -10
  108. portal/forms/organisation.py +137 -68
  109. portal/forms/play.py +53 -98
  110. portal/forms/registration.py +70 -164
  111. portal/forms/teach.py +147 -121
  112. portal/handlers.py +1 -2
  113. portal/helpers/decorators.py +30 -10
  114. portal/helpers/password.py +86 -47
  115. portal/helpers/ratelimit.py +32 -15
  116. portal/helpers/regexes.py +5 -0
  117. portal/helpers/request_handlers.py +10 -0
  118. portal/migrations/0044_auto_20150430_0959.py +6 -2
  119. portal/mixins/__init__.py +1 -0
  120. portal/mixins/cron_mixin.py +12 -0
  121. portal/permissions/__init__.py +1 -0
  122. portal/permissions/is_cron_request_from_google.py +14 -0
  123. portal/static/portal/img/10_years_anniversary.png +0 -0
  124. portal/static/portal/img/RR_logo_grass_background.png +0 -0
  125. portal/static/portal/img/coding_club_hero.jpg +0 -0
  126. portal/static/portal/img/coding_club_python_pack.png +0 -0
  127. portal/static/portal/img/facebook.png +0 -0
  128. portal/static/portal/img/gitbook.png +0 -0
  129. portal/static/portal/img/howe_dell_1.png +0 -0
  130. portal/static/portal/img/howe_dell_2.png +0 -0
  131. portal/static/portal/img/howe_dell_3.png +0 -0
  132. portal/static/portal/img/logo_cfl.png +0 -0
  133. portal/static/portal/img/logo_cfl_powered.svg +35 -0
  134. portal/static/portal/img/logo_cfl_reminder_cards.jpg +0 -0
  135. portal/static/portal/img/logo_ocado_group.png +0 -0
  136. portal/static/portal/img/logo_python_den.svg +21 -0
  137. portal/static/portal/img/long_europe_map.png +0 -0
  138. portal/static/portal/img/python_den.png +0 -0
  139. portal/static/portal/img/python_den_banner.svg +26 -0
  140. portal/static/portal/img/rapid_router_landing_hero.png +0 -0
  141. portal/static/portal/img/rr_advanced.png +0 -0
  142. portal/static/portal/img/ten_year_map_pin.svg +1 -0
  143. portal/static/portal/img/thumbnail_educate_rapid_router.png +0 -0
  144. portal/static/portal/img/thumbnail_educate_resources.png +0 -0
  145. portal/static/portal/img/thumbnail_play_rapid_router.png +0 -0
  146. portal/static/portal/img/thumbnail_python_den.png +0 -0
  147. portal/static/portal/img/twitter.png +0 -0
  148. portal/static/portal/js/carouselCards.js +25 -0
  149. portal/static/portal/js/common.js +96 -1
  150. portal/static/portal/js/independentLogin.js +16 -0
  151. portal/static/portal/js/independentRegistration.js +86 -0
  152. portal/static/portal/js/levelControl.js +77 -0
  153. portal/static/portal/js/lib/jquery.min.js +2 -0
  154. portal/static/portal/js/organisation_manage.js +142 -14
  155. portal/static/portal/js/passwordStrength.js +154 -64
  156. portal/static/portal/js/resetPassword.js +23 -0
  157. portal/static/portal/js/riveted.min.js +238 -239
  158. portal/static/portal/js/school.js +13 -0
  159. portal/static/portal/js/studentLogin.js +16 -0
  160. portal/static/portal/js/teacherEditStudent.js +23 -0
  161. portal/static/portal/js/teacherLogin.js +16 -0
  162. portal/static/portal/js/tenYearMap.js +14 -0
  163. portal/static/portal/sass/colorbox.scss +0 -1
  164. portal/static/portal/sass/modules/_colours.scss +1 -0
  165. portal/static/portal/sass/modules/_levels.scss +1 -1
  166. portal/static/portal/sass/modules/_mixins.scss +21 -0
  167. portal/static/portal/sass/partials/_banners.scss +4 -177
  168. portal/static/portal/sass/partials/_buttons.scss +12 -15
  169. portal/static/portal/sass/partials/_carousel.scss +129 -0
  170. portal/static/portal/sass/partials/_footer.scss +21 -22
  171. portal/static/portal/sass/partials/_forms.scss +60 -5
  172. portal/static/portal/sass/partials/_grids.scss +34 -61
  173. portal/static/portal/sass/partials/_header.scss +28 -20
  174. portal/static/portal/sass/partials/_images.scss +292 -39
  175. portal/static/portal/sass/partials/_popup.scss +18 -15
  176. portal/static/portal/sass/partials/_tables.scss +12 -20
  177. portal/static/portal/sass/partials/_text.scss +6 -10
  178. portal/static/portal/sass/styles.scss +0 -1
  179. portal/static/portal/video/code for life .pdf +0 -0
  180. portal/strings/about.py +5 -0
  181. portal/strings/coding_club.py +9 -0
  182. portal/strings/play.py +6 -5
  183. portal/strings/teach.py +1 -1
  184. portal/strings/teacher_resources.py +2 -8
  185. portal/strings/ten_year_map.py +13 -0
  186. portal/templates/403.html +2 -2
  187. portal/templates/404.html +1 -1
  188. portal/templates/500.html +2 -2
  189. portal/templates/{captcha → django_recaptcha}/includes/js_v2_invisible.html +3 -3
  190. portal/templates/{captcha → django_recaptcha}/widget_v2_invisible.html +2 -2
  191. portal/templates/email.html +4 -2
  192. portal/templates/maintenance.html +34 -0
  193. portal/templates/portal/about.html +94 -62
  194. portal/templates/portal/base.html +176 -152
  195. portal/templates/portal/coding_club.html +100 -0
  196. portal/templates/portal/contribute.html +56 -52
  197. portal/templates/portal/email_invitation_sent.html +1 -1
  198. portal/templates/portal/email_style_template.html +374 -0
  199. portal/templates/portal/email_verification_failed.html +1 -1
  200. portal/templates/portal/email_verification_needed.html +9 -9
  201. portal/templates/portal/form_shapes.html +20 -8
  202. portal/templates/portal/getinvolved.html +6 -6
  203. portal/templates/portal/home.html +35 -10
  204. portal/templates/portal/home_learning.html +19 -19
  205. portal/templates/portal/locked_out.html +0 -1
  206. portal/templates/portal/locked_out_school_student.html +16 -0
  207. portal/templates/portal/login/independent_student.html +31 -15
  208. portal/templates/portal/login/student.html +10 -7
  209. portal/templates/portal/login/student_class_code.html +7 -4
  210. portal/templates/portal/login/teacher.html +34 -17
  211. portal/templates/portal/partials/banner.html +18 -4
  212. portal/templates/portal/partials/benefits.html +1 -1
  213. portal/templates/portal/partials/card_list.html +34 -24
  214. portal/templates/portal/partials/character_list.html +5 -5
  215. portal/templates/portal/partials/cookie_list.html +161 -0
  216. portal/templates/portal/partials/delete_popup.html +18 -0
  217. portal/templates/portal/partials/footer.html +57 -26
  218. portal/templates/portal/partials/header.html +118 -117
  219. portal/templates/portal/partials/hero_card.html +4 -3
  220. portal/templates/portal/partials/info_popup.html +3 -3
  221. portal/templates/portal/partials/invite_admin_teacher.html +23 -0
  222. portal/templates/portal/partials/popup.html +7 -2
  223. portal/templates/portal/partials/register_newsletter_tickbox.html +2 -5
  224. portal/templates/portal/partials/screentime_popup.html +14 -0
  225. portal/templates/portal/partials/service_unavailable_popup.html +17 -0
  226. portal/templates/portal/partials/session_popup.html +19 -0
  227. portal/templates/portal/play/student_dashboard.html +42 -29
  228. portal/templates/portal/play/student_edit_account.html +64 -9
  229. portal/templates/portal/play.html +61 -41
  230. portal/templates/portal/privacy_notice.html +697 -0
  231. portal/templates/portal/register.html +122 -92
  232. portal/templates/portal/reset_password.html +20 -40
  233. portal/templates/portal/reset_password_confirm.html +9 -4
  234. portal/templates/portal/reset_password_email_sent.html +15 -13
  235. portal/templates/portal/teach/base_registering.html +1 -1
  236. portal/templates/portal/teach/class.html +4 -6
  237. portal/templates/portal/teach/dashboard.html +212 -117
  238. portal/templates/portal/teach/invited.html +90 -0
  239. portal/templates/portal/teach/onboarding_classes.html +5 -3
  240. portal/templates/portal/teach/onboarding_print.html +1 -1
  241. portal/templates/portal/teach/onboarding_school.html +26 -139
  242. portal/templates/portal/teach/onboarding_students.html +1 -1
  243. portal/templates/portal/teach/teacher_dismiss_students.html +73 -55
  244. portal/templates/portal/teach/teacher_edit_class.html +168 -11
  245. portal/templates/portal/teach/teacher_edit_student.html +12 -5
  246. portal/templates/portal/teach/teacher_move_all_classes.html +25 -38
  247. portal/templates/portal/teach/teacher_move_students_to_class.html +1 -1
  248. portal/templates/portal/teach.html +61 -42
  249. portal/templates/portal/ten_year_map.html +147 -0
  250. portal/templates/portal/terms.html +191 -42
  251. portal/templates/two_factor/core/login.html +71 -59
  252. portal/templates/two_factor/core/setup.html +58 -49
  253. portal/templates/two_factor/profile/disable.html +1 -1
  254. portal/templates/two_factor/profile/profile.html +35 -17
  255. portal/templatetags/app_tags.py +59 -84
  256. portal/templatetags/card_list_tags.py +0 -4
  257. portal/tests/base_test.py +14 -3
  258. portal/tests/conftest.py +0 -15
  259. portal/tests/migrations/test_migration_make_portaladmin_teacher.py +2 -6
  260. portal/tests/migrations/test_migration_preview_users.py +3 -9
  261. portal/tests/migrations/test_migration_remove_guardian.py +1 -3
  262. portal/tests/migrations/test_migration_use_common_models.py +2 -6
  263. portal/tests/migrations/test_migration_verify_portaladmin.py +1 -3
  264. portal/tests/pageObjects/portal/admin/admin_base_page.py +0 -21
  265. portal/tests/pageObjects/portal/base_page.py +16 -26
  266. portal/tests/pageObjects/portal/email_verification_needed_page.py +3 -2
  267. portal/tests/pageObjects/portal/game_page.py +12 -19
  268. portal/tests/pageObjects/portal/home_page.py +13 -15
  269. portal/tests/pageObjects/portal/independent_login_page.py +13 -17
  270. portal/tests/pageObjects/portal/password_reset_form_page.py +20 -4
  271. portal/tests/pageObjects/portal/password_reset_page.py +25 -0
  272. portal/tests/pageObjects/portal/play/account_page.py +18 -27
  273. portal/tests/pageObjects/portal/play/dashboard_page.py +4 -4
  274. portal/tests/pageObjects/portal/play/join_school_or_club_page.py +8 -10
  275. portal/tests/pageObjects/portal/play/play_base_page.py +5 -3
  276. portal/tests/pageObjects/portal/signup_page.py +28 -59
  277. portal/tests/pageObjects/portal/student_login_class_code.py +6 -9
  278. portal/tests/pageObjects/portal/student_login_page.py +6 -8
  279. portal/tests/pageObjects/portal/teach/add_independent_student_to_class_page.py +3 -3
  280. portal/tests/pageObjects/portal/teach/added_independent_student_to_class_page.py +3 -1
  281. portal/tests/pageObjects/portal/teach/class_page.py +36 -13
  282. portal/tests/pageObjects/portal/teach/dashboard_page.py +43 -84
  283. portal/tests/pageObjects/portal/teach/dismiss_students_page.py +7 -5
  284. portal/tests/pageObjects/portal/teach/edit_student_page.py +10 -8
  285. portal/tests/pageObjects/portal/teach/move_class_page.py +5 -10
  286. portal/tests/pageObjects/portal/teach/move_classes_page.py +4 -2
  287. portal/tests/pageObjects/portal/teach/move_students_disambiguate_page.py +4 -2
  288. portal/tests/pageObjects/portal/teach/move_students_page.py +6 -13
  289. portal/tests/pageObjects/portal/teach/onboarding_classes_page.py +5 -3
  290. portal/tests/pageObjects/portal/teach/onboarding_organisation_page.py +11 -49
  291. portal/tests/pageObjects/portal/teach/onboarding_student_list_page.py +7 -12
  292. portal/tests/pageObjects/portal/teach/onboarding_students_page.py +4 -27
  293. portal/tests/pageObjects/portal/teach/teach_base_page.py +6 -4
  294. portal/tests/pageObjects/portal/teacher_login_page.py +10 -16
  295. portal/tests/selenium_test_case.py +3 -43
  296. portal/tests/snapshots/snap_test_partials.py +11 -165
  297. portal/tests/test_2FA.py +15 -33
  298. portal/tests/test_admin.py +15 -97
  299. portal/tests/test_api.py +212 -91
  300. portal/tests/test_captcha_forms.py +2 -2
  301. portal/tests/test_class.py +374 -24
  302. portal/tests/test_emails.py +83 -20
  303. portal/tests/{test_newsletter_footer.py → test_global_forms.py} +5 -5
  304. portal/tests/test_helper_methods.py +30 -0
  305. portal/tests/test_independent_student.py +255 -144
  306. portal/tests/test_invite_teacher.py +318 -10
  307. portal/tests/test_middleware.py +96 -9
  308. portal/tests/test_organisation.py +78 -262
  309. portal/tests/test_partials.py +0 -88
  310. portal/tests/test_ratelimit.py +218 -36
  311. portal/tests/test_school_student.py +35 -40
  312. portal/tests/test_security.py +12 -31
  313. portal/tests/test_teacher.py +425 -325
  314. portal/tests/test_teacher_student.py +103 -91
  315. portal/tests/test_views.py +900 -76
  316. portal/tests/utils/classes.py +2 -2
  317. portal/tests/utils/messages.py +13 -28
  318. portal/urls.py +235 -166
  319. portal/views/admin.py +0 -332
  320. portal/views/api.py +82 -48
  321. portal/views/cron/__init__.py +1 -0
  322. portal/views/cron/user.py +322 -0
  323. portal/views/dotmailer.py +9 -1
  324. portal/views/email.py +33 -77
  325. portal/views/google_analytics.py +28 -0
  326. portal/views/home.py +126 -97
  327. portal/views/legal.py +13 -0
  328. portal/views/login/independent_student.py +5 -5
  329. portal/views/login/student.py +51 -14
  330. portal/views/login/teacher.py +2 -6
  331. portal/views/organisation.py +20 -189
  332. portal/views/registration.py +97 -17
  333. portal/views/student/edit_account_details.py +99 -72
  334. portal/views/student/play.py +81 -62
  335. portal/views/teacher/dashboard.py +421 -149
  336. portal/views/teacher/teach.py +226 -177
  337. portal/views/two_factor/core.py +22 -19
  338. portal/views/two_factor/profile.py +2 -2
  339. codeforlife_portal-5.33.5.dist-info/LICENSE.md +0 -577
  340. codeforlife_portal-5.33.5.dist-info/METADATA +0 -38
  341. deploy/permissions.py +0 -2
  342. example_project/manage.py +0 -10
  343. portal/autoconfig.py +0 -141
  344. portal/csp_config.py +0 -60
  345. portal/forms/add_game.py +0 -33
  346. portal/helpers/location.py +0 -121
  347. portal/static/portal/img/kurono_hero.jpg +0 -0
  348. portal/static/portal/img/kurono_landing_hero.png +0 -0
  349. portal/static/portal/img/kurono_logo.svg +0 -1
  350. portal/static/portal/img/kurono_logo_grey_background.svg +0 -1
  351. portal/static/portal/img/kurono_logo_mark.svg +0 -1
  352. portal/static/portal/img/kurono_resources_hero.jpg +0 -0
  353. portal/static/portal/img/kurono_story.png +0 -0
  354. portal/static/portal/img/ocado-swirl.svg +0 -22
  355. portal/static/portal/img/thumbnail_educate_kurono.png +0 -0
  356. portal/static/portal/img/thumbnail_educate_resources_and_progress_tracking.png +0 -0
  357. portal/static/portal/img/thumbnail_kurono_resources.png +0 -0
  358. portal/static/portal/img/thumbnail_play_kurono.png +0 -0
  359. portal/static/portal/img/x_close_video.png +0 -0
  360. portal/static/portal/js/aimmoGame.js +0 -106
  361. portal/static/portal/js/deleteWorkspaces.js +0 -14
  362. portal/static/portal/js/fuzzySchoolLookup.js +0 -46
  363. portal/static/portal/js/lib/jquery-3.5.1.min.js +0 -2
  364. portal/static/portal/js/lib/jquery-ui-1.12.1.min.js +0 -13
  365. portal/static/portal/sass/partials/_videos.scss +0 -10
  366. portal/static/portal/video/aimmo_play_now_background_video.mp4 +0 -0
  367. portal/strings/student_aimmo_dashboard.py +0 -6
  368. portal/templates/portal/admin/aggregated_data.html +0 -35
  369. portal/templates/portal/admin/map.html +0 -70
  370. portal/templates/portal/mouseflow.html +0 -9
  371. portal/templates/portal/partials/aimmo_games_table.html +0 -83
  372. portal/templates/portal/partials/register_over_required_age_tickbox.html +0 -9
  373. portal/templates/portal/play/independent_student_dashboard.html +0 -64
  374. portal/templates/portal/play/student_aimmo_dashboard.html +0 -63
  375. portal/templates/portal/privacy_policy.html +0 -483
  376. portal/templates/portal/reset_password_email.html +0 -9
  377. portal/templates/portal/teach/invite.html +0 -25
  378. portal/templates/portal/teach/teacher_aimmo_dashboard.html +0 -95
  379. portal/templates/portal/teach/teacher_resources.html +0 -68
  380. portal/templatetags/character_list_tags.py +0 -16
  381. portal/tests/pageObjects/portal/kurono_teacher_dashboard_page.py +0 -49
  382. portal/tests/pageObjects/portal/student_password_reset_form_page.py +0 -23
  383. portal/tests/pageObjects/portal/teach/onboarding_revoke_request_page.py +0 -20
  384. portal/tests/pageObjects/portal/teacher_password_reset_form_page.py +0 -23
  385. portal/tests/test_aimmo_dashboards.py +0 -172
  386. portal/tests/test_location.py +0 -217
  387. portal/tests/utils/aimmo_games.py +0 -30
  388. portal/views/aimmo/dashboard.py +0 -119
  389. portal/views/privacy_policy.py +0 -9
  390. portal/views/teacher/teacher_resources.py +0 -42
  391. {portal/views/aimmo → cfl_common}/__init__.py +0 -0
@@ -45,6 +45,35 @@ $column--icon-width: 3%;
45
45
  background-color: $color-background-secondary;
46
46
  padding: 0;
47
47
 
48
+ &.activated-card {
49
+ border: 3px solid $color-tertiary;
50
+ position: relative;
51
+
52
+ .activated-text {
53
+ @include _font-size(20px);
54
+ @include _padding(10px, 20px, 10px, 20px);
55
+ background: $color-tertiary;
56
+ border-radius: 0 0 4px 4px;
57
+ color: $color-text-secondary;
58
+ display: inline-block;
59
+ position: absolute;
60
+ right: 36px;
61
+ line-height: 1;
62
+ }
63
+
64
+ .card__image {
65
+ border-radius: 1px 1px 0 0;
66
+ width: -moz-available;
67
+ width: -webkit-fill-available;
68
+ width: fill-available;
69
+ height: 220px;
70
+ }
71
+
72
+ .button-group > :not(:first-child) {
73
+ margin-left: calculate-rem(20px);
74
+ }
75
+ }
76
+
48
77
  .card__title {
49
78
  margin: 0;
50
79
  padding: 0;
@@ -88,19 +117,16 @@ $column--icon-width: 3%;
88
117
  }
89
118
 
90
119
  .grid-characters {
91
- .card__title {
92
- @include _padding($spacing * 4, $spacing * 4, $spacing * 4, $spacing * 4);
93
- color: $color-teacher-blue;
94
- margin: 0;
95
- text-align: center;
96
- }
97
-
98
- .card__image {
120
+ .grid-character-image {
99
121
  @include _padding(0px, $spacing * 4, 0px, $spacing * 4);
100
122
  display: block;
101
123
  max-height: $character-card-image-max-height;
102
124
  margin: 0 auto;
103
125
  }
126
+
127
+ .grid-character-title {
128
+ margin-bottom: 0;
129
+ }
104
130
  }
105
131
 
106
132
  .grid-worksheets {
@@ -153,37 +179,6 @@ $column--icon-width: 3%;
153
179
  }
154
180
  }
155
181
 
156
- .grid-kurono-sessions {
157
- display: grid;
158
- grid-auto-rows: auto;
159
- grid-template-columns:
160
- 70%
161
- auto;
162
-
163
- .button {
164
- @include _margin(0px, 0px, $spacing * 3, 0px);
165
- }
166
-
167
- div p {
168
- width: 90%;
169
- }
170
-
171
- & > * {
172
- align-items: center;
173
- border-bottom: 1px solid $color-table-border;
174
- display: grid;
175
- }
176
-
177
- .grid-icon {
178
- max-height: 60%;
179
- max-width: 60%;
180
- }
181
-
182
- h6 {
183
- @include _margin(20px, 0px, 10px, 0px);
184
- }
185
- }
186
-
187
182
  .grid-resources {
188
183
  border-top: 1px solid $color-table-border;
189
184
  display: grid;
@@ -266,26 +261,4 @@ $column--icon-width: 3%;
266
261
  "button3";
267
262
  row-gap: 4 * $spacing;
268
263
  }
269
-
270
- .grid-kurono-sessions {
271
- .grid-kurono-sessions__item {
272
- border-bottom: 1px solid $color-table-border;
273
- }
274
-
275
- .grid-kurono-sessions__accordion-button {
276
- align-items: center;
277
- display: flex;
278
- justify-content: space-between;
279
-
280
- .button-group__icon {
281
- width: -webkit-fill-available;
282
- width: -moz-available;
283
- }
284
- }
285
-
286
- .button-group {
287
- display: flex;
288
- justify-content: center;
289
- }
290
- }
291
264
  }
@@ -27,8 +27,8 @@
27
27
  }
28
28
 
29
29
  .dropdown-menu {
30
- @include _border-radius(0px, 0px, 0px, 0px);
31
30
  border: 2px solid $color-secondary-600;
31
+ border-radius: 0;
32
32
  border-top: 0;
33
33
  font-weight: 300;
34
34
  margin: 0;
@@ -60,6 +60,7 @@
60
60
  margin: 0;
61
61
 
62
62
  .dropdown-menu__option__text {
63
+ padding: 0;
63
64
  text-decoration: none;
64
65
  }
65
66
 
@@ -119,6 +120,11 @@
119
120
  width: 100%;
120
121
  z-index: $hover-content-level;
121
122
 
123
+ svg {
124
+ opacity: 0.5;
125
+ margin-left: 0.3rem;
126
+ }
127
+
122
128
  a {
123
129
  color: $color-text-tertiary;
124
130
  display: block;
@@ -175,7 +181,7 @@
175
181
 
176
182
  .menu--title {
177
183
  @include _font-size(27px);
178
- @include _margin(0px, 40px, 0px, 10px);
184
+ @include _margin(0px, $spacing * 8, 0px, $spacing * 2);
179
185
  color: $color-text-tertiary;
180
186
  font-family: "Space Grotesk", sans-serif;
181
187
  }
@@ -203,9 +209,15 @@
203
209
 
204
210
  @media (min-width: $tablet-small-min-width) {
205
211
  .menu__right-side {
212
+ @include _margin-right($spacing * 3);
206
213
  align-items: center;
207
- justify-content: flex-end;
208
214
  display: flex;
215
+ justify-content: flex-end;
216
+ width: 33%;
217
+ }
218
+
219
+ .logo {
220
+ height: 100px;
209
221
  }
210
222
  }
211
223
 
@@ -213,10 +225,6 @@
213
225
  .menu {
214
226
  height: $menu-height;
215
227
 
216
- .logo {
217
- height: 100%;
218
- }
219
-
220
228
  .menu__brand {
221
229
  @include _margin(0px, $spacing * 7, 0px, 0px);
222
230
  }
@@ -234,7 +242,7 @@
234
242
  height: $menu-height-xs;
235
243
 
236
244
  .logo {
237
- @include _padding($spacing * 3, $spacing * 9, $spacing * 3, $spacing * 3);
245
+ @include _padding($spacing * 3, $spacing * 3, $spacing * 3, $spacing * 3);
238
246
  }
239
247
 
240
248
  .menu__brand--ocado {
@@ -249,18 +257,15 @@
249
257
  .menu {
250
258
  background-color: $color-background-secondary;
251
259
  display: flex;
260
+ justify-content: space-between;
252
261
  position: fixed;
253
262
  top: 0;
254
263
  width: 100%;
255
264
  z-index: $nav-bar-level;
256
265
 
257
- .button--menu {
258
- border-radius: 0;
259
-
260
- &:hover,
261
- &:focus {
262
- font-weight: normal;
263
- }
266
+ .button--menu:hover,
267
+ .button--menu:focus, {
268
+ font-weight: normal;
264
269
  }
265
270
 
266
271
  .button--menu--secondary {
@@ -282,20 +287,23 @@
282
287
 
283
288
  .button--register,
284
289
  .button--header--login {
285
- @include _padding(10px, 15px, 10px, 15px);
290
+ @include _padding($spacing * 2, $spacing * 3, $spacing * 2, $spacing * 3);
286
291
  width: 155px;
287
292
  height: 45px;
288
293
  }
289
294
  }
290
295
 
291
296
  .menu__brand {
292
- align-items: center;
293
297
  display: flex;
294
- justify-content: center;
298
+ width: 66%;
295
299
 
296
- img {
297
- max-width: none;
300
+ .menu__brand--ocado {
301
+ @include _margin-right($spacing * 7);
298
302
  }
303
+
304
+ //img {
305
+ // max-width: none;
306
+ //}
299
307
  }
300
308
 
301
309
  .menu__left-side {
@@ -30,13 +30,6 @@ img {
30
30
  margin-top: 1.5em;
31
31
  }
32
32
 
33
- .background--swirl {
34
- background-image: url("../img/ocado-swirl.svg");
35
- background-size: contain;
36
- background-repeat: no-repeat;
37
- background-position: center;
38
- }
39
-
40
33
  .image-row {
41
34
  align-items: baseline;
42
35
  display: flex;
@@ -69,8 +62,288 @@ img {
69
62
  }
70
63
 
71
64
  .logo {
72
- @include _padding($spacing * 3, $spacing * 14, $spacing * 3, $spacing * 3);
73
- content: url("../img/logo_cfl.png");
65
+ @include _padding($spacing * 3, $spacing * 3, $spacing * 3, $spacing * 3);
66
+ }
67
+
68
+ .map-pin {
69
+ position: absolute;
70
+ background: 0 0;
71
+ min-width: 0px !important;
72
+ }
73
+
74
+ #map-container {
75
+ position: relative;
76
+ }
77
+
78
+ #hatfield {
79
+ left: 34.5%;
80
+ top: 26.7%;
81
+ }
82
+
83
+ #barcelona {
84
+ left: 38%;
85
+ top: 58.8%;
86
+ }
87
+
88
+ #krakow {
89
+ left: 61.7%;
90
+ top: 30.3%;
91
+ }
92
+
93
+ #sofia {
94
+ left: 68.5%;
95
+ top: 55.5%;
96
+ }
97
+
98
+ @media only screen and (max-width: 1400px) {
99
+ #sofia {
100
+ left: 68.8%;
101
+ top: 55.8%;
102
+ }
103
+ }
104
+
105
+ @media only screen and (max-width: 1200px) {
106
+ #hatfield {
107
+ left: 33.5%;
108
+ top: 25.1%;
109
+ }
110
+
111
+ #barcelona {
112
+ left: 36.7%;
113
+ top: 56.4%;
114
+ }
115
+
116
+ #krakow {
117
+ left: 60.7%;
118
+ top: 28.7%;
119
+ }
120
+
121
+ #sofia {
122
+ left: 68%;
123
+ top: 53.5%;
124
+ }
125
+ }
126
+
127
+ @media only screen and (max-width: 992px) {
128
+ #hatfield {
129
+ left: 32.7%;
130
+ top: 22.8%;
131
+ }
132
+
133
+ #barcelona {
134
+ left: 35.7%;
135
+ top: 54.6%;
136
+ }
137
+
138
+ #krakow {
139
+ left: 59.7%;
140
+ top: 26.3%;
141
+ }
142
+
143
+ #sofia {
144
+ left: 67%;
145
+ top: 50.2%;
146
+ }
147
+ }
148
+
149
+ @media only screen and (max-width: 767px) {
150
+ #barcelona {
151
+ left: 36.7%;
152
+ top: 54%;
153
+ }
154
+
155
+ #sofia {
156
+ left: 67.5%;
157
+ top: 51.2%;
158
+ }
159
+ }
160
+
161
+ @media only screen and (max-width: 700px) {
162
+ #hatfield {
163
+ left: 32.5%;
164
+ top: 20.8%;
165
+ }
166
+
167
+ #barcelona {
168
+ left: 35.4%;
169
+ top: 53.5%;
170
+ }
171
+
172
+ #krakow {
173
+ left: 59.7%;
174
+ top: 25.3%;
175
+ }
176
+
177
+ #sofia {
178
+ left: 67%;
179
+ top: 50.2%;
180
+ }
181
+ }
182
+
183
+ @media only screen and (max-width: 650px) {
184
+ #barcelona {
185
+ left: 35.4%;
186
+ top: 52.5%;
187
+ }
188
+
189
+ #sofia {
190
+ left: 66%;
191
+ top:48.2%;
192
+ }
193
+ }
194
+
195
+ @media only screen and (max-width: 600px) {
196
+ #hatfield {
197
+ left: 31.5%;
198
+ top: 18.8%;
199
+ }
200
+
201
+ #barcelona {
202
+ left: 34.4%;
203
+ top: 50.5%;
204
+ }
205
+
206
+ #krakow {
207
+ left: 58.7%;
208
+ top: 23.3%;
209
+ }
210
+
211
+ #sofia {
212
+ left: 66%;
213
+ top: 48.2%;
214
+ }
215
+ }
216
+
217
+ @media only screen and (max-width: 550px) {
218
+ #hatfield {
219
+ left: 30.5%;
220
+ top: 17.3%;
221
+ }
222
+
223
+ #barcelona {
224
+ left: 33.4%;
225
+ top: 49%;
226
+ }
227
+
228
+ #krakow {
229
+ left: 57.7%;
230
+ top: 21.6%;
231
+ }
232
+
233
+ #sofia {
234
+ left: 65%;
235
+ top: 46%;
236
+ }
237
+ }
238
+
239
+ @media only screen and (max-width: 500px) {
240
+ #hatfield {
241
+ left: 29.8%;
242
+ top: 16.3%;
243
+ }
244
+
245
+ #barcelona {
246
+ left: 33%;
247
+ top: 47%;
248
+ }
249
+
250
+ #krakow {
251
+ left: 57%;
252
+ top: 20%;
253
+ }
254
+
255
+ #sofia {
256
+ left: 64%;
257
+ top: 44%;
258
+ }
259
+ }
260
+
261
+ @media only screen and (max-width: 450px) {
262
+ #hatfield {
263
+ left: 28.7%;
264
+ top: 17%;
265
+ }
266
+
267
+ #barcelona {
268
+ left: 32%;
269
+ top: 44.5%;
270
+ }
271
+
272
+ #krakow {
273
+ left: 56%;
274
+ top: 21.5%;
275
+ }
276
+
277
+ #sofia {
278
+ left: 63%;
279
+ top: 42%;
280
+ }
281
+ }
282
+
283
+ @media only screen and (max-width: 430px) {
284
+ #hatfield {
285
+ left: 28.5%;
286
+ top: 17%;
287
+ }
288
+
289
+ #barcelona {
290
+ left: 31.5%;
291
+ top: 42.5%;
292
+ }
293
+
294
+ #krakow {
295
+ left: 55%;
296
+ top: 19.5%;
297
+ }
298
+
299
+ #sofia {
300
+ left: 62%;
301
+ top: 40.5%;
302
+ }
303
+ }
304
+
305
+ @media only screen and (max-width: 390px) {
306
+ #hatfield {
307
+ left: 27.8%;
308
+ top: 15.5%;
309
+ }
310
+
311
+ #barcelona {
312
+ left: 31%;
313
+ top: 40.5%;
314
+ }
315
+
316
+ #krakow {
317
+ left: 52.5%;
318
+ top: 19%;
319
+ }
320
+
321
+ #sofia {
322
+ left: 61%;
323
+ top: 39%;
324
+ }
325
+ }
326
+
327
+ @media only screen and (max-width: 360px) {
328
+ #hatfield {
329
+ left: 27.5%;
330
+ top: 14.5%;
331
+ }
332
+
333
+ #barcelona {
334
+ left: 30.5%;
335
+ top: 40%;
336
+ }
337
+
338
+ #krakow {
339
+ left: 53%;
340
+ top: 18%;
341
+ }
342
+
343
+ #sofia {
344
+ left: 60%;
345
+ top: 35.5%;
346
+ }
74
347
  }
75
348
 
76
349
  .glyphicon {
@@ -105,53 +378,33 @@ img {
105
378
  }
106
379
 
107
380
  .educate-homepage {
108
- content: url("../img/home_educate.png");
109
381
  width: 70%;
110
382
  object-fit: contain;
111
383
  }
112
384
 
113
385
  .play-homepage {
114
- content: url("../img/home_play.png");
115
386
  width: 70%;
116
387
  object-fit: contain;
117
388
  }
118
389
 
119
- .oval-blue {
120
- content: url("../img/oval_blue.svg");
121
- }
122
-
123
- .oval-pink {
124
- content: url("../img/oval_pink.svg");
125
- }
126
-
127
- .oval-yellow {
128
- content: url("../img/oval_yellow.svg");
129
- }
130
-
131
- .polygon-blue {
132
- content: url("../img/polygon_blue.svg");
133
- }
134
-
135
- .polygon-pink {
136
- content: url("../img/polygon_pink.svg");
137
- }
138
-
139
- .polygon-yellow {
140
- content: url("../img/polygon_yellow.svg");
141
- }
142
-
143
390
  .login-shape-left {
144
- @include _top(250px);
145
- @include _margin(-250px, 0px, 0px, 0px);
391
+ @include _top(300px);
146
392
  position: relative;
147
393
  left: -17vw;
394
+
395
+ img {
396
+ @include _margin(-250px, 0px, 0px, 0px);
397
+ }
148
398
  }
149
399
 
150
400
  .login-shape-right {
151
- @include _top(500px);
152
- @include _margin(-500px, 0px, 0px, 0px);
401
+ @include _top(550px);
153
402
  position: relative;
154
403
  left: 17vw;
404
+
405
+ img {
406
+ @include _margin(-250px, 0px, 0px, 0px);
407
+ }
155
408
  }
156
409
 
157
410
  @media (max-width: $tablet-large-max-width) {
@@ -20,9 +20,9 @@
20
20
  .popup-box {
21
21
  background-color: $color-background-secondary;
22
22
  box-shadow: 0 0 4 * $spacing $color-background-box-shadow;
23
- margin: 20% auto 0;
23
+ margin: 10% auto;
24
24
  overflow: hidden;
25
- width: 440px;
25
+ width: 520px;
26
26
 
27
27
  .popup-box__msg {
28
28
  @include _padding(0px, 5 * $spacing, 5 * $spacing, 5 * $spacing);
@@ -38,32 +38,36 @@
38
38
 
39
39
  .popup-box__buttons {
40
40
  @include _margin(5 * $spacing, 5 * $spacing, 5 * $spacing, 5 * $spacing);
41
- display: flex;
42
- justify-content: flex-end;
43
41
 
44
42
  .button {
45
43
  @include _margin(0px, 2 * $spacing, 2 * $spacing, 2 * $spacing);
46
- @include _padding($spacing, 3 * $spacing, $spacing, 3 * $spacing);
47
- border-style: solid;
48
44
  }
49
45
  }
50
46
 
51
47
  .popup-box__title {
52
48
  @include _padding(5 * $spacing, 5 * $spacing, 0px, 5 * $spacing);
53
49
  background-color: $color-background-secondary;
50
+ color: $color-text-primary;
54
51
  display: flex;
55
52
  justify-content: flex-start;
53
+ font-family: "Space Grotesk", sans-serif;
54
+ @include _font-size(21px);
55
+ }
56
56
 
57
- h3 {
58
- @include _font-size(20px);
59
- @include _margin(0px, 0px, 0px, 0px);
60
- @include _padding(0px, $spacing, 0px, $spacing);
61
- color: $color-text-primary;
62
- display: inline-block;
63
- font-weight: bold;
64
- }
57
+ .popup-box__close {
58
+ min-width:0;
59
+ @include _margin(8px, 8px, 8px, 8px);
60
+ }
61
+
62
+ label {
63
+ text-align: left;
65
64
  }
66
65
  }
66
+
67
+ &#screentime-popup,
68
+ &#session-popup {
69
+ z-index: $nav-bar-level + 1;
70
+ }
67
71
  }
68
72
 
69
73
  .popup--fade {
@@ -77,7 +81,6 @@
77
81
  transition: opacity $fade-time ease-out;
78
82
  }
79
83
 
80
-
81
84
  @media (max-width: $mobile-max-width) {
82
85
  .popup-wrapper {
83
86
  .popup-box {