From 4756cdb4095577d06f095b6d19ccda168a45d49e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 22 Dec 2024 01:28:25 +0000 Subject: [PATCH] Revert "Move pages, remove the page content type" This reverts commit e4a779fc45b5f826cf504ebfa925cc8f44c5c205. --- .gitmodules | 4 ++-- app/config/sculpin_kernel.yml | 2 ++ source/{ => _pages}/404.md | 1 - source/{ => _pages}/archive.html | 0 source/_pages/atdc | 1 + source/{ => _pages}/atdc-welcome.md | 0 source/{ => _pages}/atdc.md | 1 - source/{ => _pages}/bcm.md | 0 source/{ => _pages}/bco.md | 0 source/{ => _pages}/brumphp.md | 0 source/{ => _pages}/build-configs.md | 0 source/{ => _pages}/call.html.twig | 0 source/{ => _pages}/contact.md | 0 source/{ => _pages}/daily.md | 1 - source/{ => _pages}/dcg.md | 0 source/{ => _pages}/drupal-london.md | 0 source/{ => _pages}/drupal-upgrade.md | 0 source/{ => _pages}/drupalcamp-ghent.md | 0 source/{ => _pages}/drupalgive.md | 0 source/{ => _pages}/dto.md | 0 source/{ => _pages}/glossary.html.twig | 0 source/{ => _pages}/index.html.twig | 0 source/{ => _pages}/mob.md | 0 source/{ => _pages}/new.md | 0 source/{ => _pages}/pair.html.twig | 0 source/{ => _pages}/phpberks.md | 0 source/{ => _pages}/podcast.md | 0 source/{ => _pages}/presentations.html.twig | 0 source/{ => _pages}/press.md | 0 source/{ => _pages}/pricing.md | 0 source/{ => _pages}/search.html.twig | 0 source/{ => _pages}/sfs.md | 0 source/{ => _pages}/speaker.md | 0 source/{ => _pages}/testimonials.md | 0 source/{ => _pages}/things-about-php.md | 0 source/{ => _pages}/welcome.md | 0 36 files changed, 5 insertions(+), 5 deletions(-) rename source/{ => _pages}/404.md (97%) rename source/{ => _pages}/archive.html (100%) create mode 160000 source/_pages/atdc rename source/{ => _pages}/atdc-welcome.md (100%) rename source/{ => _pages}/atdc.md (98%) rename source/{ => _pages}/bcm.md (100%) rename source/{ => _pages}/bco.md (100%) rename source/{ => _pages}/brumphp.md (100%) rename source/{ => _pages}/build-configs.md (100%) rename source/{ => _pages}/call.html.twig (100%) rename source/{ => _pages}/contact.md (100%) rename source/{ => _pages}/daily.md (98%) rename source/{ => _pages}/dcg.md (100%) rename source/{ => _pages}/drupal-london.md (100%) rename source/{ => _pages}/drupal-upgrade.md (100%) rename source/{ => _pages}/drupalcamp-ghent.md (100%) rename source/{ => _pages}/drupalgive.md (100%) rename source/{ => _pages}/dto.md (100%) rename source/{ => _pages}/glossary.html.twig (100%) rename source/{ => _pages}/index.html.twig (100%) rename source/{ => _pages}/mob.md (100%) rename source/{ => _pages}/new.md (100%) rename source/{ => _pages}/pair.html.twig (100%) rename source/{ => _pages}/phpberks.md (100%) rename source/{ => _pages}/podcast.md (100%) rename source/{ => _pages}/presentations.html.twig (100%) rename source/{ => _pages}/press.md (100%) rename source/{ => _pages}/pricing.md (100%) rename source/{ => _pages}/search.html.twig (100%) rename source/{ => _pages}/sfs.md (100%) rename source/{ => _pages}/speaker.md (100%) rename source/{ => _pages}/testimonials.md (100%) rename source/{ => _pages}/things-about-php.md (100%) rename source/{ => _pages}/welcome.md (100%) diff --git a/.gitmodules b/.gitmodules index 54fcd4a9..6d2e1ab4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "source/atdc"] - path = source/atdc +[submodule "source/_pages/atdc"] + path = source/_pages/atdc url = git@github.com:opdavies/atdc-pages.git branch = main diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 49f6e123..0aecf530 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -2,6 +2,8 @@ sculpin_content_types: daily_emails: permalink: /daily/:year/:month/:day/:basename/ + pages: + permalink: /:basename/ podcast_episodes: permalink: /podcast/:basename/ posts: diff --git a/source/404.md b/source/_pages/404.md similarity index 97% rename from source/404.md rename to source/_pages/404.md index 8a588c3b..1074a585 100644 --- a/source/404.md +++ b/source/_pages/404.md @@ -1,5 +1,4 @@ --- -layout: page title: Page not found --- diff --git a/source/archive.html b/source/_pages/archive.html similarity index 100% rename from source/archive.html rename to source/_pages/archive.html diff --git a/source/_pages/atdc b/source/_pages/atdc new file mode 160000 index 00000000..f31e5c43 --- /dev/null +++ b/source/_pages/atdc @@ -0,0 +1 @@ +Subproject commit f31e5c4364890b2a31b3acd961f78565ad822de9 diff --git a/source/atdc-welcome.md b/source/_pages/atdc-welcome.md similarity index 100% rename from source/atdc-welcome.md rename to source/_pages/atdc-welcome.md diff --git a/source/atdc.md b/source/_pages/atdc.md similarity index 98% rename from source/atdc.md rename to source/_pages/atdc.md index d311992a..1d03c50a 100644 --- a/source/atdc.md +++ b/source/_pages/atdc.md @@ -1,5 +1,4 @@ --- -layout: page title: Introduction to Automated Testing in Drupal email course --- diff --git a/source/bcm.md b/source/_pages/bcm.md similarity index 100% rename from source/bcm.md rename to source/_pages/bcm.md diff --git a/source/bco.md b/source/_pages/bco.md similarity index 100% rename from source/bco.md rename to source/_pages/bco.md diff --git a/source/brumphp.md b/source/_pages/brumphp.md similarity index 100% rename from source/brumphp.md rename to source/_pages/brumphp.md diff --git a/source/build-configs.md b/source/_pages/build-configs.md similarity index 100% rename from source/build-configs.md rename to source/_pages/build-configs.md diff --git a/source/call.html.twig b/source/_pages/call.html.twig similarity index 100% rename from source/call.html.twig rename to source/_pages/call.html.twig diff --git a/source/contact.md b/source/_pages/contact.md similarity index 100% rename from source/contact.md rename to source/_pages/contact.md diff --git a/source/daily.md b/source/_pages/daily.md similarity index 98% rename from source/daily.md rename to source/_pages/daily.md index 1e18499a..526ee406 100644 --- a/source/daily.md +++ b/source/_pages/daily.md @@ -1,5 +1,4 @@ --- -layout: page title: Sign up for the Daily Drupaler Email List meta: title: The Daily Drupaler - Daily Software Development Thoughts and Tips | %site.name% diff --git a/source/dcg.md b/source/_pages/dcg.md similarity index 100% rename from source/dcg.md rename to source/_pages/dcg.md diff --git a/source/drupal-london.md b/source/_pages/drupal-london.md similarity index 100% rename from source/drupal-london.md rename to source/_pages/drupal-london.md diff --git a/source/drupal-upgrade.md b/source/_pages/drupal-upgrade.md similarity index 100% rename from source/drupal-upgrade.md rename to source/_pages/drupal-upgrade.md diff --git a/source/drupalcamp-ghent.md b/source/_pages/drupalcamp-ghent.md similarity index 100% rename from source/drupalcamp-ghent.md rename to source/_pages/drupalcamp-ghent.md diff --git a/source/drupalgive.md b/source/_pages/drupalgive.md similarity index 100% rename from source/drupalgive.md rename to source/_pages/drupalgive.md diff --git a/source/dto.md b/source/_pages/dto.md similarity index 100% rename from source/dto.md rename to source/_pages/dto.md diff --git a/source/glossary.html.twig b/source/_pages/glossary.html.twig similarity index 100% rename from source/glossary.html.twig rename to source/_pages/glossary.html.twig diff --git a/source/index.html.twig b/source/_pages/index.html.twig similarity index 100% rename from source/index.html.twig rename to source/_pages/index.html.twig diff --git a/source/mob.md b/source/_pages/mob.md similarity index 100% rename from source/mob.md rename to source/_pages/mob.md diff --git a/source/new.md b/source/_pages/new.md similarity index 100% rename from source/new.md rename to source/_pages/new.md diff --git a/source/pair.html.twig b/source/_pages/pair.html.twig similarity index 100% rename from source/pair.html.twig rename to source/_pages/pair.html.twig diff --git a/source/phpberks.md b/source/_pages/phpberks.md similarity index 100% rename from source/phpberks.md rename to source/_pages/phpberks.md diff --git a/source/podcast.md b/source/_pages/podcast.md similarity index 100% rename from source/podcast.md rename to source/_pages/podcast.md diff --git a/source/presentations.html.twig b/source/_pages/presentations.html.twig similarity index 100% rename from source/presentations.html.twig rename to source/_pages/presentations.html.twig diff --git a/source/press.md b/source/_pages/press.md similarity index 100% rename from source/press.md rename to source/_pages/press.md diff --git a/source/pricing.md b/source/_pages/pricing.md similarity index 100% rename from source/pricing.md rename to source/_pages/pricing.md diff --git a/source/search.html.twig b/source/_pages/search.html.twig similarity index 100% rename from source/search.html.twig rename to source/_pages/search.html.twig diff --git a/source/sfs.md b/source/_pages/sfs.md similarity index 100% rename from source/sfs.md rename to source/_pages/sfs.md diff --git a/source/speaker.md b/source/_pages/speaker.md similarity index 100% rename from source/speaker.md rename to source/_pages/speaker.md diff --git a/source/testimonials.md b/source/_pages/testimonials.md similarity index 100% rename from source/testimonials.md rename to source/_pages/testimonials.md diff --git a/source/things-about-php.md b/source/_pages/things-about-php.md similarity index 100% rename from source/things-about-php.md rename to source/_pages/things-about-php.md diff --git a/source/welcome.md b/source/_pages/welcome.md similarity index 100% rename from source/welcome.md rename to source/_pages/welcome.md