From 497b306b817d6d54a67e19e02787dd2c64409e56 Mon Sep 17 00:00:00 2001
From: Katrien Vanhaute <vanhautekatrien@gmail.com>
Date: Tue, 7 Nov 2017 09:22:24 +0100
Subject: [PATCH 1/2] Update layout to bootstrap 4

---
 .../Quotes/Layout/Templates/Quote.html.twig   | 15 ++++++++++
 .../Quotes/Layout/Widgets/AllQuotes.html.twig | 11 ++++---
 .../Layout/Widgets/RandomQuote.html.twig      | 28 ++++--------------
 .../Layout/Widgets/SingleQuote.html.twig      | 29 +++++--------------
 4 files changed, 35 insertions(+), 48 deletions(-)
 create mode 100644 src/Frontend/Modules/Quotes/Layout/Templates/Quote.html.twig

diff --git a/src/Frontend/Modules/Quotes/Layout/Templates/Quote.html.twig b/src/Frontend/Modules/Quotes/Layout/Templates/Quote.html.twig
new file mode 100644
index 0000000..f457a13
--- /dev/null
+++ b/src/Frontend/Modules/Quotes/Layout/Templates/Quote.html.twig
@@ -0,0 +1,15 @@
+{% macro quote(quote) %}
+  <blockquote>
+    <div class="row align-items-center">
+      {% if quote.image %}
+        <div class="col-2">
+          <img src="{{ quote.imageDirectoryUrl }}/x150/{{ quote.image }}" alt="{{ quote.name }}" class="img-responsive">
+        </div>
+      {% endif %}
+      <div class="{% if quote.image %} col-10{% else %} col-12{% endif %}">
+        {{ quote.quote|raw }}
+        <cite>{{ quote.name }}</cite>
+      </div>
+    </div>
+  </blockquote>
+{% endmacro %}
diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
index 203f88c..76ed9d6 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
@@ -1,4 +1,7 @@
-{% for quote in quotes %}
-  <blockquote>{{ quote.quote|raw }}</blockquote>
-  <p>{{ quote.name }}</p>
-{% endfor %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
+
+<section id="quotesAllQuotesWidget" class="quotes quotes-widget">
+  {% for quote in quotes %}
+    {{ macro.quote(quote) }}
+  {% endfor %}
+</section>
diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
index 4e98f4f..665a89c 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
@@ -1,23 +1,7 @@
-{% if quote %}
-  <blockquote>
-    <div class="row">
-    {% if quote.image %}
-      <div class="col-sm-4"> 
-        <img src="{{ quote.imageDirectoryUrl }}/x150/{{ quote.image }}" alt="{{ quote.name }}" class="img-responsive">
-      </div>
-      <div class="col-sm-8">
-        {{ quote.quote|raw }}
-        -- {{ quote.name }}
-      </div>
-    {% endif %}
-        
-    {% if not quote.image %}
-      <div class="col-sm-12">
-        {{ quote.quote|raw }}
-        -- {{ quote.name }}
-      </div>
-    {% endif %}
-    </div>
-  </blockquote>
-{% endif %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
 
+<section id="quotesRandomQuoteWidget" class="quotes quotes-widget">
+  {% if quote %}
+    {{ macro.quote(quote) }}
+  {% endif %}
+</section>
diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
index 9435343..e9a218d 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
@@ -1,22 +1,7 @@
-{% if quote %}
-  <blockquote>
-    <div class="row">
-    {% if quote.image %}
-      <div class="col-sm-4"> 
-        <img src="{{ quote.imageDirectoryUrl }}/x150/{{ quote.image }}" alt="{{ quote.name }}" class="img-responsive">
-      </div>
-      <div class="col-sm-8">
-        {{ quote.quote|raw }}
-        -- {{ quote.name }}
-      </div>
-    {% endif %}
-        
-    {% if not quote.image %}
-      <div class="col-sm-12">
-        {{ quote.quote|raw }}
-        -- {{ quote.name }}
-      </div>
-    {% endif %}
-    </div>
-  </blockquote>
-{% endif %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
+
+<section id="quotesSingleQuoteWidget" class="quotes quotes-widget">
+  {% if quote %}
+    {{ macro.quote(quote) }}
+  {% endif %}
+</section>

From b0c933b788746dd43528f97575e937c8340c461c Mon Sep 17 00:00:00 2001
From: Katrien Vanhaute <vanhautekatrien@gmail.com>
Date: Wed, 8 Nov 2017 10:50:45 +0100
Subject: [PATCH 2/2] Use better names for the quote macros

---
 .../Modules/Quotes/Layout/Widgets/AllQuotes.html.twig         | 4 ++--
 .../Modules/Quotes/Layout/Widgets/RandomQuote.html.twig       | 4 ++--
 .../Modules/Quotes/Layout/Widgets/SingleQuote.html.twig       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
index 76ed9d6..a10bc24 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/AllQuotes.html.twig
@@ -1,7 +1,7 @@
-{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as quotesTemplates %}
 
 <section id="quotesAllQuotesWidget" class="quotes quotes-widget">
   {% for quote in quotes %}
-    {{ macro.quote(quote) }}
+    {{ quotesTemplates.quote(quote) }}
   {% endfor %}
 </section>
diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
index 665a89c..fc97f75 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/RandomQuote.html.twig
@@ -1,7 +1,7 @@
-{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as quotesTemplates %}
 
 <section id="quotesRandomQuoteWidget" class="quotes quotes-widget">
   {% if quote %}
-    {{ macro.quote(quote) }}
+    {{ quotesTemplates.quote(quote) }}
   {% endif %}
 </section>
diff --git a/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig b/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
index e9a218d..d703ce8 100644
--- a/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
+++ b/src/Frontend/Modules/Quotes/Layout/Widgets/SingleQuote.html.twig
@@ -1,7 +1,7 @@
-{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as macro %}
+{% import 'Modules/Quotes/Layout/Templates/Quote.html.twig' as quotesTemplates %}
 
 <section id="quotesSingleQuoteWidget" class="quotes quotes-widget">
   {% if quote %}
-    {{ macro.quote(quote) }}
+    {{ quotesTemplates.quote(quote) }}
   {% endif %}
 </section>