From 53301eecae655458202389b6618b6e331733dacc Mon Sep 17 00:00:00 2001 From: Sam Osborne Date: Thu, 18 Feb 2021 23:38:49 +0000 Subject: [PATCH 1/6] Move all legacy redirects into a folder Avoid clutter in _content folder root Use permalink rather than redirect_from to maintain those urls and avoid having _site/redirects/... --- _content/about-us/committee.md | 6 ------ _content/about-us/mailing-list.md | 4 ---- _content/redirects/about-us/_mailinglist.md | 5 +++++ _content/redirects/about-us/committee.md | 6 ++++++ _content/{ => redirects}/assassins.md | 4 ++-- _content/{ => redirects}/festival-staff-site.md | 2 +- _content/{ => redirects}/get-involved/act.md | 2 +- _content/{ => redirects}/get-involved/carpentry.md | 2 +- .../{ => redirects}/get-involved/costume-props-makeup.md | 2 +- _content/{ => redirects}/get-involved/direct.md | 2 +- _content/{ => redirects}/get-involved/index.md | 0 _content/{ => redirects}/get-involved/lx.md | 2 +- _content/{ => redirects}/get-involved/marketing.md | 2 +- _content/{ => redirects}/get-involved/produce.md | 2 +- _content/{ => redirects}/get-involved/set.md | 2 +- _content/{ => redirects}/get-involved/sm.md | 2 +- _content/{ => redirects}/get-involved/sound.md | 2 +- _content/{ => redirects}/get-involved/tech.md | 2 +- _content/{ => redirects}/get-involved/write.md | 2 +- _content/{ => redirects}/mailinglist.md | 5 +++++ 20 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 _content/about-us/committee.md delete mode 100644 _content/about-us/mailing-list.md create mode 100644 _content/redirects/about-us/_mailinglist.md create mode 100644 _content/redirects/about-us/committee.md rename _content/{ => redirects}/assassins.md (78%) rename _content/{ => redirects}/festival-staff-site.md (73%) rename _content/{ => redirects}/get-involved/act.md (61%) rename _content/{ => redirects}/get-involved/carpentry.md (57%) rename _content/{ => redirects}/get-involved/costume-props-makeup.md (65%) rename _content/{ => redirects}/get-involved/direct.md (62%) rename _content/{ => redirects}/get-involved/index.md (100%) rename _content/{ => redirects}/get-involved/lx.md (65%) rename _content/{ => redirects}/get-involved/marketing.md (65%) rename _content/{ => redirects}/get-involved/produce.md (98%) rename _content/{ => redirects}/get-involved/set.md (56%) rename _content/{ => redirects}/get-involved/sm.md (62%) rename _content/{ => redirects}/get-involved/sound.md (59%) rename _content/{ => redirects}/get-involved/tech.md (60%) rename _content/{ => redirects}/get-involved/write.md (61%) rename _content/{ => redirects}/mailinglist.md (54%) diff --git a/_content/about-us/committee.md b/_content/about-us/committee.md deleted file mode 100644 index 49a3fdd3..00000000 --- a/_content/about-us/committee.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: About-Committee -redirect_from: http://newtheatre.org.uk/about-us/committee/ -redirect_to: https://newtheatre.org.uk/about/#committee - ---- diff --git a/_content/about-us/mailing-list.md b/_content/about-us/mailing-list.md deleted file mode 100644 index 47c6b1e7..00000000 --- a/_content/about-us/mailing-list.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Mailing List -redirect_to: /mailinglist ---- diff --git a/_content/redirects/about-us/_mailinglist.md b/_content/redirects/about-us/_mailinglist.md new file mode 100644 index 00000000..c1a6ecf3 --- /dev/null +++ b/_content/redirects/about-us/_mailinglist.md @@ -0,0 +1,5 @@ +--- +title: Mailing List +redirect_to: /mailinglist/ +permalink: /about-us/mailinglist/ +--- \ No newline at end of file diff --git a/_content/redirects/about-us/committee.md b/_content/redirects/about-us/committee.md new file mode 100644 index 00000000..7846b902 --- /dev/null +++ b/_content/redirects/about-us/committee.md @@ -0,0 +1,6 @@ +--- +title: About-Committee +redirect_to: /about/#committee +permalink: /about-us/committee/ + +--- diff --git a/_content/assassins.md b/_content/redirects/assassins.md similarity index 78% rename from _content/assassins.md rename to _content/redirects/assassins.md index a4574ff4..f19bc11e 100644 --- a/_content/assassins.md +++ b/_content/redirects/assassins.md @@ -1,6 +1,6 @@ --- -title: 'Assassins ' -redirect_from: '' +title: 'Assassins' +permalink: '/assassins' redirect_to: https://docs.google.com/forms/d/e/1FAIpQLSf3s7bkjV9GEIZiMMoaxgM06yb7W7HrAPjd1zyKF7IJAJE1-Q/viewform date: 2019-04-10 14:11:49 +0000 diff --git a/_content/festival-staff-site.md b/_content/redirects/festival-staff-site.md similarity index 73% rename from _content/festival-staff-site.md rename to _content/redirects/festival-staff-site.md index 9f1864ae..425ee220 100644 --- a/_content/festival-staff-site.md +++ b/_content/redirects/festival-staff-site.md @@ -1,6 +1,6 @@ --- title: festival -redirect_from: "/festival" +permalink: "/festival" redirect_to: https://nt-festival.herokuapp.com/ --- diff --git a/_content/get-involved/act.md b/_content/redirects/get-involved/act.md similarity index 61% rename from _content/get-involved/act.md rename to _content/redirects/get-involved/act.md index fade0e79..2e37f01c 100644 --- a/_content/get-involved/act.md +++ b/_content/redirects/get-involved/act.md @@ -1,5 +1,5 @@ --- title: Act -redirect_from: /get-involved/act +permalink: /get-involved/act redirect_to: /get-involved/#acting --- \ No newline at end of file diff --git a/_content/get-involved/carpentry.md b/_content/redirects/get-involved/carpentry.md similarity index 57% rename from _content/get-involved/carpentry.md rename to _content/redirects/get-involved/carpentry.md index 11bcaf37..f28ad13d 100644 --- a/_content/get-involved/carpentry.md +++ b/_content/redirects/get-involved/carpentry.md @@ -1,5 +1,5 @@ --- title: Carpentry -redirect_from: /get-involved/construct-2/ +permalink: /get-involved/construct-2/ redirect_to: /get-involved/#set --- diff --git a/_content/get-involved/costume-props-makeup.md b/_content/redirects/get-involved/costume-props-makeup.md similarity index 65% rename from _content/get-involved/costume-props-makeup.md rename to _content/redirects/get-involved/costume-props-makeup.md index 4640095b..3ae3ced0 100644 --- a/_content/get-involved/costume-props-makeup.md +++ b/_content/redirects/get-involved/costume-props-makeup.md @@ -1,5 +1,5 @@ --- title: Costume, Props & Make-up -redirect_from: /get-involved/costume-props-makeup +permalink: /get-involved/costume-props-makeup redirect_to: /get-involved/#costume-props-and-make-up --- diff --git a/_content/get-involved/direct.md b/_content/redirects/get-involved/direct.md similarity index 62% rename from _content/get-involved/direct.md rename to _content/redirects/get-involved/direct.md index 929d1843..b95e7641 100644 --- a/_content/get-involved/direct.md +++ b/_content/redirects/get-involved/direct.md @@ -1,5 +1,5 @@ --- title: Direct -redirect_from: /get-involved/direct +permalink: /get-involved/direct redirect_to: /get-involved/#directing --- diff --git a/_content/get-involved/index.md b/_content/redirects/get-involved/index.md similarity index 100% rename from _content/get-involved/index.md rename to _content/redirects/get-involved/index.md diff --git a/_content/get-involved/lx.md b/_content/redirects/get-involved/lx.md similarity index 65% rename from _content/get-involved/lx.md rename to _content/redirects/get-involved/lx.md index 405abae8..6a599b1e 100644 --- a/_content/get-involved/lx.md +++ b/_content/redirects/get-involved/lx.md @@ -1,5 +1,5 @@ --- title: Lighting Design -redirect_from: /get-involved/lighting/ +permalink: /get-involved/lighting/ redirect_to: /get-involved/#lighting-design --- diff --git a/_content/get-involved/marketing.md b/_content/redirects/get-involved/marketing.md similarity index 65% rename from _content/get-involved/marketing.md rename to _content/redirects/get-involved/marketing.md index 261d2264..33b1f8d2 100644 --- a/_content/get-involved/marketing.md +++ b/_content/redirects/get-involved/marketing.md @@ -1,5 +1,5 @@ --- title: Marketing -redirect_from: /get-involved/publicise/ +permalink: /get-involved/publicise/ redirect_to: /get-involved/#marketing-and-publicity --- diff --git a/_content/get-involved/produce.md b/_content/redirects/get-involved/produce.md similarity index 98% rename from _content/get-involved/produce.md rename to _content/redirects/get-involved/produce.md index 0a691935..a6239bac 100644 --- a/_content/get-involved/produce.md +++ b/_content/redirects/get-involved/produce.md @@ -1,6 +1,6 @@ --- title: Produce -redirect_from: /get-involved/produce +permalink: /get-involved/produce redirect_to: /get-involved/#producing --- diff --git a/_content/get-involved/set.md b/_content/redirects/get-involved/set.md similarity index 56% rename from _content/get-involved/set.md rename to _content/redirects/get-involved/set.md index dd6554cf..b31ca5ba 100644 --- a/_content/get-involved/set.md +++ b/_content/redirects/get-involved/set.md @@ -1,5 +1,5 @@ --- title: Set -redirect_from: get-involved/set-design +permalink: get-involved/set-design redirect_to: /get-involved/#set --- diff --git a/_content/get-involved/sm.md b/_content/redirects/get-involved/sm.md similarity index 62% rename from _content/get-involved/sm.md rename to _content/redirects/get-involved/sm.md index 5af59ef0..b3a81528 100644 --- a/_content/get-involved/sm.md +++ b/_content/redirects/get-involved/sm.md @@ -1,5 +1,5 @@ --- title: Stage Manage -redirect_from: /get-involved/stage-manage/ +permalink: /get-involved/stage-manage/ redirect_to: /get-involved/#stage-management --- diff --git a/_content/get-involved/sound.md b/_content/redirects/get-involved/sound.md similarity index 59% rename from _content/get-involved/sound.md rename to _content/redirects/get-involved/sound.md index 2ba32736..dd1f5fad 100644 --- a/_content/get-involved/sound.md +++ b/_content/redirects/get-involved/sound.md @@ -1,5 +1,5 @@ --- title: Sound -redirect_from: /get-involved/sound-design/ +permalink: /get-involved/sound-design/ redirect_to: /get-involved/#sound-design --- diff --git a/_content/get-involved/tech.md b/_content/redirects/get-involved/tech.md similarity index 60% rename from _content/get-involved/tech.md rename to _content/redirects/get-involved/tech.md index 88f20149..4cd7c740 100644 --- a/_content/get-involved/tech.md +++ b/_content/redirects/get-involved/tech.md @@ -1,5 +1,5 @@ --- title: Tech -redirect_from: /get-involved/tech +permalink: /get-involved/tech redirect_to: /get-involved/#tech --- diff --git a/_content/get-involved/write.md b/_content/redirects/get-involved/write.md similarity index 61% rename from _content/get-involved/write.md rename to _content/redirects/get-involved/write.md index fa9aa8ad..04ff39f4 100644 --- a/_content/get-involved/write.md +++ b/_content/redirects/get-involved/write.md @@ -1,5 +1,5 @@ --- title: Write -redirect_from: /get-involved/write +permalink: /get-involved/write redirect_to: /get-involved/#writing --- diff --git a/_content/mailinglist.md b/_content/redirects/mailinglist.md similarity index 54% rename from _content/mailinglist.md rename to _content/redirects/mailinglist.md index 6f7eeb1c..914b7953 100644 --- a/_content/mailinglist.md +++ b/_content/redirects/mailinglist.md @@ -1,5 +1,10 @@ --- title: Mailing List redirect_to: https://newtheatre.us3.list-manage.com/subscribe?u=ce5311ce46fe45638f90f4022&id=da4b88f76e +permalink: /mailinglist +redirect_from: + - /mailing-list + - /about-us/mailinglist + - /about-us/mailing-list --- From 7afd3b433b10ae748c57eb04169bd6aff2710d14 Mon Sep 17 00:00:00 2001 From: Sam Osborne Date: Thu, 18 Feb 2021 23:43:27 +0000 Subject: [PATCH 2/6] Update Forestry template to match new format --- .forestry/front_matter/templates/redirect.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.forestry/front_matter/templates/redirect.yml b/.forestry/front_matter/templates/redirect.yml index b033e38a..b2b4f7f4 100644 --- a/.forestry/front_matter/templates/redirect.yml +++ b/.forestry/front_matter/templates/redirect.yml @@ -5,17 +5,25 @@ fields: - type: text name: title label: Title - description: The title of your post + description: The title of the page config: required: true - type: text + name: permalink + label: permalink + description: The link to this page (probably the same as redirect_from) + config: + required: true +- type: list name: redirect_from label: Redirect from description: Other NNT links which will redirect to this page - type: text name: redirect_to label: Redirect to - description: 'Another URL that this page will link to ' + description: 'Another URL that this page will link to' + config: + required: true pages: - _content/assassins.md - _content/festival-staff-site.md From 2b92af97536d94309aeaba506d760b53252227f3 Mon Sep 17 00:00:00 2001 From: Sam Osborne Date: Fri, 19 Feb 2021 10:33:14 +0000 Subject: [PATCH 3/6] Re-enable mailing list Oops --- _content/redirects/about-us/{_mailinglist.md => mailinglist.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _content/redirects/about-us/{_mailinglist.md => mailinglist.md} (100%) diff --git a/_content/redirects/about-us/_mailinglist.md b/_content/redirects/about-us/mailinglist.md similarity index 100% rename from _content/redirects/about-us/_mailinglist.md rename to _content/redirects/about-us/mailinglist.md From f4530f1ec5e6c5f6962cdc605347df95ae573d06 Mon Sep 17 00:00:00 2001 From: Sam Osborne Date: Fri, 19 Feb 2021 10:37:29 +0000 Subject: [PATCH 4/6] =?UTF-8?q?Trailing=20slashes=20=F0=9F=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _content/redirects/mailinglist.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_content/redirects/mailinglist.md b/_content/redirects/mailinglist.md index 914b7953..f2b5716e 100644 --- a/_content/redirects/mailinglist.md +++ b/_content/redirects/mailinglist.md @@ -1,10 +1,10 @@ --- title: Mailing List redirect_to: https://newtheatre.us3.list-manage.com/subscribe?u=ce5311ce46fe45638f90f4022&id=da4b88f76e -permalink: /mailinglist +permalink: /mailinglist/ redirect_from: - - /mailing-list - - /about-us/mailinglist - - /about-us/mailing-list + - /mailing-list/ + - /about-us/mailinglist/ + - /about-us/mailing-list/ --- From fc73ee01a9f3b0bd1f6576293ac9e107beb55b73 Mon Sep 17 00:00:00 2001 From: Sam Osborne Date: Fri, 19 Feb 2021 10:46:54 +0000 Subject: [PATCH 5/6] ALL the trailing slashes --- _content/redirects/assassins.md | 2 +- _content/redirects/festival-staff-site.md | 2 +- _content/redirects/get-involved/act.md | 2 +- _content/redirects/get-involved/costume-props-makeup.md | 2 +- _content/redirects/get-involved/direct.md | 2 +- _content/redirects/get-involved/produce.md | 2 +- _content/redirects/get-involved/set.md | 2 +- _content/redirects/get-involved/tech.md | 2 +- _content/redirects/get-involved/write.md | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_content/redirects/assassins.md b/_content/redirects/assassins.md index f19bc11e..e047d5cc 100644 --- a/_content/redirects/assassins.md +++ b/_content/redirects/assassins.md @@ -1,6 +1,6 @@ --- title: 'Assassins' -permalink: '/assassins' +permalink: '/assassins/' redirect_to: https://docs.google.com/forms/d/e/1FAIpQLSf3s7bkjV9GEIZiMMoaxgM06yb7W7HrAPjd1zyKF7IJAJE1-Q/viewform date: 2019-04-10 14:11:49 +0000 diff --git a/_content/redirects/festival-staff-site.md b/_content/redirects/festival-staff-site.md index 425ee220..ccc3aa35 100644 --- a/_content/redirects/festival-staff-site.md +++ b/_content/redirects/festival-staff-site.md @@ -1,6 +1,6 @@ --- title: festival -permalink: "/festival" +permalink: "/festival/" redirect_to: https://nt-festival.herokuapp.com/ --- diff --git a/_content/redirects/get-involved/act.md b/_content/redirects/get-involved/act.md index 2e37f01c..8980af36 100644 --- a/_content/redirects/get-involved/act.md +++ b/_content/redirects/get-involved/act.md @@ -1,5 +1,5 @@ --- title: Act -permalink: /get-involved/act +permalink: /get-involved/act/ redirect_to: /get-involved/#acting --- \ No newline at end of file diff --git a/_content/redirects/get-involved/costume-props-makeup.md b/_content/redirects/get-involved/costume-props-makeup.md index 3ae3ced0..7b2fe7e6 100644 --- a/_content/redirects/get-involved/costume-props-makeup.md +++ b/_content/redirects/get-involved/costume-props-makeup.md @@ -1,5 +1,5 @@ --- title: Costume, Props & Make-up -permalink: /get-involved/costume-props-makeup +permalink: /get-involved/costume-props-makeup/ redirect_to: /get-involved/#costume-props-and-make-up --- diff --git a/_content/redirects/get-involved/direct.md b/_content/redirects/get-involved/direct.md index b95e7641..ecd8a1c2 100644 --- a/_content/redirects/get-involved/direct.md +++ b/_content/redirects/get-involved/direct.md @@ -1,5 +1,5 @@ --- title: Direct -permalink: /get-involved/direct +permalink: /get-involved/direct/ redirect_to: /get-involved/#directing --- diff --git a/_content/redirects/get-involved/produce.md b/_content/redirects/get-involved/produce.md index a6239bac..23248394 100644 --- a/_content/redirects/get-involved/produce.md +++ b/_content/redirects/get-involved/produce.md @@ -1,6 +1,6 @@ --- title: Produce -permalink: /get-involved/produce +permalink: /get-involved/produce/ redirect_to: /get-involved/#producing --- diff --git a/_content/redirects/get-involved/set.md b/_content/redirects/get-involved/set.md index b31ca5ba..689a1663 100644 --- a/_content/redirects/get-involved/set.md +++ b/_content/redirects/get-involved/set.md @@ -1,5 +1,5 @@ --- title: Set -permalink: get-involved/set-design +permalink: /get-involved/set-design/ redirect_to: /get-involved/#set --- diff --git a/_content/redirects/get-involved/tech.md b/_content/redirects/get-involved/tech.md index 4cd7c740..878ee402 100644 --- a/_content/redirects/get-involved/tech.md +++ b/_content/redirects/get-involved/tech.md @@ -1,5 +1,5 @@ --- title: Tech -permalink: /get-involved/tech +permalink: /get-involved/tech/ redirect_to: /get-involved/#tech --- diff --git a/_content/redirects/get-involved/write.md b/_content/redirects/get-involved/write.md index 04ff39f4..de06f71c 100644 --- a/_content/redirects/get-involved/write.md +++ b/_content/redirects/get-involved/write.md @@ -1,5 +1,5 @@ --- title: Write -permalink: /get-involved/write +permalink: /get-involved/write/ redirect_to: /get-involved/#writing --- From 11b4528ef0fc2b0573bbc09ca9f501e3d7088452 Mon Sep 17 00:00:00 2001 From: Cae2k <128086704+Cae2k@users.noreply.github.com> Date: Fri, 26 May 2023 21:17:10 +0100 Subject: [PATCH 6/6] Update pricing.yml Some pricing changes to STUFF --- _data/pricing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/pricing.yml b/_data/pricing.yml index 3802fe2a..3f7effbc 100644 --- a/_data/pricing.yml +++ b/_data/pricing.yml @@ -13,7 +13,7 @@ pricing: type: fringe - stuff: 3 type: stuff - - stuff-day-pass: 15 + - stuff-day-pass: 10 type: stuff - - stuff-festival-pass: 25 + - stuff-festival-pass: 15 type: stuff