From 9ab6f688773174e166e42724dfa63307c986d8c9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:25:52 +0100 Subject: [PATCH] Added talk.html.twig --- app/config/sculpin_kernel.yml | 1 - publish.sh | 10 ++++++++++ .../2012-09-05-what-is-this-drupal-thing.md | 1 + source/_talks/2013-07-10-ldap.md | 1 + source/_talks/2014-03-01-git-flow.md | 1 + .../2014-07-02-drush-make-drupalbristol.md | 1 + source/_talks/2014-08-19-drupal-association.md | 1 + ...015-01-18-drupalorg-2015-whats-coming-next.md | 1 + ...015-02-28-drupalorg-2015-whats-coming-next.md | 1 + source/_talks/2015-04-08-drupal-8.md | 1 + source/talks.html.twig | 16 +--------------- .../opdavies/opdavies/_layouts/talk.html.twig | 8 ++++++++ 12 files changed, 27 insertions(+), 16 deletions(-) create mode 100755 publish.sh create mode 100644 source/themes/opdavies/opdavies/_layouts/talk.html.twig diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index c209271c..48422e29 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -16,7 +16,6 @@ sculpin_content_types: - tags enabled: false talks: - layout: default permalink: talks/:year/:month/:day/:slug_title/ taxonomies: - tags diff --git a/publish.sh b/publish.sh new file mode 100755 index 00000000..acb4551b --- /dev/null +++ b/publish.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SERVER_NAME="root@212.111.40.238" +DOCROOT="/var/www/html/oliverdavies.co.uk/htdocs" + +sculpin generate --env=prod +if [ $? -ne 0 ]; then echo "Could not generate the site"; exit 1; fi + +rsync -avze 'ssh' --delete output_prod/ ${SERVER_NAME}:${DOCROOT} +if [ $? -ne 0 ]; then echo "Could not publish the site"; exit 1; fi diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing.md b/source/_talks/2012-09-05-what-is-this-drupal-thing.md index ad230fbf..1c600236 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md @@ -1,5 +1,6 @@ --- title: So, what is this Drupal thing? location: unified.diff +nav: talks --- An introduction to [Drupal](https://www.drupal.org). \ No newline at end of file diff --git a/source/_talks/2013-07-10-ldap.md b/source/_talks/2013-07-10-ldap.md index 53b7df16..28ad81d5 100644 --- a/source/_talks/2013-07-10-ldap.md +++ b/source/_talks/2013-07-10-ldap.md @@ -7,5 +7,6 @@ tags: - ldap meta: description: 'Integrating Drupal with LDAP.' +nav: talks --- An overview of the [Drupal LDAP module](https://www.drupal.org/project/ldap) and how I integrated and customised it for a client project. \ No newline at end of file diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 072c4c69..2b62f12a 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -10,4 +10,5 @@ tags: meta: description: slug: git-flow +nav: talks --- diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index a697aabf..c34b4826 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -9,5 +9,6 @@ tags: - drush-make meta: description: 'An introduction to Drush and Drush Make.' +nav: talks --- An introduction to Drush and Drush Make. \ No newline at end of file diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md index dfe0aefe..f47db5ab 100644 --- a/source/_talks/2014-08-19-drupal-association.md +++ b/source/_talks/2014-08-19-drupal-association.md @@ -8,5 +8,6 @@ tags: meta: description: "An impromptu talk about the Drupal Association and I've done there since joining the team." slug: drupal-association +nav: talks --- An impromptu talk about the [Drupal Association](https://assoc.drupal.org) and I've done there since joining the team. \ No newline at end of file diff --git a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md index 03fb11c9..31c0450a 100644 --- a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md @@ -10,4 +10,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupalorg-2015 +nav: talks --- diff --git a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md index da9f2c0b..fdd10070 100644 --- a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md @@ -10,4 +10,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupalorg-2015 +nav: talks --- diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index 64d56fa6..b88570ed 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -11,4 +11,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupal-8 +nav: talks --- diff --git a/source/talks.html.twig b/source/talks.html.twig index 782f85a6..0d9596c3 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -39,18 +39,4 @@ use: {% endfor %} {% if found %} -{% endif %} -======= -use: - - talks ---- - -

Talks

- -
- {% for talk in data.talks %} -
{{ talk.date|date('F Y') }} - {{ talk.location|raw }}
-
{{ talk.title }}
- {% endfor %} -
->>>>>>> Replaced talks.md with talks.html.twig +{% endif %} \ No newline at end of file diff --git a/source/themes/opdavies/opdavies/_layouts/talk.html.twig b/source/themes/opdavies/opdavies/_layouts/talk.html.twig new file mode 100644 index 00000000..00938bc1 --- /dev/null +++ b/source/themes/opdavies/opdavies/_layouts/talk.html.twig @@ -0,0 +1,8 @@ +{% extends 'default' %} + +{% block content_wrapper %} +
+

{{ page.title }}

+ {% block content %}{% endblock %} +
{# .col-md-9 #} +{% endblock %} \ No newline at end of file