diff --git a/.gitmodules b/.gitmodules index 6d2e1ab4..54fcd4a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "source/_pages/atdc"] - path = source/_pages/atdc +[submodule "source/atdc"] + path = source/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 0aecf530..49f6e123 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -2,8 +2,6 @@ sculpin_content_types: daily_emails: permalink: /daily/:year/:month/:day/:basename/ - pages: - permalink: /:basename/ podcast_episodes: permalink: /podcast/:basename/ posts: diff --git a/source/_pages/404.md b/source/404.md similarity index 97% rename from source/_pages/404.md rename to source/404.md index 1074a585..8a588c3b 100644 --- a/source/_pages/404.md +++ b/source/404.md @@ -1,4 +1,5 @@ --- +layout: page title: Page not found --- diff --git a/source/_pages/atdc b/source/_pages/atdc deleted file mode 160000 index f31e5c43..00000000 --- a/source/_pages/atdc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f31e5c4364890b2a31b3acd961f78565ad822de9 diff --git a/source/_pages/archive.html b/source/archive.html similarity index 100% rename from source/_pages/archive.html rename to source/archive.html diff --git a/source/_pages/atdc-welcome.md b/source/atdc-welcome.md similarity index 100% rename from source/_pages/atdc-welcome.md rename to source/atdc-welcome.md diff --git a/source/_pages/atdc.md b/source/atdc.md similarity index 98% rename from source/_pages/atdc.md rename to source/atdc.md index 1d03c50a..d311992a 100644 --- a/source/_pages/atdc.md +++ b/source/atdc.md @@ -1,4 +1,5 @@ --- +layout: page title: Introduction to Automated Testing in Drupal email course --- diff --git a/source/_pages/bcm.md b/source/bcm.md similarity index 100% rename from source/_pages/bcm.md rename to source/bcm.md diff --git a/source/_pages/bco.md b/source/bco.md similarity index 100% rename from source/_pages/bco.md rename to source/bco.md diff --git a/source/_pages/brumphp.md b/source/brumphp.md similarity index 100% rename from source/_pages/brumphp.md rename to source/brumphp.md diff --git a/source/_pages/build-configs.md b/source/build-configs.md similarity index 100% rename from source/_pages/build-configs.md rename to source/build-configs.md diff --git a/source/_pages/call.html.twig b/source/call.html.twig similarity index 100% rename from source/_pages/call.html.twig rename to source/call.html.twig diff --git a/source/_pages/contact.md b/source/contact.md similarity index 100% rename from source/_pages/contact.md rename to source/contact.md diff --git a/source/_pages/daily.md b/source/daily.md similarity index 98% rename from source/_pages/daily.md rename to source/daily.md index 526ee406..1e18499a 100644 --- a/source/_pages/daily.md +++ b/source/daily.md @@ -1,4 +1,5 @@ --- +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/_pages/dcg.md b/source/dcg.md similarity index 100% rename from source/_pages/dcg.md rename to source/dcg.md diff --git a/source/_pages/drupal-london.md b/source/drupal-london.md similarity index 100% rename from source/_pages/drupal-london.md rename to source/drupal-london.md diff --git a/source/_pages/drupal-upgrade.md b/source/drupal-upgrade.md similarity index 100% rename from source/_pages/drupal-upgrade.md rename to source/drupal-upgrade.md diff --git a/source/_pages/drupalcamp-ghent.md b/source/drupalcamp-ghent.md similarity index 100% rename from source/_pages/drupalcamp-ghent.md rename to source/drupalcamp-ghent.md diff --git a/source/_pages/drupalgive.md b/source/drupalgive.md similarity index 100% rename from source/_pages/drupalgive.md rename to source/drupalgive.md diff --git a/source/_pages/dto.md b/source/dto.md similarity index 100% rename from source/_pages/dto.md rename to source/dto.md diff --git a/source/_pages/glossary.html.twig b/source/glossary.html.twig similarity index 100% rename from source/_pages/glossary.html.twig rename to source/glossary.html.twig diff --git a/source/_pages/index.html.twig b/source/index.html.twig similarity index 100% rename from source/_pages/index.html.twig rename to source/index.html.twig diff --git a/source/_pages/mob.md b/source/mob.md similarity index 100% rename from source/_pages/mob.md rename to source/mob.md diff --git a/source/_pages/new.md b/source/new.md similarity index 100% rename from source/_pages/new.md rename to source/new.md diff --git a/source/_pages/pair.html.twig b/source/pair.html.twig similarity index 100% rename from source/_pages/pair.html.twig rename to source/pair.html.twig diff --git a/source/_pages/phpberks.md b/source/phpberks.md similarity index 100% rename from source/_pages/phpberks.md rename to source/phpberks.md diff --git a/source/_pages/podcast.md b/source/podcast.md similarity index 100% rename from source/_pages/podcast.md rename to source/podcast.md diff --git a/source/_pages/presentations.html.twig b/source/presentations.html.twig similarity index 100% rename from source/_pages/presentations.html.twig rename to source/presentations.html.twig diff --git a/source/_pages/press.md b/source/press.md similarity index 100% rename from source/_pages/press.md rename to source/press.md diff --git a/source/_pages/pricing.md b/source/pricing.md similarity index 100% rename from source/_pages/pricing.md rename to source/pricing.md diff --git a/source/_pages/search.html.twig b/source/search.html.twig similarity index 100% rename from source/_pages/search.html.twig rename to source/search.html.twig diff --git a/source/_pages/sfs.md b/source/sfs.md similarity index 100% rename from source/_pages/sfs.md rename to source/sfs.md diff --git a/source/_pages/speaker.md b/source/speaker.md similarity index 100% rename from source/_pages/speaker.md rename to source/speaker.md diff --git a/source/_pages/testimonials.md b/source/testimonials.md similarity index 100% rename from source/_pages/testimonials.md rename to source/testimonials.md diff --git a/source/_pages/things-about-php.md b/source/things-about-php.md similarity index 100% rename from source/_pages/things-about-php.md rename to source/things-about-php.md diff --git a/source/_pages/welcome.md b/source/welcome.md similarity index 100% rename from source/_pages/welcome.md rename to source/welcome.md