Reformat company information

source/testimonials.html.twig

@@ -6,7 +6,8 @@ testimonials:
     - name: Ed Welsby
       image: ed-welsby.png
       role: Senior Developer
-      company: Proctor & Stevenson
+      company:
+        name: Proctor & Stevenson
         url: http://www.proctors.co.uk
       text: >
           <p>Oliver was great to work with, he has a solid knowledge of the various aspects of web development and never
@@ -15,7 +16,8 @@ testimonials:
     - name: Brian Healy
       image: brian-healy.png
       role: Director of Business Development
-      company: Tincan
+      company:
+        name: Tincan
         url: http://tincan.co.uk
       text: >
           <p>Oliver was fantastic to work with - pro-active and highly responsive, he worked well remotely and as part
@@ -23,7 +25,8 @@ testimonials:
           code was essential and he delivered.</p>
 
     - name: Marlon Duncanson
-      company: Hypergroup Limited
+      company:
+        name: Hypergroup Limited
         url: http://www.hypergroup.com
       text: >
           <p>Oliver is a great guy and really easy to work with. He really goes the extra mile to make sure the project
@@ -43,7 +46,8 @@ testimonials:
 
     - name: James Chapman
       role: Director
-      company: Development Done Right
+      company:
+        name: Development Done Right
         url: http://www.developmentdoneright.co.uk
       image: james-chapman.png
       text: >
@@ -53,7 +57,8 @@ testimonials:
 
     - name: Léonie Watson
       role: Director of Accessibility
-      company: Nomensa
+      company:
+        name: Nomensa
         url: http://www.nomensa.com
       image: leonie-watson.jpg
       text: >
@@ -63,7 +68,8 @@ testimonials:
 
     - name: Holly Ross
       role: Executive Director
-      company: Drupal Association
+      company:
+        name: Drupal Association
         url: https://assoc.drupal.org
       image: holly-ross.png
       text: >
@@ -74,7 +80,8 @@ testimonials:
 
     - name: Josh Mitchell
       role: CTO
-      company: Drupal Association
+      company:
+        name: Drupal Association
         url: https://assoc.drupal.org
       image: josh-mitchell.png
       text: >
@@ -90,15 +97,19 @@ testimonials:
     <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) %}
+        {% set company = testimonial.company %}
+
         <article class="testimonial">
             <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
-            {% if testimonial.role or testimonial.company %}{% spaceless %}
+            {% if testimonial.role or company.name %}{% spaceless %}
                 <p>
                     {{ testimonial.role }} at
-                    {% if testimonial.url %}<a href="{{ testimonial.url }}" title="{{ testimonial.company }}">{% endif %}
+                    {% if company.url %}
-                    {{ testimonial.company }}
+                        <a href="{{ company.url }}" title="{{ company.name }}">{{ company.name }}</a>
-                    {% if testimonial.url %}</a>{% endif %}
+                    {% else %}
+                        {{ company.name }}
+                    {% endif %}
                 </p>
             {% endspaceless %}{% endif %}