From 3bad9e4f6b55873bb11278770f77c126a24421e3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 11 Apr 2015 23:19:54 +0100 Subject: [PATCH 01/22] Added tags and made featured --- source/_projects/accessible-bristol.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/_projects/accessible-bristol.md b/source/_projects/accessible-bristol.md index 43b76c6c..ff152b0f 100644 --- a/source/_projects/accessible-bristol.md +++ b/source/_projects/accessible-bristol.md @@ -1,11 +1,13 @@ --- title: Accessible Bristol website: http://www.accessiblebristol.org +is_featured: true tags: - - Drupal 7 + - drupal + - drupal-7 + - accessibility --- - ## Modules used * [Features](https://www.drupal.org/project/features) From 70dd677df908045fd9980b7f300d029ec8ca6c7a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 11 Apr 2015 23:21:08 +0100 Subject: [PATCH 02/22] Added robots.txt --- source/robots.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 source/robots.txt diff --git a/source/robots.txt b/source/robots.txt new file mode 100644 index 00000000..fd9ac4fe --- /dev/null +++ b/source/robots.txt @@ -0,0 +1,3 @@ +User-agent: * +Disallow: /_projects/ +Disallow: /_testimonials/ \ No newline at end of file From 0a42d0a991779cef237f05274a180c0a98b052e8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 11 Apr 2015 23:21:48 +0100 Subject: [PATCH 03/22] Added tags to talks --- source/talks.html.twig | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/source/talks.html.twig b/source/talks.html.twig index bfbeafa8..df1eb614 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -10,27 +10,59 @@ talks: - date: 2012-09-05 location: unified.diff description: So, what is this Drupal thing? - an introduction to Drupal. + tags: + - meetup + - drupal - date: 2013-07-10 location: South Wales Drupal User Group description: An overview of the Drupal LDAP module and how I customised it for a client project. + tags: + - meetup + - drupal + - ldap - date: 2014-03-01 location: DrupalCamp London description: Never Commit to Master: An Introduction to Git Flow. + tags: + - conference + - drupalcamp + - git + - git-flow - date: 2014-07-02 location: Drupal Bristol User Group description: drush make drupalbristol: An introduction to Drush and Drush Make. + tags: + - meetup + - drush + - drush-make - date: 2014-08-09 location: South Wales Drupal User Group description: An impromptu talk about the Drupal Association and I've done there since joining the team. + tags: + - meetup + - drupal-association - date: 2015-01-18 location: DrupalCamp Brighton description: Drupal.org in 2015: What's coming next? + tags: + - conference + - drupalcamp + - drupalorg + - drupal-association - date: 2015-02-28 location: DrupalCamp London description: Drupal.org in 2015: What's coming next? + tags: + - conference + - drupalcamp + - drupalorg + - drupal-association - date: 2015-04-08 location: PHPSW description: Drupal 8 (lightning talk) + tags: + - drupal + - drupal-8 ---

Talks

