From bd5c9cce903d4a2bd88d4de68812a06289a71c8a Mon Sep 17 00:00:00 2001 From: Drew McMillan Date: Thu, 25 Aug 2022 09:10:00 +0100 Subject: [PATCH] typo --- functions/views/_layout.pug | 18 +++++++++--------- functions/views/badges.pug | 2 +- functions/views/parallelogram.pug | 22 +++++++++++----------- pages/badges.md | 2 -- pages/home.md | 2 ++ pages/parallelograms.md | 2 ++ static/pages.yaml | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/functions/views/_layout.pug b/functions/views/_layout.pug index 42362b19..b66f57e6 100644 --- a/functions/views/_layout.pug +++ b/functions/views/_layout.pug @@ -157,17 +157,17 @@ html .modal-background .modal-body h2 Welcome back to Parallel! - p.text-center We’ve updated your level to #[strong #{levelNames[user.level]}]. You can always change it on your #[a(href="/account") account settings] page. The first Parallelogram is now available to take, but officially it is launched on September 12th. We will be releasing new parallelograms every week of the school year, so the second one appears on September 19th. Don’t worry, you will still be able to access the badges you earned last year. + p.text-center We’ve updated your level to #[strong #{levelNames[user.level]}]. You can always change it on your #[a(href="/account") account settings] page. The first Parallelogram is now available, but officially it is launched in early September. We will be releasing new Parallelograms every week, from mid-September. button(type="submit" v-on:click="showWelcomeMsg = false") Continue - if user - .modal(v-if="user.showYearScopeMessage") - .modal-background - .modal-body - h2 Welcome to Parallel! - p.text-center(v-if="user.showYearScopeMessage === 1") We don’t yet have Parallelograms maths puzzle sheets for students aged 10 or below, but you might like to try some of the Year 7 Parallelograms, which contains some curious problems. - p.text-center(v-if="user.showYearScopeMessage === 2") We don’t yet have Parallelograms maths puzzle sheets for students aged 17 or older, but you might like to try some of the Year 11 Parallelograms, which contains some curious problems. - button(type="submit" v-on:click=`user.hideYearScopeMessage()`) Continue + //- if user + //- .modal(v-if="user.showYearScopeMessage") + //- .modal-background + //- .modal-body + //- h2 Welcome to Parallel! + //- p.text-center(v-if="user.showYearScopeMessage === 1") We don’t yet have Parallelograms maths puzzle sheets for students aged 10 or below, but you might like to try some of the Year 7 Parallelograms, which contains some curious problems. + //- p.text-center(v-if="user.showYearScopeMessage === 2") We don’t yet have Parallelograms maths puzzle sheets for students aged 17 or older, but you might like to try some of the Year 11 Parallelograms, which contains some curious problems. + //- button(type="submit" v-on:click=`user.hideYearScopeMessage()`) Continue footer a(href="/about") About diff --git a/functions/views/badges.pug b/functions/views/badges.pug index fd735fb6..20333dc6 100644 --- a/functions/views/badges.pug +++ b/functions/views/badges.pug @@ -3,7 +3,7 @@ extends _layout block content include ../build/badges.html - b(style="text-align: center;display: block;margin: 2rem 0;") Our new rewards system, with badges and certificates, will be launched shortly. Until then, you may find some inconsistencies in how you score and badges are calculated – don’t worry, your score will be accurate when the new rewards launch. + b(style="text-align: center;display: block;margin: 2rem 0;") Our new rewards system, with badges and certificates, will be launched shortly. Until then, you may find some inconsistencies in how your score and badges are calculated – don’t worry, your score will be accurate when the new rewards launch. .toggle.largeToggle for l in user.sidebarLevels diff --git a/functions/views/parallelogram.pug b/functions/views/parallelogram.pug index 0763d2db..7e28e917 100644 --- a/functions/views/parallelogram.pug +++ b/functions/views/parallelogram.pug @@ -25,17 +25,17 @@ block content else button#submit(v-on:click="c.submit") Submit Answers - if newBadge - #new-badge.modal(v-if="c.showBadgeModal") - .modal-background(v-on:click="c.showBadgeModal = false") - .modal-body(style="background: #" + newBadge.color) - h2 Congratulations! - p You’ve scored enough points to receive a new badge: - img(src='/images/badges/' + newBadge.id + '.jpg' width=160 height-180) - h3= newBadge.name - p !{newBadge.description} - p: a.badge-btn(href=newBadge.link target="_blank") Learn more… - .close(v-on:click="c.showBadgeModal = false") × + //- if newBadge + //- #new-badge.modal(v-if="c.showBadgeModal") + //- .modal-background(v-on:click="c.showBadgeModal = false") + //- .modal-body(style="background: #" + newBadge.color) + //- h2 Congratulations! + //- p You’ve scored enough points to receive a new badge: + //- img(src='/images/badges/' + newBadge.id + '.jpg' width=160 height-180) + //- h3= newBadge.name + //- p !{newBadge.description} + //- p: a.badge-btn(href=newBadge.link target="_blank") Learn more… + //- .close(v-on:click="c.showBadgeModal = false") × script!= 'window.PARALLELOGRAM = ' + JSON.stringify(page) + ';' script!= 'window.PARALLEL_USER_DATA = ' + JSON.stringify(userData) + ';' diff --git a/pages/badges.md b/pages/badges.md index f091d51e..1d960f69 100644 --- a/pages/badges.md +++ b/pages/badges.md @@ -7,5 +7,3 @@ This page shows the points you have earned by completing Parallelograms. You ear At the end of the academic year, you will be awarded a certificate based on the points you have scored. You can also earn points and awards by attending our live Parallel Circles. - -You can find out more on your main [Awards](/awards) page, which also explains the different awards and how you can earn them. diff --git a/pages/home.md b/pages/home.md index bc04db5f..ecf35b3e 100644 --- a/pages/home.md +++ b/pages/home.md @@ -16,3 +16,5 @@ __Pronunciation__: /ˌparəˈlɛləɡram/ All the materials are __completely free__. + +‘Year groups’ are now called Levels. They’re basically the same thing, with higher Levels corresponding to more advanced material. Your account has automatically been moved up to a new level, so students who were doing Year 7 Parallelograms will be at Level 3 for the upcoming year, and last year’s Year 8 students will be at Level 4 when Parallel restarts. You can change your Level in Settings if you are finding the material too easy or too challenging. diff --git a/pages/parallelograms.md b/pages/parallelograms.md index bc04db5f..ecf35b3e 100644 --- a/pages/parallelograms.md +++ b/pages/parallelograms.md @@ -16,3 +16,5 @@ __Pronunciation__: /ˌparəˈlɛləɡram/ All the materials are __completely free__. + +‘Year groups’ are now called Levels. They’re basically the same thing, with higher Levels corresponding to more advanced material. Your account has automatically been moved up to a new level, so students who were doing Year 7 Parallelograms will be at Level 3 for the upcoming year, and last year’s Year 8 students will be at Level 4 when Parallel restarts. You can change your Level in Settings if you are finding the material too easy or too challenging. diff --git a/static/pages.yaml b/static/pages.yaml index 772ea058..75444f7c 100644 --- a/static/pages.yaml +++ b/static/pages.yaml @@ -1024,5 +1024,5 @@ year11: deadline: 2022-09-18T19:00:00 - url: 11-01-prince-ruperts-drops title: Prince Rupert’s Drops - available: 2022-08-30T10:00:00 + available: 2022-08-25T10:00:00 deadline: 2022-09-11T19:00:00