diff --git a/_includes/author.html b/_includes/author.html index 7995c017..c9bb2219 100644 --- a/_includes/author.html +++ b/_includes/author.html @@ -5,11 +5,10 @@ {% if include.link %}{% endif %} {% endif %} -

{% if include.link %}{% endif %} {{ author.name }} {% if include.link %}{% endif %}

-

{{ author.role }}{% if author.tribe %} · {{ author.tribe }} Tribe{% endif %}

+

{{ author.role }}{% if author.tribe %} ({{ author.tribe }} Tribe){% endif %}

{% if author.startDate %} {% assign start = author.startDate | prepend: "01-01-" | slice: -10,10 | date: '%Y' %} @@ -25,7 +24,7 @@

Working at Sky Betting & Gaming since {{ author.startDate | date: '%Y' }

{{ author.bio }}

{% if author.interests %} -

{% if include.articles %} +

Articles by {{ author.name | truncatewords:1,"" }}

{% for post in site.posts %} @@ -50,6 +49,6 @@

Articles by {{ author.name | truncatewords:1,"" }} {% endif %} diff --git a/_includes/footer.html b/_includes/footer.html index 697aa919..93b5ac8b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,53 +1,50 @@ -
-
-
-
-

About Sky Betting & Gaming

-

Our stack is a diverse mix of open source software and includes Node.js, PHP, Java & Scala, Ruby, MySQL, Couchbase, Mongo, Redis, Hadoop and RabbitMQ. We manage over 4000 virtual and physical machines across 5 data centres using Chef & Ansible, and we’re proud of our operational service record in the face of strong year-on-year growth in our customer base.

-
-
-

Before you go…

- -
- -
-
-
-
-
-
-

Our Products

- - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
+ + + +

+ + diff --git a/_includes/footer.html.bak b/_includes/footer.html.bak new file mode 100644 index 00000000..15b22dfa --- /dev/null +++ b/_includes/footer.html.bak @@ -0,0 +1,56 @@ + diff --git a/_includes/head.html b/_includes/head.html index 8f71b360..86ac7944 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,68 +1,89 @@ -{%- capture newline %} -{% endcapture -%} -{%- assign site_title = site.title | markdownify | strip_html | strip -%} -{%- assign page_description = page.bio | default: page.summary | markdownify | strip_html | split: newline | first -%} -{%- if page.layout == 'author' %}{% assign page_title = page.name %}{% endif -%} - - - {{ page_title | default: page.title }}{% if page.title %} - {% endif %}{{ site_title }} - - + + + - - - - - - - - - - {% if page.layout == "post" -%} - - - {% if page.category %}{% endif %} - {% if page.tags %}{% for tag in page.tags -%} - {% endfor %}{% endif %} - {%- else -%} - - {%- endif %} - - - - - - - - - - {%- if page.layout == "post" %} - {% if page.author %} - {% assign author = site.authors | where:"slug",page.author | first %} - {% if author.twitter %} - - - {% endif %} - {% endif -%} - - - - {% endif %} - - - - - - - - - - - - - - - - + + + + + +
+
+

sbg.technology

+
+ +
diff --git a/_includes/head.html.bak b/_includes/head.html.bak new file mode 100644 index 00000000..9814dfda --- /dev/null +++ b/_includes/head.html.bak @@ -0,0 +1,68 @@ +{%- capture newline %} +{% endcapture -%} +{%- assign site_title = site.title | markdownify | strip_html | strip -%} +{%- assign page_description = page.bio | default: page.summary | markdownify | strip_html | split: newline | first -%} +{%- if page.layout == 'author' %}{% assign page_title = page.name %}{% endif -%} + + + {{ page_title | default: page.title }}{% if page.title %} - {% endif %}{{ site_title }} + + + + + + + + + + + + + + {% if page.layout == "post" -%} + + + {% if page.category %}{% endif %} + {% if page.tags %}{% for tag in page.tags -%} + {% endfor %}{% endif %} + {%- else -%} + + {%- endif %} + + + + + + + + + + {%- if page.layout == "post" %} + {% if page.author %} + {% assign author = site.authors | where:"slug",page.author | first %} + {% if author.twitter %} + + + {% endif %} + {% endif -%} + + + + {% endif %} + + + + + + + + + + + + diff --git a/_includes/nav.html b/_includes/nav.html index 21d33b54..53bbdbc3 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -3,26 +3,7 @@
+

Posted on {% if post.author == empty %} + No author + {% else %} by + {% for a in post.author %} + {% assign author=site.authors | where:"slug",a | first %} + {% if forloop.first %}{% elsif forloop.last %} and {% else %}, {% endif %} + {{ author.name }}{% endfor %}{% endif %} · {% for data_category in site.data.categories %}{% if data_category.name == post.category %}{{ post.category }}{% endif %}{% endfor %} · {{ minutes }} min read

+ diff --git a/_includes/postSummary.html.bak b/_includes/postSummary.html.bak new file mode 100644 index 00000000..07e9a33d --- /dev/null +++ b/_includes/postSummary.html.bak @@ -0,0 +1,59 @@ +{% assign minutes = post.content | number_of_words | divided_by: 120 %} +{% if minutes == 0 %} +{% assign minutes = 1 %} +{% endif %} + +
+
+ +
+ +

{{ post.title }}

+ + {% if post.image and include.fullSummary %} +
+ +
+ {% endif %} + + {% if post.summary %} + {{ post.summary | markdownify }} + {% endif %} + +
+
+ {% assign authorCount = post.author | join: "," | split: "," | size # pluralize not available%} +
Author{% if authorCount > 1 %}s{% endif %}:
+ +

+ {% if post.author == empty %} + No author + {% else %} + {% for a in post.author %} + {% assign author=site.authors | where:"slug",a | first %} + {% if forloop.first %}{% elsif forloop.last %} and {% else %}, {% endif %} + {{ author.name }} + {% endfor %} + {% endif %} +

+
+ + {% if post.category and include.fullSummary %} +
+
Category:
+ {% for data_category in site.data.categories %} + {% if data_category.name == post.category %} +

{{ post.category }}

+ {% endif %} + {% endfor %} +
+ {% endif %} +
+
Time:
+

{{ minutes }} minute read

+
+
+
diff --git a/_layouts/author.html b/_layouts/author.html index 95569c3d..6e7f82c5 100644 --- a/_layouts/author.html +++ b/_layouts/author.html @@ -2,9 +2,7 @@ layout: page nav: false --- -
-
+
{% assign author = page %} {% include author.html bio=true articles=true %} -
-
+ diff --git a/_layouts/default.html b/_layouts/default.html index 15310156..b74e0532 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,18 +1,7 @@ {% include head.html %} - - {% include nav.html %} {{ content }} - diff --git a/_layouts/page.html b/_layouts/page.html index f337440e..33699694 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,47 +1,5 @@ --- layout: default --- - -
-
-
{{ content }} -
-
- - -
- {% include footer.html %} diff --git a/_layouts/post.html b/_layouts/post.html index 92226839..17988299 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,91 +1,31 @@ --- layout: default --- -
-
-
-
-

{{ page.title | markdownify | remove: '

' | remove: '

' }}

-
- -
- {% if page.category %} - {% for data_category in site.data.categories %} - {% if data_category.name == page.category %} - - {{ page.category }} - - {% endif %} - {% endfor %} - {% endif %} -
- - {{ content }} -
- +
+
+

{{ page.title }}

+
+

Posted on {% if page.author == empty %} + No author + {% else %} by + {% for a in page.author %} + {% assign author=site.authors | where:"slug",a | first %} + {% if forloop.first %}{% elsif forloop.last %} and {% else %}, {% endif %} + {{ author.name }}{% endfor %}{% endif %} · {% for data_category in site.data.categories %}{% if data_category.name == page.category %}{{ page.category }}{% endif %}{% endfor %}

+
+ {{ content }} +
+
{% if site.categories[page.category].size > 1 %}
-

Want to read more about {{ page.category }}? Check out these related articles...

-
+

Want to read more about {{ page.category }}? Check out these related articles.

{% for post in site.categories[page.category] %} {% if post.title != page.title %} {% include postSummary.html %} {% endif %} {% endfor %} -
-
- {% endif %} -
- -
- -
-
-
- {% if page.disablecomments %} -
Comments have been disabled for this post
- {% else %} -
- {% endif %} -
-
-
- - -{% unless page.disablecomments %} - -{% endunless %} - {% include footer.html %} diff --git a/authors/index.html b/authors/index.html index 47f2fc28..c14da944 100644 --- a/authors/index.html +++ b/authors/index.html @@ -6,11 +6,10 @@ fixedHeader: true --- -
+
{% for author in site.authors %}
{% include author.html link=true bio=true %}
- {% unless forloop.last %}
{% endunless %} {% endfor %} -
+ diff --git a/index.html b/index.html index a28e33c5..c7bc094b 100644 --- a/index.html +++ b/index.html @@ -11,27 +11,16 @@ {% include postSummary.html fullSummary=true %} {% endfor %} -