Skip to content

Commit bd5c9cc

Browse files
committed
typo
1 parent 99be7e6 commit bd5c9cc

File tree

7 files changed

+26
-24
lines changed

7 files changed

+26
-24
lines changed

functions/views/_layout.pug

+9-9
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ html
157157
.modal-background
158158
.modal-body
159159
h2 Welcome back to Parallel!
160-
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.
160+
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.
161161
button(type="submit" v-on:click="showWelcomeMsg = false") Continue
162162

163-
if user
164-
.modal(v-if="user.showYearScopeMessage")
165-
.modal-background
166-
.modal-body
167-
h2 Welcome to Parallel!
168-
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.
169-
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.
170-
button(type="submit" v-on:click=`user.hideYearScopeMessage()`) Continue
163+
//- if user
164+
//- .modal(v-if="user.showYearScopeMessage")
165+
//- .modal-background
166+
//- .modal-body
167+
//- h2 Welcome to Parallel!
168+
//- 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.
169+
//- 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.
170+
//- button(type="submit" v-on:click=`user.hideYearScopeMessage()`) Continue
171171
172172
footer
173173
a(href="/about") About

functions/views/badges.pug

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extends _layout
33
block content
44
include ../build/badges.html
55

6-
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.
6+
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.
77

88
.toggle.largeToggle
99
for l in user.sidebarLevels

functions/views/parallelogram.pug

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ block content
2525
else
2626
button#submit(v-on:click="c.submit") Submit Answers
2727

28-
if newBadge
29-
#new-badge.modal(v-if="c.showBadgeModal")
30-
.modal-background(v-on:click="c.showBadgeModal = false")
31-
.modal-body(style="background: #" + newBadge.color)
32-
h2 Congratulations!
33-
p You’ve scored enough points to receive a new badge:
34-
img(src='/images/badges/' + newBadge.id + '.jpg' width=160 height-180)
35-
h3= newBadge.name
36-
p !{newBadge.description}
37-
p: a.badge-btn(href=newBadge.link target="_blank") Learn more…
38-
.close(v-on:click="c.showBadgeModal = false") ×
28+
//- if newBadge
29+
//- #new-badge.modal(v-if="c.showBadgeModal")
30+
//- .modal-background(v-on:click="c.showBadgeModal = false")
31+
//- .modal-body(style="background: #" + newBadge.color)
32+
//- h2 Congratulations!
33+
//- p You’ve scored enough points to receive a new badge:
34+
//- img(src='/images/badges/' + newBadge.id + '.jpg' width=160 height-180)
35+
//- h3= newBadge.name
36+
//- p !{newBadge.description}
37+
//- p: a.badge-btn(href=newBadge.link target="_blank") Learn more…
38+
//- .close(v-on:click="c.showBadgeModal = false") ×
3939
4040
script!= 'window.PARALLELOGRAM = ' + JSON.stringify(page) + ';'
4141
script!= 'window.PARALLEL_USER_DATA = ' + JSON.stringify(userData) + ';'

pages/badges.md

-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ This page shows the points you have earned by completing Parallelograms. You ear
77
At the end of the academic year, you will be awarded a certificate based on the points you have scored.
88

99
You can also earn points and awards by attending our live Parallel Circles.
10-
11-
You can find out more on your main [Awards](/awards) page, which also explains the different awards and how you can earn them.

pages/home.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ __Pronunciation__: /ˌparəˈlɛləɡram/
1616
</div>
1717

1818
All the materials are __completely free__.
19+
20+
‘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.

pages/parallelograms.md

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ __Pronunciation__: /ˌparəˈlɛləɡram/
1616
</div>
1717

1818
All the materials are __completely free__.
19+
20+
‘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.

static/pages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1024,5 +1024,5 @@ year11:
10241024
deadline: 2022-09-18T19:00:00
10251025
- url: 11-01-prince-ruperts-drops
10261026
title: Prince Rupert’s Drops
1027-
available: 2022-08-30T10:00:00
1027+
available: 2022-08-25T10:00:00
10281028
deadline: 2022-09-11T19:00:00

0 commit comments

Comments
 (0)