From 0c8ca8f8ac639432ee7ca034eb62c75a3c647144 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 2 Jul 2015 08:27:29 +0100
Subject: [PATCH] Removed empty paragraphs

---
 source/{testimonials.md => testimonials.html} | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)
 rename source/{testimonials.md => testimonials.html} (78%)

diff --git a/source/testimonials.md b/source/testimonials.html
similarity index 78%
rename from source/testimonials.md
rename to source/testimonials.html
index b448e878..755206bc 100644
--- a/source/testimonials.md
+++ b/source/testimonials.html
@@ -33,18 +33,19 @@ testimonials:
     role: Director
     company: Development Done Right
     url: http://www.developmentdoneright.co.uk
-    text: >
-      <p>We used Oliver on a number of occasions throughout 2012 and I have to say we've been delighted with his work. His skills working with Drupal are excellent particularly with custom module development and we wouldn't hesitate to recommend him others.</p>
+    text: <p>We used Oliver on a number of occasions throughout 2012 and I have to say we've been delighted with his work. His skills working with Drupal are excellent particularly with custom module development and we wouldn't hesitate to recommend him others.</p>
 
   - name: Léonie Watson
     role: Director of Accessibility
     company: Nomensa
+    url: http://www.nomensa.com
     text: >
       <p>Oliver is a flexible and hardworking developer, with a terrific knowledge of Drupal. He promotes accessibility best practice within the Drupal community, and is always happy to share his knowledge with other people.</p>
 
   - name: Holly Ross
     role: Executive Director
     company: Drupal Association
+    url: https://assoc.drupal.org
     text: >
       <p>Oliver has been an outstanding contributor to the Drupal Association team. He is a talented developer who writes great code and applies his curiosity and love of learning to every project. He is also a fantastic team member, who gives to the team as much as he gets.</p>
       <p>Oliver is the embodiment of everything good about the Drupal community.</p>
@@ -52,6 +53,7 @@ testimonials:
   - name: Josh Mitchell
     role: CTO
     company: Drupal Association
+    url: https://assoc.drupal.org
     text: >
       <p>Oliver is a skilled Drupal developer with a passion for the Drupal community. As his direct supervisor, I was able to watch Oliver grow with the Drupal Association and contribute an amazing amount of effort and integrity to all of his work.</p>
       <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>
@@ -59,19 +61,26 @@ testimonials:
 {% block body_classes %}page--testimonials{% endblock %}
 
 {% block content %}
-# Testimonials
+<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) %}
-  <h2>{{ testimonial.name }}</h2>
-
-  {% if testimonial.role or testimonial.company %}
-    <p>{{ testimonial.role }} at {{ testimonial.company }}</p>
-  {% endif %}
-
-  {{ testimonial.text|raw }}
+    <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 %}
+        
+        {{ testimonial.text|raw }}
+    </article>
 {% endfor %}
 {% endblock %}