From bb9f07c3772d80a3b676019c7f8b61c3fed34955 Mon Sep 17 00:00:00 2001
From: theo1 <theo@framasoft.org>
Date: Sun, 17 May 2020 14:52:35 +0200
Subject: [PATCH] Introduced gallery category for full-size printing of images
 in the absence of text

---
 content/articles/construction.md      |  3 +--
 content/articles/sunday.md            |  2 +-
 output/category/gallery.html          |  0
 output/construction.html              | 31 +++++++++++++--------------
 output/courtyard.html                 | 26 +++++++++++-----------
 output/feeds/all.atom.xml             |  4 ++--
 output/feeds/gallery.atom.xml         | 12 +++++++++++
 output/feeds/public.atom.xml          | 14 ++----------
 output/sunday.html                    | 31 +++++++++++++--------------
 output/theme/css/main-v2.css          | 12 ++++++++++-
 themes/felicie/static/css/main-v2.css | 12 ++++++++++-
 themes/felicie/templates/article.html | 30 ++++++++++++++++++--------
 12 files changed, 105 insertions(+), 72 deletions(-)
 create mode 100644 output/category/gallery.html
 create mode 100644 output/feeds/gallery.atom.xml

diff --git a/content/articles/construction.md b/content/articles/construction.md
index 7003ef2..d056259 100755
--- a/content/articles/construction.md
+++ b/content/articles/construction.md
@@ -1,12 +1,11 @@
 Title: Construction
 Date: 2020-04-24 17:01
 Modified: 2020-04-24 17:01
-Category: public
+Category: gallery
 Tags: article
 Slug: construction
 Authors: felicie
 
-
 <audio controls="controls" 
     src="sounds/construction.wav"
     autoplay loop
diff --git a/content/articles/sunday.md b/content/articles/sunday.md
index 5661250..9311463 100755
--- a/content/articles/sunday.md
+++ b/content/articles/sunday.md
@@ -1,7 +1,7 @@
 Title: Sunday
 Date: 2020-04-24 17:01
 Modified: 2020-04-24 17:01
-Category: public
+Category: gallery
 Tags: article
 Slug: sunday
 Authors: felicie
diff --git a/output/category/gallery.html b/output/category/gallery.html
new file mode 100644
index 0000000..e69de29
diff --git a/output/construction.html b/output/construction.html
index 2cf418c..73f7d29 100644
--- a/output/construction.html
+++ b/output/construction.html
@@ -15,24 +15,23 @@
     
     <div class='content'>
     <script src="/theme/js/slideshow.js"></script>
-
     <h1 class='article-title'>Construction</h1>
-    <div class="article">
-        <div class='article-img column'>
-                <img alt="" onclick="showSlide('img-1')" src="/images/Construction/Construction-1.jpg">
-                <img alt="" onclick="showSlide('img-2')" src="/images/Construction/Construction-2.jpg">
-                <img alt="" onclick="showSlide('img-3')" src="/images/Construction/Construction-3.jpg">
-                <img alt="" onclick="showSlide('img-4')" src="/images/Construction/Construction-4.jpg">
-                <img alt="" onclick="showSlide('img-5')" src="/images/Construction/Construction-5.jpg">
-        </div>
-        <div class='article-content column'> <p><audio controls="controls" 
-    src="sounds/construction.wav"
-    autoplay loop
-    class='audio'>
-    Your browser does not support the HTML5 Audio element.
-</audio></p></div>
-    </div>
 
+        <div class="gallery">
+        <!-- If there are only images, print them full-width. -->
+            <img class= "gallery-img" alt="" onclick="showSlide('img-1')" src="/images/Construction/Construction-1.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-2')" src="/images/Construction/Construction-2.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-3')" src="/images/Construction/Construction-3.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-4')" src="/images/Construction/Construction-4.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-5')" src="/images/Construction/Construction-5.jpg">
+            <br>
+            </div>
+
+    <!-- Slides used for slideshow -->
     <div id="slide-container">
         <div id="close-modal" onclick="closeModal()">X</div>
         <div id="slides" class="modal">
diff --git a/output/courtyard.html b/output/courtyard.html
index 9f59ac3..6335da5 100644
--- a/output/courtyard.html
+++ b/output/courtyard.html
@@ -15,17 +15,18 @@
     
     <div class='content'>
     <script src="/theme/js/slideshow.js"></script>
-
     <h1 class='article-title'>Courtyard</h1>
