Re-added some blocks

This commit is contained in:
Oliver Davies 2015-09-10 02:59:20 +01:00
parent 7b0f15bfe8
commit 9f537eb676
3 changed files with 53 additions and 45 deletions

View file

@ -8,31 +8,35 @@ pagination:
use:
- posts
---
<h1>Blog</h1>
{% block content %}
<h1>Blog</h1>
<ul class="posts">
{% for post in page.pagination.items %}
<li class="post">
{% include 'post_header' with { page: post, title_tag: 'h2' } %}
<ul class="posts">
{% for post in page.pagination.items %}
<li class="post">
{% include 'post_header' with { page: post, title_tag: 'h2' } %}
{% if post.blocks.excerpt %}
{{ post.blocks.excerpt|raw }}
{% else %}
<p>{{ post.blocks.content|raw|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' })|raw }} &hellip;</p>
{% endif %}
{% if post.blocks.excerpt %}
{{ post.blocks.excerpt|raw }}
{% else %}
<p>{{ post.blocks.content|raw|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' })|raw }} &hellip;</p>
{% endif %}
<a href="{{ post.url }}">Read more &rarr;</a>
</li>
{% endfor %}
</ul>
<a href="{{ post.url }}">Read more &rarr;</a>
</li>
{% endfor %}
</ul>
{% if page.pagination.previous_page or page.pagination.next_page %}
<nav>
{% if page.pagination.previous_page %}
<a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a>
{% endif %}
{% if page.pagination.next_page %}
<a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a>
{% endif %}
</nav>
{% endif %}
{% if page.pagination.previous_page or page.pagination.next_page %}
<nav>
{% if page.pagination.previous_page %}
<a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a>
{% endif %}
{% if page.pagination.next_page %}
<a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a>
{% endif %}
</nav>
{% endif %}
{% endblock %}
{% block body_classes 'page--blog page--blog__list' %}

View file

@ -79,27 +79,31 @@ testimonials:
<p>Everything we have thrown at Oliver, he has approached with an open and flexible mind that has allowed him
to work on a wide range of projects and features for Drupal products.</p>
---
<h1>Testimonials</h1>
<p>Here are some examples of the nice things that clients and former colleagues have said.</p>
<p>You can view more recommendations on my <a href="{{ site.linkedin.url }}">LinkedIn profile</a>.</p>
{% block content %}
<h1>Testimonials</h1>
<p>Here are some examples of the nice things that clients and former colleagues have said.</p>
<p>You can view more recommendations on my <a href="{{ site.linkedin.url }}">LinkedIn profile</a>.</p>
{% for testimonial in page.testimonials|reverse|slice(0,5) %}
<article class="testimonial">
<h2 class="testimonial__name">{{ testimonial.name }}</h2>
{% for testimonial in page.testimonials|reverse|slice(0,5) %}
<article class="testimonial">
<h2 class="testimonial__name">{{ testimonial.name }}</h2>
{% if testimonial.role or testimonial.company %}{% spaceless %}
<p>
{{ testimonial.role }} at
{% if testimonial.url %}<a href="{{ testimonial.url }}" title="{{ testimonial.company }}">{% endif %}
{{ testimonial.company }}
{% if testimonial.url %}</a>{% endif %}
</p>
{% endspaceless %}{% endif %}
{% if testimonial.role or testimonial.company %}{% spaceless %}
<p>
{{ testimonial.role }} at
{% if testimonial.url %}<a href="{{ testimonial.url }}" title="{{ testimonial.company }}">{% endif %}
{{ testimonial.company }}
{% if testimonial.url %}</a>{% endif %}
</p>
{% endspaceless %}{% endif %}
{% if testimonial.image %}
<img class="testimonial__image" src="{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
{% endif %}
{% if testimonial.image %}
<img class="testimonial__image" src="{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
{% endif %}
{{ testimonial.text|raw }}
</article>
{% endfor %}
{{ testimonial.text|raw }}
</article>
{% endfor %}
{% endblock %}
{% block body_classes 'page--testimonials' %}

View file

@ -29,7 +29,7 @@
<link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
{% endfor %}
</head>
<body>
<body{% if page.blocks.body_classes %} class="{{ page.blocks.body_classes }}"{% endif %}>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">