Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

production < staging #737

Merged
merged 12 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/group_leader/citations/edit.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
legend.govuk-fieldset__legend.govuk-fieldset__legend--m
h1.govuk-fieldset__heading
| Do you accept the King's Award for Voluntary Service (KAVS)
=<> AwardYear.current.year
=<> @citation.form_answer.award_year.year
| on behalf of your group?
.govuk-radios.govuk-radios--inline
.govuk-radios__item
Expand Down
30 changes: 19 additions & 11 deletions app/views/group_leader/dashboard/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
hr.govuk-section-break.govuk-section-break--l

h3.govuk-heading-s
| Between 1 October and 14 November 2023
| Between 1 October and 14 November
=<> @award_year.year
| &mdash; prepare press coverage
p.govuk-body
| This is a great opportunity to get plenty of local publicity for your group. We hope you will be able to prepare some eye-catching posts for social media and invite local journalists to write about your news. Nothing should be publicised or published before the morning of 14 November, but it will be fine to agree embargoed articles with local journalists beforehand.
Expand All @@ -66,13 +67,13 @@
.govuk-details__text
ul.govuk-list
li
= link_to "The King's Award for Voluntary Service awardees' media pack 2023",
"https://storage.googleapis.com/emblem-files-and-guidance/Media%20pack%20for%20KAVS%20Awardees%202023.pdf",
= link_to "The King's Award for Voluntary Service awardees' media pack #{@award_year.year}",
"https://storage.googleapis.com/emblem-files-and-guidance/Media%20pack%20for%20#{@award_year.year >= 2023 ? "KAVS" : "QAVS"}%20Awardees%20#{@award_year.year}.pdf",
rel: "noreferrer noopener",
target: :_blank
li
= link_to "The King's Award for Voluntary Service media pack materials",
"https://storage.googleapis.com/emblem-files-and-guidance/KAVS%202023%20Media%20Pack%20Materials.pptx",
"https://storage.googleapis.com/emblem-files-and-guidance/#{@award_year.year >= 2023 ? "KAVS" : "QAVS"}%20#{@award_year.year}%20Media%20Pack%20Materials.pptx",
rel: "noreferrer noopener",
target: :_blank
li
Expand All @@ -84,17 +85,22 @@
hr.govuk-section-break.govuk-section-break--l.govuk-section-break--visible

h3.govuk-heading-s
| 14 November 2023
| 14 November
=<> @award_year.year
| &mdash; Awards officially announced
p.govuk-body
| Successful groups, including your group, will be announced in The Gazette, GOV.UK and on the
=< link_to("KAVS website", "https://kavs.dcms.gov.uk/")
| . We will also be promoting it widely on our social media pages and sharing your posts too. Please join in and make sure you use the hashtag #KAVS2023 and tag us @KingsAwardVS.
| . We will also be promoting it widely on our social media pages and sharing your posts too. Please join in and make sure you use the hashtag #KAVS
=> @award_year.year
| and tag us @KingsAwardVS.
hr.govuk-section-break.govuk-section-break--l.govuk-section-break--visible

h3.govuk-heading-s
| November - March
| Mid December
=<> @award_year.year
| to April
=<> @award_year.year + 1
| &mdash; Lord-Lieutenant presents the Award
p.govuk-body
| The Lord-Lieutenant for your local county, as The King's representative, will present your group with a certificate and a commemorative crystal at a local ceremony. The Lieutenancy office will be in touch to arrange a suitable date and time for this.
Expand All @@ -112,8 +118,10 @@
| Incomplete
p.govuk-body
| Two representatives from the awarded groups will be invited to attend a Royal Garden Party at Buckingham Palace or The Palace of Holyroodhouse in Edinburgh in
=< @award_year.year
| . We will contact you in January/February 2024 to request the contact details for these two guests.
=< @award_year.year + 1
| . We will contact you in February
=<> @award_year.year + 1
| to request the contact details for these two guests.
strong.text-underline<
| No action is needed now.
/ NOTE for devs: When enabling the button, please also uncomment the tests in 'palace_invite_spec.rb'
Expand All @@ -122,9 +130,9 @@

h3.govuk-heading-s
| May to July
=<> @award_year.year
=<> @award_year.year + 1
| &mdash; Royal Garden Party
p.govuk-body
| We will let you know the precise dates when we contact you about this in early
=< @award_year.year
=< @award_year.year + 1
| .
Loading