From d7d9fb1a8d82528e9868615329b9c28954718944 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 08:13:43 +0100 Subject: [PATCH 04/22] Added sitemap.xml --- source/sitemap.html.twig | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 source/sitemap.html.twig diff --git a/source/sitemap.html.twig b/source/sitemap.html.twig new file mode 100644 index 00000000..89b98e45 --- /dev/null +++ b/source/sitemap.html.twig @@ -0,0 +1,22 @@ +--- +permalink: sitemap.xml +use: + - posts +--- + + + + {{ site.url }} + {{ site.calculated_date | date('Y-m-d') }} + daily + 0.8 + + {% for post in data.posts %} + + {{ site.url }}{{ post.url }} + {{ post.date|date('c') }} + weekly + 1.0 + + {% endfor %} + \ No newline at end of file From c6a122e0f2a1978c300a724ed8de3b8a7ed8f7b3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 08:24:06 +0100 Subject: [PATCH 05/22] Added sitemap URL to robots.txt --- source/robots.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/robots.txt b/source/robots.txt index fd9ac4fe..6d6f57e5 100644 --- a/source/robots.txt +++ b/source/robots.txt @@ -1,3 +1,8 @@ +--- +permalink: none +--- User-agent: * Disallow: /_projects/ -Disallow: /_testimonials/ \ No newline at end of file +Disallow: /_testimonials/ + +Sitemap: {{ site.url }}/sitemap.xml \ No newline at end of file From 63bd79f3c2c3a1e71b6bbd22f0861a8a1dc47ec1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 08:30:00 +0100 Subject: [PATCH 06/22] Renamed to sitemap.xml --- source/{sitemap.html.twig => sitemap.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename source/{sitemap.html.twig => sitemap.xml} (100%) diff --git a/source/sitemap.html.twig b/source/sitemap.xml similarity index 100% rename from source/sitemap.html.twig rename to source/sitemap.xml From 163bfc6131ad7b4f037fe030c57ccf3fadcd346e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 09:15:30 +0100 Subject: [PATCH 07/22] Added og tags --- .../_posts/2015-04-03-minimum-core-version.md | 5 +++ .../opdavies/_layouts/default.html.twig | 1 + .../opdavies/opdavies/_partials/og.html.twig | 37 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 source/themes/opdavies/opdavies/_partials/og.html.twig diff --git a/source/_posts/2015-04-03-minimum-core-version.md b/source/_posts/2015-04-03-minimum-core-version.md index b8b2608b..0b5efbdd 100644 --- a/source/_posts/2015-04-03-minimum-core-version.md +++ b/source/_posts/2015-04-03-minimum-core-version.md @@ -8,6 +8,11 @@ tags: - Drupal - Drupal 7 - Drupal Planet +meta: + og: + title: 'How to Define a Minimum Drupal Core Version' + description: 'How to define a minimum Drupal core version for your module or theme.' + type: article --- This week, my first code patch was [committed to Drupal core](https://www.drupal.org/node/2394517#comment-9773143). The patch adds the `user_has_role()` function to theu user module, to simplify the way to check whether a user in Drupal has been assigned a specific role. This is something that I normally write a custom function for each project, but it's now available in Drupal core as of [7.36](https://www.drupal.org/drupal-7.36-release-notes). diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index 4d687280..421c5688 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -7,6 +7,7 @@ {% if page.meta.description %} {% endif %} + {% if page.meta.og %}{% include "og" with {og: page.meta.og} %}{% endif %} {% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }} diff --git a/source/themes/opdavies/opdavies/_partials/og.html.twig b/source/themes/opdavies/opdavies/_partials/og.html.twig new file mode 100644 index 00000000..f9e81e60 --- /dev/null +++ b/source/themes/opdavies/opdavies/_partials/og.html.twig @@ -0,0 +1,37 @@ +{% if og.title %} + +{% endif %} + +{% if og.description %} + +{% endif %} + +{% if og.type %} + +{% endif %} + +{% if og.image and og.image.url %} + + {% if og.image.type %} + + {% endif %} + {% if og.image.width %} + + {% endif %} + {% if og.image.height %} + + {% endif %} +{% endif %} + +{% if og.title %} + {% if og.image %} + + + + {% else %} + + {% endif %} + + + +{% endif %} \ No newline at end of file From 4bcf5ce52cf255811dfe0a6755061aba5e91e3c1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 09:24:11 +0100 Subject: [PATCH 08/22] Added og meta info --- source/assets/images/oliver.jpg | Bin 0 -> 25163 bytes source/index.md | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 source/assets/images/oliver.jpg diff --git a/source/assets/images/oliver.jpg b/source/assets/images/oliver.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4b3e03192496c92a09c652cf1343f64946faa89a GIT binary patch literal 25163 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 Z6FCi0V%~h1lzN&dqPB!ph@9Jz|JjhR-xUA= literal 0 HcmV?d00001 diff --git a/source/index.md b/source/index.md index af2de10a..349d9017 100644 --- a/source/index.md +++ b/source/index.md @@ -7,6 +7,15 @@ use: - posts meta: description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.' + og: + title: 'Oliver Davies - Drupal Developer' + description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.' + type: website + image: + url: http://www.oliverdavies.co.uk/assets/images/oliver.jpg + width: 327 + height: 327 + type: image/jpg --- # About From bd718b121c54c2d989cb60b41b51de80dda84d1e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 11:26:18 +0100 Subject: [PATCH 09/22] Updated tags --- source/talks.html.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/talks.html.twig b/source/talks.html.twig index df1eb614..0b1713a5 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -11,13 +11,13 @@ talks: location: unified.diff description: So, what is this Drupal thing? - an introduction to Drupal. tags: - - meetup + - user-group - drupal - date: 2013-07-10 location: South Wales Drupal User Group description: An overview of the Drupal LDAP module and how I customised it for a client project. tags: - - meetup + - user-group - drupal - ldap - date: 2014-03-01 @@ -32,14 +32,14 @@ talks: location: Drupal Bristol User Group description: drush make drupalbristol: An introduction to Drush and Drush Make. tags: - - meetup + - user-group - drush - drush-make - date: 2014-08-09 location: South Wales Drupal User Group description: An impromptu talk about the Drupal Association and I've done there since joining the team. tags: - - meetup + - user-group - drupal-association - date: 2015-01-18 location: DrupalCamp Brighton From 283c9efe72124c696b51ad30e04c53dc6601eca2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 20:14:33 +0100 Subject: [PATCH 10/22] Removed title --- source/index.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/index.md b/source/index.md index 349d9017..3cf1aa83 100644 --- a/source/index.md +++ b/source/index.md @@ -1,8 +1,6 @@ --- layout: default -title: About Oliver nav: about -front: true use: - posts meta: From aa5b836fa872e91ebf47745ea4c2870a92ce76d0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 20:15:33 +0100 Subject: [PATCH 11/22] Removed default URL --- app/config/sculpin_site.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 52bdd2fb..b3721ff7 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,4 +1,3 @@ title: Oliver Davies subtitle: Drupal & Linux Specialist -description: Personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator based in the UK. -url: http://localhost:8000 +description: Personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator based in the UK. \ No newline at end of file From 4df296bfbf8fd3872b3f9b17427f3b15129ef594 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 20:15:50 +0100 Subject: [PATCH 12/22] Added title.html.twig --- .../opdavies/_layouts/default.html.twig | 3 +-- .../opdavies/_partials/title.html.twig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 source/themes/opdavies/opdavies/_partials/title.html.twig diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index 421c5688..1c9ba444 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -9,8 +9,7 @@ {% endif %} {% if page.meta.og %}{% include "og" with {og: page.meta.og} %}{% endif %} - {% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }} - + {% include 'title' %} {% block styles %}{% endblock %} diff --git a/source/themes/opdavies/opdavies/_partials/title.html.twig b/source/themes/opdavies/opdavies/_partials/title.html.twig new file mode 100644 index 00000000..200ce09a --- /dev/null +++ b/source/themes/opdavies/opdavies/_partials/title.html.twig @@ -0,0 +1,18 @@ +{% set separator = '-' %} +{% spaceless %} + {% if page.full_title %} + {{ page.full_title }} + {% elseif page.title %} + {% if site.title %} + {{ page.title }} {{ separator }} {{ site.title }} + {% elseif page.subtitle %} + {{ page.title }} {{ separator }} {{ site.title }} {{ separator }} {{ site.subtitle }} + {% endif %} + {% elseif site.title %} + {% if site.subtitle %} + {{ site.title }} {{ separator }} {{ site.subtitle }} + {% else %} + {{ site.title }} + {% endif %} + {% endif %} +{% endspaceless %} \ No newline at end of file From 1c10397ee3a021eba1077efd8423593ad1d8346c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 20:18:13 +0100 Subject: [PATCH 13/22] Added tag --- source/talks.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/source/talks.html.twig b/source/talks.html.twig index 0b1713a5..5dd8e4d5 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -61,6 +61,7 @@ talks: location: PHPSW description: Drupal 8 (lightning talk) tags: + - user-group - drupal - drupal-8 --- From 20f939c3038d48e8f589d7267e493419c56f2e1b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Apr 2015 20:36:05 +0100 Subject: [PATCH 14/22] Updated title.html.twig --- .../opdavies/opdavies/_partials/title.html.twig | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/source/themes/opdavies/opdavies/_partials/title.html.twig b/source/themes/opdavies/opdavies/_partials/title.html.twig index 200ce09a..3ddec683 100644 --- a/source/themes/opdavies/opdavies/_partials/title.html.twig +++ b/source/themes/opdavies/opdavies/_partials/title.html.twig @@ -1,16 +1,12 @@ -{% set separator = '-' %} +{% set separator = '|' %} {% spaceless %} {% if page.full_title %} {{ page.full_title }} - {% elseif page.title %} - {% if site.title %} - {{ page.title }} {{ separator }} {{ site.title }} - {% elseif page.subtitle %} - {{ page.title }} {{ separator }} {{ site.title }} {{ separator }} {{ site.subtitle }} - {% endif %} + {% elseif page.title and site.title %} + {{ page.title }} {{ separator }} {{ site.title }} {% elseif site.title %} {% if site.subtitle %} - {{ site.title }} {{ separator }} {{ site.subtitle }} + {{ site.subtitle }} {{ separator }} {{ site.title }} {% else %} {{ site.title }} {% endif %} From 9204459a33ac5cea9c3153592fb39c12ab37931b Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Sun, 12 Apr 2015 21:29:46 +0100 Subject: [PATCH 15/22] Updated Accessible Bristol --- source/_projects/accessible-bristol.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/_projects/accessible-bristol.md b/source/_projects/accessible-bristol.md index ff152b0f..c113b636 100644 --- a/source/_projects/accessible-bristol.md +++ b/source/_projects/accessible-bristol.md @@ -1,7 +1,7 @@ --- title: Accessible Bristol -website: http://www.accessiblebristol.org -is_featured: true +link: http://www.accessiblebristol.org +featured: true tags: - drupal - drupal-7 @@ -17,4 +17,4 @@ tags: * [Override Node Options](https://www.drupal.org/project/override_node_options) * [User relationships](https://www.drupal.org/project/user_relationships) * [Views](https://www.drupal.org/project/views) -* [Workbench Moderation](https://www.drupal.org/project/workbench_moderation) \ No newline at end of file +* [Workbench Moderation](https://www.drupal.org/project/workbench_moderation) From 02f48a8f56ecbf94e4439b5b5243428b5b6452a1 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Sun, 12 Apr 2015 22:18:53 +0100 Subject: [PATCH 16/22] Removed .nojekyll --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll deleted file mode 100644 index e69de29b..00000000 From 153ef9c718ef81a3014db636ef6e14939c3f3aed Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Sun, 12 Apr 2015 22:20:21 +0100 Subject: [PATCH 17/22] Removed site.description --- app/config/sculpin_site.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index b3721ff7..284dc9be 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,3 +1,2 @@ title: Oliver Davies subtitle: Drupal & Linux Specialist -description: Personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator based in the UK. \ No newline at end of file From 4f20b44a93712f4c33a39a0e4cbb05a793940877 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Mon, 13 Apr 2015 01:41:31 +0100 Subject: [PATCH 18/22] Added pages to sitemap.xml --- app/config/sculpin_site.yml | 1 + source/sitemap.xml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 284dc9be..6f45a14c 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,2 +1,3 @@ title: Oliver Davies subtitle: Drupal & Linux Specialist +url: http://localhost:8000 \ No newline at end of file diff --git a/source/sitemap.xml b/source/sitemap.xml index 89b98e45..5b5a6f80 100644 --- a/source/sitemap.xml +++ b/source/sitemap.xml @@ -11,6 +11,24 @@ use: <changefreq>daily</changefreq> <priority>0.8</priority> </url> + + {% set pages = { 0: 'accessibility', 1: 'blog', 2: 'company-information', 3: 'contact', 4: 'services', 5: 'talks', 6: 'work' } %} + {% for page in pages %} + <url> + <loc>{{ site.url }}/{{ page }}</loc> + <lastmod>{{ site.calculated_date | date('Y-m-d') }}</lastmod> + <changefreq>monthly</changefreq> + <priority>0.6</priority> + </url> + {% endfor %} + + <url> + <loc>{{ site.url }}/blog</loc> + <lastmod>{{ site.calculated_date | date('Y-m-d') }}</lastmod> + <changefreq>monthly</changefreq> + <priority>0.8</priority> + </url> + {% for post in data.posts %} <url> <loc>{{ site.url }}{{ post.url }}</loc> From 88878b643309840155df12d46067ef858d8e009b Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Mon, 13 Apr 2015 08:40:56 +0100 Subject: [PATCH 19/22] Less code --- .../themes/opdavies/opdavies/_partials/navbar.html.twig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/themes/opdavies/opdavies/_partials/navbar.html.twig b/source/themes/opdavies/opdavies/_partials/navbar.html.twig index 0077764a..a294fe47 100644 --- a/source/themes/opdavies/opdavies/_partials/navbar.html.twig +++ b/source/themes/opdavies/opdavies/_partials/navbar.html.twig @@ -12,11 +12,10 @@ <div id="navbar" class="collapse navbar-collapse"> <ul class="nav navbar-nav navbar-right" role="navigation"> <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li> - <li{% if page.nav == 'work' %} class="active"{% endif %}><a href="{{ site.url }}/work">Work</a></li> - <li{% if page.nav == 'services' %} class="active"{% endif %}><a href="{{ site.url }}/services">Services</a></li> - <li{% if page.nav == 'talks' %} class="active"{% endif %}><a href="{{ site.url }}/talks">Talks</a></li> - <li{% if page.nav == 'blog' %} class="active"{% endif %}><a href="{{ site.url }}/blog">Blog</a></li> - <li{% if page.nav == 'contact' %} class="active"{% endif %}><a href="{{ site.url }}/contact">Contact</a></li> + {% set items = { 0: 'work', 1: 'services', 2: 'talks', 3: 'blog', 4: 'contact' } %} + {% for item in items %} + <li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li> + {% endfor %} </ul> </div>{# .nav-collapse #} </div> From ff81078e9453ac6f626808e440a48b7d77f19ff1 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Mon, 13 Apr 2015 08:47:37 +0100 Subject: [PATCH 20/22] Tidier --- source/themes/opdavies/opdavies/_partials/navbar.html.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/themes/opdavies/opdavies/_partials/navbar.html.twig b/source/themes/opdavies/opdavies/_partials/navbar.html.twig index a294fe47..ceae703a 100644 --- a/source/themes/opdavies/opdavies/_partials/navbar.html.twig +++ b/source/themes/opdavies/opdavies/_partials/navbar.html.twig @@ -12,8 +12,7 @@ <div id="navbar" class="collapse navbar-collapse"> <ul class="nav navbar-nav navbar-right" role="navigation"> <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li> - {% set items = { 0: 'work', 1: 'services', 2: 'talks', 3: 'blog', 4: 'contact' } %} - {% for item in items %} + {% for item in { 0: 'work', 1: 'services', 2: 'talks', 3: 'blog', 4: 'contact' } %} <li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li> {% endfor %} </ul> From a85a9a7028a4a5ea8e251ca2c3315e0590c269ba Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Mon, 13 Apr 2015 08:57:21 +0100 Subject: [PATCH 21/22] Use an array instead of a hash --- source/themes/opdavies/opdavies/_partials/navbar.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/themes/opdavies/opdavies/_partials/navbar.html.twig b/source/themes/opdavies/opdavies/_partials/navbar.html.twig index ceae703a..46ca84a4 100644 --- a/source/themes/opdavies/opdavies/_partials/navbar.html.twig +++ b/source/themes/opdavies/opdavies/_partials/navbar.html.twig @@ -12,7 +12,7 @@ <div id="navbar" class="collapse navbar-collapse"> <ul class="nav navbar-nav navbar-right" role="navigation"> <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li> - {% for item in { 0: 'work', 1: 'services', 2: 'talks', 3: 'blog', 4: 'contact' } %} + {% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %} <li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li> {% endfor %} </ul> From f05f993e22f4767f8916a2e63ba51f86bb169320 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.co.uk> Date: Mon, 13 Apr 2015 09:11:20 +0100 Subject: [PATCH 22/22] Added Twitter and LinkedIn URLs --- app/config/sculpin_site.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 6f45a14c..46399b49 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,3 +1,5 @@ title: Oliver Davies subtitle: Drupal & Linux Specialist -url: http://localhost:8000 \ No newline at end of file +url: http://localhost:8000 +twitter_url: http://twitter.com/opdavies +linkedin_url: http://uk.linkedin.com/in/opdavies \ No newline at end of file