diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 637e45148..91dae7609 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -83,6 +83,7 @@ hightlightjs: default digitalocean_referral: a913b4b00d4a default_date_format: jS F, Y +title_separator: "|" availability: day: diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index fe5bdc405..6ce534b29 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,29 +1,25 @@ - - - - - {% include 'head' %} - - + + + + + {% include 'head' %} + + {% include 'navbar' %} - {% include 'navbar' %} +
+
+ {% block content_wrapper %} +
+ {% block content %}{% endblock %} +
+ {% endblock %} -
-
- {% block content_wrapper %} -
- {% block content %}{% endblock %} -
- {% endblock %} + {% include 'sidebar' %} +
{# .row #} +
{# .container #} - {% include 'sidebar' %} -
{# .row #} -
{# .container #} - - {% include 'footer_content' %} - {% include 'footer_scripts' %} - + {% include 'footer_content' %} + {% include 'footer_scripts' %} + diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index d3517b25c..5ea7c06a2 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -3,38 +3,40 @@ {% block body_classes 'page--blog page--blog__post' %} {% block content_wrapper %} -
- {% include 'post_header' %} +
+ {% include 'post_header' %} - {% block content %}{% endblock %} + {% block content %}{% endblock %} - {% if page.related -%} -

Related Posts

+ {% if page.related -%} +

Related Posts

- - {%- endif %} + + {%- endif %} - {% if page.tags %} -

- Tags: - {% for tag in page.tags %} - {{ tag }}{% if not loop.last %}, {% endif %} - {% endfor %} -

+ {% if page.tags %} +

+ Tags: + {% for tag in page.tags %} + {{ tag }}{% if not loop.last %}, {% endif %} + {% endfor %} +

+ {% endif %} + + {% include 'about_author' %} + + {% if page.next_post or page.previous_post %} + {% endif %} - {% include 'about_author' %} - - {% if page.next_post or page.previous_post %} - - {% endif %} - -
+
{% endblock %} diff --git a/source/_layouts/redirect.html.twig b/source/_layouts/redirect.html.twig deleted file mode 100644 index 969452642..000000000 --- a/source/_layouts/redirect.html.twig +++ /dev/null @@ -1,9 +0,0 @@ - -{% spaceless %} - - - - - - -{% endspaceless %} diff --git a/source/_partials/about_author.html.twig b/source/_partials/about_author.html.twig index 4911bd9cb..373f832b4 100644 --- a/source/_partials/about_author.html.twig +++ b/source/_partials/about_author.html.twig @@ -1,7 +1,7 @@
-

About the Author

+

About the Author

- Picture of Oliver + Picture of Oliver -

Oliver Davies is a Drupal Developer and System Administrator based in the UK. He is a Senior Developer at Microserve and also provides freelance consultancy services for Drupal websites and Linux servers.

+

Oliver Davies is a Drupal Developer and System Administrator based in the UK. He is a Senior Developer at Microserve and also provides freelance consultancy services for Drupal websites and Linux servers.

diff --git a/source/_partials/footer_content.html.twig b/source/_partials/footer_content.html.twig index a9370eef2..1151e1883 100644 --- a/source/_partials/footer_content.html.twig +++ b/source/_partials/footer_content.html.twig @@ -1,5 +1,5 @@ diff --git a/source/_partials/footer_scripts.html.twig b/source/_partials/footer_scripts.html.twig index a793a03e7..8478800e0 100644 --- a/source/_partials/footer_scripts.html.twig +++ b/source/_partials/footer_scripts.html.twig @@ -6,17 +6,17 @@ {% block scripts %}{% endblock %} {% if page.tweets is defined and page.tweets == true %} - + {% endif %} {% if site.google_analytics_tracking_id %} - + ga('create', '{{ site.google_analytics_tracking_id }}', 'auto'); + ga('send', 'pageview'); + {% endif %} diff --git a/source/_partials/head.html.twig b/source/_partials/head.html.twig index 54e3b8930..3e7790798 100644 --- a/source/_partials/head.html.twig +++ b/source/_partials/head.html.twig @@ -13,6 +13,7 @@ + {% for size in site.apple_touch_icon_sizes %} {% endfor %} diff --git a/source/_partials/meetups.html.twig b/source/_partials/meetups.html.twig index 2088f7787..0f55c98d3 100644 --- a/source/_partials/meetups.html.twig +++ b/source/_partials/meetups.html.twig @@ -1,12 +1,12 @@
-

Meetups

- +

Meetups

+
diff --git a/source/_partials/navbar.html.twig b/source/_partials/navbar.html.twig index 3d2ae2f2a..a398435ae 100644 --- a/source/_partials/navbar.html.twig +++ b/source/_partials/navbar.html.twig @@ -1,21 +1,22 @@ diff --git a/source/_partials/og.html.twig b/source/_partials/og.html.twig index f83047761..a9d8e0d60 100644 --- a/source/_partials/og.html.twig +++ b/source/_partials/og.html.twig @@ -1,37 +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 %} + + {% if og.image.type %} + + {% endif %} + {% if og.image.width %} + + {% endif %} + {% if og.image.height %} + + {% endif %} {% endif %} {% if og.title %} - {% if og.image %} - - - - {% else %} - - {% endif %} - - - + {% if og.image %} + + + + {% else %} + + {% endif %} + + + {% endif %} diff --git a/source/_partials/post_header.html.twig b/source/_partials/post_header.html.twig index b9286a7c9..7cb61493b 100644 --- a/source/_partials/post_header.html.twig +++ b/source/_partials/post_header.html.twig @@ -2,11 +2,3 @@ <{{ title_tag }}>{{ page.title }}

Posted: {{ page.date|date('jS F Y') }}

-{# -{% if page.tags %} - Tags: - {% for tag in page.tags %} - {{ tag }}{% if not loop.last %},{% else %}.{% endif %} - {% endfor %} -{% endif %} -#} diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig index adee7d0e8..a7f34d619 100644 --- a/source/_partials/sidebar.html.twig +++ b/source/_partials/sidebar.html.twig @@ -1,10 +1,10 @@
-
-

Drupal Association

- - Drupal Association Individual Member - -
+
+

Drupal Association

+ + Drupal Association Individual Member + +
- {% include 'availability' %} + {% include 'availability' %}
diff --git a/source/_partials/title.html.twig b/source/_partials/title.html.twig index 0cd098708..9d9f8a209 100644 --- a/source/_partials/title.html.twig +++ b/source/_partials/title.html.twig @@ -1,14 +1,13 @@ -{% set separator = '|' %} {% spaceless %} - {% if page.full_title %} - {{ page.full_title }} - {% elseif page.title and site.title %} - {{ page.title }} {{ separator }} {{ site.title }} - {% elseif site.title %} - {% if site.subtitle %} - {{ site.subtitle }} {{ separator }} {{ site.title }} - {% else %} - {{ site.title }} + {% if page.full_title %} + {{ page.full_title }} + {% elseif page.title and site.title %} + {{ page.title }} {{ site.title_separator }} {{ site.title }} + {% elseif site.title %} + {% if site.subtitle %} + {{ site.subtitle }} {{ site.title_separator }} {{ site.title }} + {% else %} + {{ site.title }} + {% endif %} {% endif %} - {% endif %} {% endspaceless %}