From 62611d95414ebb272b81bc565daa0c7646a3727c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:07:32 +0100 Subject: [PATCH 01/11] Use more variables --- build.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 1cb5ab5a..91255065 100755 --- a/build.sh +++ b/build.sh @@ -2,22 +2,28 @@ set -x -rm -rf ./output_prod -/usr/local/bin/sculpin generate --env=prod +SCULPIN='/usr/local/bin/sculpin' +ENV='prod' +REPO='git@github.com:opdavies/opdavies.github.io.git' +BRANCH='master' +BUILD_DIR='./gh-pages-deployment/' + +rm -rf ./output_${ENV} +${SCULPIN} generate --env=${ENV} LOG=$(git log --oneline -n 1) -rm -rf ./gh-pages-deployment/ -git clone git@github.com:opdavies/opdavies.github.io.git ./gh-pages-deployment/ +rm -rf ${BUILD_DIR} +git clone ${REPO} ${BUILD_DIR} -pushd ./gh-pages-deployment/ +pushd ${BUILD_DIR} -git checkout -B master +git checkout -B ${BRANCH} -rsync --quiet --archive --filter="P .git*" --delete ../output_prod/ ./ +rsync --quiet --archive --filter="P .git*" --delete ../output_${ENV}/ ./ git add -A . git commit -m "${LOG}" -git push origin master --force +git push origin ${BRANCH} --force popd \ No newline at end of file From ea5bcd6cb301c7db6882448d35ac7c5a420c5a1e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:15:05 +0100 Subject: [PATCH 02/11] Removed some empty lines --- build.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.sh b/build.sh index 91255065..7875f052 100755 --- a/build.sh +++ b/build.sh @@ -17,13 +17,9 @@ rm -rf ${BUILD_DIR} git clone ${REPO} ${BUILD_DIR} pushd ${BUILD_DIR} - git checkout -B ${BRANCH} - rsync --quiet --archive --filter="P .git*" --delete ../output_${ENV}/ ./ - git add -A . git commit -m "${LOG}" git push origin ${BRANCH} --force - popd \ No newline at end of file From 545ad1eb830638cae4586b70d3c4b318896e8c84 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:31:44 +0100 Subject: [PATCH 03/11] Removed path to sculpin --- build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 7875f052..8d04a2af 100755 --- a/build.sh +++ b/build.sh @@ -2,14 +2,13 @@ set -x -SCULPIN='/usr/local/bin/sculpin' ENV='prod' REPO='git@github.com:opdavies/opdavies.github.io.git' BRANCH='master' BUILD_DIR='./gh-pages-deployment/' rm -rf ./output_${ENV} -${SCULPIN} generate --env=${ENV} +sculpin generate --env=${ENV} LOG=$(git log --oneline -n 1) From 545d07304f42007fbe84c585eba31c59f7b47201 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:46:55 +0100 Subject: [PATCH 04/11] Renamed build.sh to deploy.sh --- build.sh => deploy.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build.sh => deploy.sh (100%) diff --git a/build.sh b/deploy.sh similarity index 100% rename from build.sh rename to deploy.sh From 9d8478b88621ac66c77802cfb92959889bda3d49 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:51:45 +0100 Subject: [PATCH 05/11] Added 404.md --- source/_examples/404.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 source/_examples/404.md diff --git a/source/_examples/404.md b/source/_examples/404.md new file mode 100644 index 00000000..37fc0df1 --- /dev/null +++ b/source/_examples/404.md @@ -0,0 +1,5 @@ +--- +layout: default +title: Page Not Found +--- +# Page Not Found \ No newline at end of file From 91858d0346d7c9883cadc6ff44e64b3ed8082f48 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:52:59 +0100 Subject: [PATCH 06/11] Wrong location --- source/{_examples => }/404.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename source/{_examples => }/404.md (100%) diff --git a/source/_examples/404.md b/source/404.md similarity index 100% rename from source/_examples/404.md rename to source/404.md From d54221b67b52b1c443f00fc545434adcbd86e368 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 17:55:51 +0100 Subject: [PATCH 07/11] Added permalink --- source/404.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/404.md b/source/404.md index 37fc0df1..ddea14fa 100644 --- a/source/404.md +++ b/source/404.md @@ -1,5 +1,6 @@ --- layout: default title: Page Not Found +permalink: /404.html --- # Page Not Found \ No newline at end of file From e54ad0cdaea557e00720bb64ffdf272be64523c2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 9 Apr 2015 18:00:02 +0100 Subject: [PATCH 08/11] Changed 404.md to 404.html.twig --- source/404.html.twig | 14 ++++++++++++++ source/404.md | 6 ------ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 source/404.html.twig delete mode 100644 source/404.md diff --git a/source/404.html.twig b/source/404.html.twig new file mode 100644 index 00000000..b4f147ec --- /dev/null +++ b/source/404.html.twig @@ -0,0 +1,14 @@ +--- +layout: default +title: Page Not Found +permalink: /404.html +--- +{% block content_wrapper %} +
+ {% block content %} +