-    <div class="article">
-        <div class='article-img column'>
-                <img alt="" onclick="showSlide('img-1')" src="/images/Courtyard/Courtyard-1.jpg">
-                <img alt="" onclick="showSlide('img-2')" src="/images/Courtyard/Courtyard-2.jpg">
-                <img alt="" onclick="showSlide('img-3')" src="/images/Courtyard/Courtyard-3.jpg">
-                <img alt="" onclick="showSlide('img-4')" src="/images/Courtyard/Courtyard-4.jpg">
-                <img alt="" onclick="showSlide('img-5')" src="/images/Courtyard/Courtyard-5.jpg">
-        </div>
-        <div class='article-content column'> <p><audio controls="controls" 
+
+        <!-- If there is a text, print two columns -->
+        <div class="article">
+            <div class='article-img column'>
+                    <img alt="" onclick="showSlide('img-1')" src="/images/Courtyard/Courtyard-1.jpg">
+                    <img alt="" onclick="showSlide('img-2')" src="/images/Courtyard/Courtyard-2.jpg">
+                    <img alt="" onclick="showSlide('img-3')" src="/images/Courtyard/Courtyard-3.jpg">
+                    <img alt="" onclick="showSlide('img-4')" src="/images/Courtyard/Courtyard-4.jpg">
+                    <img alt="" onclick="showSlide('img-5')" src="/images/Courtyard/Courtyard-5.jpg">
+            </div>
+            <div class='article-content column'> <p><audio controls="controls" 
     src="sounds/courtyard.wav"
     autoplay loop
     class='audio'>
@@ -41,9 +42,10 @@ At sunset, he starts to think that the angle of the light on the stretch of eart
 <p>He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help.
 He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle.</p>
 <p>He goes to the balcony twice a day to smoke a cigarette. It overlooks the courtyard, so it is just outside enough to give himself the impression that he is going somewhere. The junk and the dust lingering on the other balconies have made space to allow a chair and a reading person to get a bit of sunlight.
-He can hear neighbors laughing out loud, as they always had in peaceful sunny spring afternoon. They started to watch an old TV show last week. He knows the ending and can even tell some lines.</p></div>
-    </div>
+He can hear neighbors laughing out loud, as they always had in peaceful sunny spring afternoon. They started to watch an old TV show last week. He knows the ending and can even tell some lines.</p></div> 
+        </div>
 
+    <!-- Slides used for slideshow -->
     <div id="slide-container">
         <div id="close-modal" onclick="closeModal()">X</div>
         <div id="slides" class="modal">
diff --git a/output/feeds/all.atom.xml b/output/feeds/all.atom.xml
index b533555..14f9ac2 100644
--- a/output/feeds/all.atom.xml
+++ b/output/feeds/all.atom.xml
@@ -4,7 +4,7 @@
     autoplay loop
     class='audio'&gt;
     Your browser does not support the HTML5 Audio element.
-&lt;/audio&gt;&lt;/p&gt;</content><category term="public"></category><category term="article"></category></entry><entry><title>Courtyard</title><link href="https://fel.theo-lem.org/courtyard.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/courtyard.html</id><summary type="html">&lt;p&gt;A man and a building.&lt;/p&gt;</summary><content type="html">&lt;p&gt;&lt;audio controls="controls" 
+&lt;/audio&gt;&lt;/p&gt;</content><category term="gallery"></category><category term="article"></category></entry><entry><title>Courtyard</title><link href="https://fel.theo-lem.org/courtyard.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/courtyard.html</id><summary type="html">&lt;p&gt;A man and a building.&lt;/p&gt;</summary><content type="html">&lt;p&gt;&lt;audio controls="controls" 
     src="sounds/courtyard.wav"
     autoplay loop
     class='audio'&gt;
@@ -25,4 +25,4 @@ He can hear neighbors laughing out loud, as they always had in peaceful sunny sp
     autoplay loop
     class='audio'&gt;
     Your browser does not support the HTML5 Audio element.
