Merge branch 'testimonial-tidy'

.gitattributes

@@ -0,0 +1 @@
+*.css -diff

Gemfile

@@ -4,4 +4,5 @@ group :development do
   gem "sass"
   gem "sass-globbing"
   gem "compass"
+  gem "bootstrap-sass"
 end

Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    autoprefixer-rails (5.1.8)
+      execjs
+      json
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     chunky_png (1.3.4)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -14,7 +20,9 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    execjs (2.4.0)
     ffi (1.9.10)
+    json (1.8.2)
     multi_json (1.11.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
@@ -27,6 +35,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass
   compass
   sass
   sass-globbing

sass/components/pages/_testimonials.scss

@@ -3,9 +3,10 @@
   margin-bottom: 10px;
 
   .testimonial__image {
+    @extend .img-circle;
     float: right;
+    height: 90px;
     margin: 0 0 10px 10px;
-    max-height: 100px;
+    width: 90px;
-    max-width: 100px;
   }
 }

sass/styles.scss

@@ -1,3 +1,4 @@
+@import 'bootstrap';
 @import 'compass';
 
 @import "variables/**/*";

source/_layouts/default.html.twig

@@ -18,7 +18,6 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{ site.url }}/components/bootstrap/css/bootstrap.min.css">
         <link rel="stylesheet" href="{{ site.url }}/css/styles.css">
         <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
         <link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">

source/testimonials.html.twig

@@ -4,15 +4,20 @@ nav: testimonials
 title: Testimonials
 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
           minded helping me out with Linux commands!</p>
 
     - name: Brian Healy
-      company: Tincan
+      image: brian-healy.png
+      role: Director of Business Development
+      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
@@ -20,28 +25,34 @@ 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
           is done properly. I would recommend him and will not hesitate to use him again in future.</p>
+      draft: yes
 
     - name: Brian Hartwell
       text: >
           <p>Oliver was great to work with. He has expert knowledge with Drupal and delivered exactly what we were
           looking for on time. He's understanding, friendly and easy to get along with. I would enjoy working with him
           again in the future.</p>
+      draft: yes
 
     - name: Daniel Easterbrook
       text: >
           <p>Oliver is seasoned Drupal and all round highly skilled and experienced web developer. I have worked with
           Oliver on an important project where he was reliable, prompt and ensured strict client deadline delivery and
           confidentiality at all times.</p>
+      draft: yes
 
     - 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: >
           <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
@@ -49,8 +60,10 @@ testimonials:
 
     - name: Léonie Watson
       role: Director of Accessibility
-      company: Nomensa
+      company:
+        name: Nomensa
         url: http://www.nomensa.com
+      image: leonie-watson.jpg
       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
@@ -58,9 +71,10 @@ testimonials:
 
     - name: Holly Ross
       role: Executive Director
-      company: Drupal Association
+      company:
+        name: Drupal Association
         url: https://assoc.drupal.org
-      image: https://assoc.drupal.org/files/headshot_drupal.png
+      image: holly-ross.png
       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
@@ -69,9 +83,10 @@ testimonials:
 
     - name: Josh Mitchell
       role: CTO
-      company: Drupal Association
+      company:
+        name: Drupal Association
         url: https://assoc.drupal.org
-      image: https://assoc.drupal.org/files/joshv2.png
+      image: josh-mitchell.png
       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
@@ -84,23 +99,31 @@ testimonials:
     <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) %}
+    {% for testimonial in page.testimonials|reverse if not testimonial.draft %}
+        {% set company = testimonial.company %}
+
         <article class="testimonial">
             <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
-            {% if testimonial.role or testimonial.company %}{% spaceless %}
+            {% if testimonial.image %}
-                <p>
+                <img class="testimonial__image" src="{{ site.url }}/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
+            {% endif %}
+
+            {% if testimonial.role and not company.name %}
+                <p class="lead">
+                    {{ testimonial.role }}
+                </p>
+            {% elseif testimonial.role and company.name %}{% spaceless %}
+                <p class="lead">
                     {{ 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 %}
 
-            {% if testimonial.image %}
-                <img class="testimonial__image" src="{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
-            {% endif %}
-
             {{ testimonial.text|raw }}
         </article>
     {% endfor %}