Page Not Found

+ {% endblock %} +
{# .col.md-12 #} +{% endblock %} + +{% block sidebar %}{% endblock %} \ No newline at end of file diff --git a/source/404.md b/source/404.md deleted file mode 100644 index ddea14fa..00000000 --- a/source/404.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: default -title: Page Not Found -permalink: /404.html ---- -# Page Not Found \ No newline at end of file From fcdd7a97c7ee4f3f6e70944ca7cc4fa25662171f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 08:10:35 +0100 Subject: [PATCH 09/11] Changed meta description --- source/themes/opdavies/opdavies/_layouts/default.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index 0e0af7b8..4d687280 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -4,7 +4,9 @@ - + {% if page.meta.description %} + + {% endif %} {% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }} From 109fb8225f008ac5ed74c459786565b287c8654c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 08:24:06 +0100 Subject: [PATCH 10/11] Added meta descriptions --- source/contact.md | 2 ++ source/index.md | 2 ++ source/services.md | 2 ++ source/talks.md | 2 ++ source/work.md | 2 ++ 5 files changed, 10 insertions(+) diff --git a/source/contact.md b/source/contact.md index 50a719f1..c5d2a3bf 100644 --- a/source/contact.md +++ b/source/contact.md @@ -4,6 +4,8 @@ title: Contact nav: contact use: - posts +meta: + description: 'Information about how to get in touch with Oliver.' --- # Contact diff --git a/source/index.md b/source/index.md index 7288df64..10c553f3 100644 --- a/source/index.md +++ b/source/index.md @@ -5,6 +5,8 @@ nav: about front: true use: - posts +meta: + description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.' --- # About diff --git a/source/services.md b/source/services.md index 659916d7..4bbad849 100644 --- a/source/services.md +++ b/source/services.md @@ -4,6 +4,8 @@ title: Services nav: services use: - posts +meta: + description: 'Information about freelance services that Oliver offers.' --- # Services diff --git a/source/talks.md b/source/talks.md index ec8658a0..f930e16c 100644 --- a/source/talks.md +++ b/source/talks.md @@ -4,6 +4,8 @@ title: Talks nav: talks use: - posts +meta: + description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups.' --- # Talks diff --git a/source/work.md b/source/work.md index ea994921..6bac007a 100644 --- a/source/work.md +++ b/source/work.md @@ -4,6 +4,8 @@ title: Work nav: work use: - posts +meta: + description: "Information about Oliver's current work." --- # Work From 7af5119c60a3e72a6cf537e66cc95477017a4deb Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 08:33:55 +0100 Subject: [PATCH 11/11] Added meta description for company information --- source/company-information.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/company-information.md b/source/company-information.md index 7cf583ec..a4c60e48 100644 --- a/source/company-information.md +++ b/source/company-information.md @@ -2,6 +2,8 @@ layout: default title: Company Information nav: company +meta: + description: 'Company information for Oliver Davies Ltd.' --- # Company Information