-&lt;/audio&gt;&lt;/p&gt;</content><category term="public"></category><category term="article"></category></entry></feed>
\ No newline at end of file
+&lt;/audio&gt;&lt;/p&gt;</content><category term="gallery"></category><category term="article"></category></entry></feed>
\ No newline at end of file
diff --git a/output/feeds/gallery.atom.xml b/output/feeds/gallery.atom.xml
new file mode 100644
index 0000000..fcaa167
--- /dev/null
+++ b/output/feeds/gallery.atom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Better days - gallery</title><link href="https://fel.theo-lem.org/" rel="alternate"></link><link href="https://fel.theo-lem.org/feeds/gallery.atom.xml" rel="self"></link><id>https://fel.theo-lem.org/</id><updated>2020-04-24T17:01:00+02:00</updated><entry><title>Construction</title><link href="https://fel.theo-lem.org/construction.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/construction.html</id><content type="html">&lt;p&gt;&lt;audio controls="controls" 
+    src="sounds/construction.wav"
+    autoplay loop
+    class='audio'&gt;
+    Your browser does not support the HTML5 Audio element.
+&lt;/audio&gt;&lt;/p&gt;</content><category term="gallery"></category><category term="article"></category></entry><entry><title>Sunday</title><link href="https://fel.theo-lem.org/sunday.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/sunday.html</id><content type="html">&lt;p&gt;&lt;audio controls="controls" 
+    src="sounds/sunday.wav"
+    autoplay loop
+    class='audio'&gt;
+    Your browser does not support the HTML5 Audio element.
+&lt;/audio&gt;&lt;/p&gt;</content><category term="gallery"></category><category term="article"></category></entry></feed>
\ No newline at end of file
diff --git a/output/feeds/public.atom.xml b/output/feeds/public.atom.xml
index 7e885c2..4ae5b8d 100644
--- a/output/feeds/public.atom.xml
+++ b/output/feeds/public.atom.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Better days - public</title><link href="https://fel.theo-lem.org/" rel="alternate"></link><link href="https://fel.theo-lem.org/feeds/public.atom.xml" rel="self"></link><id>https://fel.theo-lem.org/</id><updated>2020-04-24T17:01:00+02:00</updated><entry><title>Construction</title><link href="https://fel.theo-lem.org/construction.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/construction.html</id><content type="html">&lt;p&gt;&lt;audio controls="controls" 
-    src="sounds/construction.wav"
-    autoplay loop
-    class='audio'&gt;
-    Your browser does not support the HTML5 Audio element.
-&lt;/audio&gt;&lt;/p&gt;</content><category term="public"></category><category term="article"></category></entry><entry><title>Courtyard</title><link href="https://fel.theo-lem.org/courtyard.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/courtyard.html</id><summary type="html">&lt;p&gt;A man and a building.&lt;/p&gt;</summary><content type="html">&lt;p&gt;&lt;audio controls="controls" 
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Better days - public</title><link href="https://fel.theo-lem.org/" rel="alternate"></link><link href="https://fel.theo-lem.org/feeds/public.atom.xml" rel="self"></link><id>https://fel.theo-lem.org/</id><updated>2020-04-24T17:01:00+02:00</updated><entry><title>Courtyard</title><link href="https://fel.theo-lem.org/courtyard.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/courtyard.html</id><summary type="html">&lt;p&gt;A man and a building.&lt;/p&gt;</summary><content type="html">&lt;p&gt;&lt;audio controls="controls" 
     src="sounds/courtyard.wav"
     autoplay loop
     class='audio'&gt;
@@ -20,9 +15,4 @@ At sunset, he starts to think that the angle of the light on the stretch of eart
 &lt;p&gt;He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help.
 He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle.&lt;/p&gt;
 &lt;p&gt;He goes to the balcony twice a day to smoke a cigarette. It overlooks the courtyard, so it is just outside enough to give himself the impression that he is going somewhere. The junk and the dust lingering on the other balconies have made space to allow a chair and a reading person to get a bit of sunlight.
-He can hear neighbors laughing out loud, as they always had in peaceful sunny spring afternoon. They started to watch an old TV show last week. He knows the ending and can even tell some lines.&lt;/p&gt;</content><category term="public"></category></entry><entry><title>Sunday</title><link href="https://fel.theo-lem.org/sunday.html" rel="alternate"></link><published>2020-04-24T17:01:00+02:00</published><updated>2020-04-24T17:01:00+02:00</updated><author><name>felicie</name></author><id>tag:fel.theo-lem.org,2020-04-24:/sunday.html</id><content type="html">&lt;p&gt;&lt;audio controls="controls" 
-    src="sounds/sunday.wav"
-    autoplay loop
-    class='audio'&gt;
-    Your browser does not support the HTML5 Audio element.
-&lt;/audio&gt;&lt;/p&gt;</content><category term="public"></category><category term="article"></category></entry></feed>
\ No newline at end of file
+He can hear neighbors laughing out loud, as they always had in peaceful sunny spring afternoon. They started to watch an old TV show last week. He knows the ending and can even tell some lines.&lt;/p&gt;</content><category term="public"></category></entry></feed>
\ No newline at end of file
diff --git a/output/sunday.html b/output/sunday.html
index 518dd9a..da41b6b 100644
--- a/output/sunday.html
+++ b/output/sunday.html
@@ -15,24 +15,23 @@
     
     <div class='content'>
     <script src="/theme/js/slideshow.js"></script>
-
     <h1 class='article-title'>Sunday</h1>
-    <div class="article">
-        <div class='article-img column'>
-                <img alt="" onclick="showSlide('img-1')" src="/images/Sunday/Sunday-1.jpg">
-                <img alt="" onclick="showSlide('img-2')" src="/images/Sunday/Sunday-2.jpg">
-                <img alt="" onclick="showSlide('img-3')" src="/images/Sunday/Sunday-3.jpg">
-                <img alt="" onclick="showSlide('img-4')" src="/images/Sunday/Sunday-4.jpg">
-                <img alt="" onclick="showSlide('img-5')" src="/images/Sunday/Sunday-5.jpg">
-        </div>
-        <div class='article-content column'> <p><audio controls="controls" 
-    src="sounds/sunday.wav"
-    autoplay loop
-    class='audio'>
-    Your browser does not support the HTML5 Audio element.
-</audio></p></div>
-    </div>
 
+        <div class="gallery">
+        <!-- If there are only images, print them full-width. -->
+            <img class= "gallery-img" alt="" onclick="showSlide('img-1')" src="/images/Sunday/Sunday-1.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-2')" src="/images/Sunday/Sunday-2.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-3')" src="/images/Sunday/Sunday-3.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-4')" src="/images/Sunday/Sunday-4.jpg">
+            <br>
+            <img class= "gallery-img" alt="" onclick="showSlide('img-5')" src="/images/Sunday/Sunday-5.jpg">
+            <br>
+            </div>
+
+    <!-- Slides used for slideshow -->
     <div id="slide-container">
         <div id="close-modal" onclick="closeModal()">X</div>
         <div id="slides" class="modal">
diff --git a/output/theme/css/main-v2.css b/output/theme/css/main-v2.css
index a8307f7..a929c8d 100755
--- a/output/theme/css/main-v2.css
+++ b/output/theme/css/main-v2.css
@@ -78,7 +78,7 @@ header{
     display: flex;
     z-index: 1;
     margin: 10px;
-    max-width: 50%;
+    max-width: 70%;
     position: relative;
 }
 
@@ -158,6 +158,11 @@ p a {
     max-width: 70%;
 }
 
+.gallery-img {
+    width: 100%;
+    padding-bottom: 30px;
+}
+
 .audio {
     display: none;
 }
@@ -177,6 +182,11 @@ p a {
     display: flex;
 }
 
+.gallery {
+    display: block;
+    width: 80%;
+}
+
 .article::after {
     content: "";
     display: block;
diff --git a/themes/felicie/static/css/main-v2.css b/themes/felicie/static/css/main-v2.css
index a8307f7..a929c8d 100755
--- a/themes/felicie/static/css/main-v2.css
+++ b/themes/felicie/static/css/main-v2.css
@@ -78,7 +78,7 @@ header{
     display: flex;
     z-index: 1;
     margin: 10px;
-    max-width: 50%;
+    max-width: 70%;
     position: relative;
 }
 
@@ -158,6 +158,11 @@ p a {
     max-width: 70%;
 }
 
+.gallery-img {
+    width: 100%;
+    padding-bottom: 30px;
+}
+
 .audio {
     display: none;
 }
@@ -177,6 +182,11 @@ p a {
     display: flex;
 }
 
+.gallery {
+    display: block;
+    width: 80%;
+}
+
 .article::after {
     content: "";
     display: block;
diff --git a/themes/felicie/templates/article.html b/themes/felicie/templates/article.html
index 428f23a..5d76b0b 100755
--- a/themes/felicie/templates/article.html
+++ b/themes/felicie/templates/article.html
@@ -6,17 +6,29 @@
 
 {% block content %}
     <script src="{{ SITE_URL }}/theme/js/slideshow.js"></script>
-
     <h1 class='article-title'>{{ article.title }}</h1>
-    <div class="article">
-        <div class='article-img column'>
-            {% for i in [1, 2, 3, 4, 5] %}
-                <img alt="" onclick="showSlide('img-{{ i }}')" src="{{ SITE_URL }}/images/{{article.title}}/{{ article.title }}-{{ i }}.jpg">
-            {% endfor %}
-        </div>
-        <div class='article-content column'> {{ article.content }}</div>
-    </div>
 
+    {% if article.category == 'gallery' %}
+        <div class="gallery">
+        <!-- If there are only images, print them full-width. -->
+            {% for i in [1, 2, 3, 4, 5] %}
+            <img class= "gallery-img" alt="" onclick="showSlide('img-{{ i }}')" src="{{ SITE_URL }}/images/{{article.title}}/{{ article.title }}-{{ i }}.jpg">
+            <br>
+            {% endfor %}
+            </div>
+    {% else %}
+        <!-- If there is a text, print two columns -->
+        <div class="article">
+            <div class='article-img column'>
+                {% for i in [1, 2, 3, 4, 5] %}
+                    <img alt="" onclick="showSlide('img-{{ i }}')" src="{{ SITE_URL }}/images/{{article.title}}/{{ article.title }}-{{ i }}.jpg">
+                {% endfor %}
+            </div>
+            <div class='article-content column'> {{ article.content }}</div> 
+        </div>
+    {% endif%}
+
+    <!-- Slides used for slideshow -->
     <div id="slide-container">
         <div id="close-modal" onclick="closeModal()">X</div>
         <div id="slides" class="modal">