Merge pull request #78 from thekid/feature/text-before-images

Add text before images

Author: thekid

src/it/php/de/thekid/dialog/unittest/ServeTest.php

@@ -44,19 +44,37 @@ public function serves_favicon() {
   #[Test]
   public function serves_robots_txt() {
     $res= $this->serve('GET', '/robots.txt');
-    Assert::equals([200, 'text/plain; charset=utf-8'], [$res->status(), $res->headers()['Content-Type']]);
+    Assert::equals(
+      [200, 'text/plain; charset=utf-8'],
+      [$res->status(), $res->headers()['Content-Type']]
+    );
   }
 
   #[Test]
   public function serves_homepage() {
     $res= $this->serve('GET', '/');
-    Assert::equals([200, 'text/html; charset=utf-8'], [$res->status(), $res->headers()['Content-Type']]);
+    Assert::equals(
+      [200, 'text/html; charset=utf-8'], 
+      [$res->status(), $res->headers()['Content-Type']]
+    );
+  }
+
+  #[Test]
+  public function serves_atomfeed() {
+    $res= $this->serve('GET', '/feed/atom');
+    Assert::equals(
+      [200, 'application/atom+xml; charset=utf-8'],
+      [$res->status(), $res->headers()['Content-Type']]
+    );
   }
 
   #[Test]
   public function type_ahead_api_publicly_accessible() {
     $res= $this->serve('GET', '/api/suggestions?q=');
-    Assert::equals([200, 'application/json; charset=utf-8'], [$res->status(), $res->headers()['Content-Type']]);
+    Assert::equals(
+      [200, 'application/json; charset=utf-8'],
+      [$res->status(), $res->headers()['Content-Type']]
+    );
   }
 
   #[Test]

src/main/handlebars/content.handlebars

@@ -31,9 +31,7 @@ parent: feed
         <div class="popup"></div>
       </div>
 
-      <div class="content">
-        {{& item.content}}
-      </div>
+      <div class="content">{{& item.content}}</div>
 
       {{> partials/images in=item style='all'}}
     </section>

src/main/handlebars/feed.handlebars

@@ -42,6 +42,8 @@
             {{> partials/weather in=.}}
           </div>
 
+          <div class="content">{{& content}}</div>
+
           {{! Content formed of a single video can be played back inline directly }}
           {{#if (all (equals 1 (size images)) images.0.is.video)}}
             <div class="images is-single">
@@ -71,10 +73,6 @@
               </div>
             </a>
           {{/if}}
-
-          <div class="content">
-            {{& content}}
-          </div>
         </section>
       {{/each}}
     {{else}}

src/main/handlebars/journey.handlebars

@@ -33,9 +33,7 @@ parent: feed
         <div class="popup"></div>
       </div>
 
-      <div class="content">
-        {{& journey.content}}
-      </div>
+      <div class="content">{{& journey.content}}</div>
 
       <ul class="summary">
         {{#each itinerary}}
@@ -66,11 +64,10 @@ parent: feed
             {{count views '' '(Eine Ansicht)' '(# Ansichten)'}}
             {{> partials/weather in=.}}
           </div>
-          {{> partials/images in=.}}
 
-          <div class="content">
-            {{& content}}
-          </div>
+          <div class="content">{{& content}}</div>
+
+          {{> partials/images in=.}}
         </section>
       {{/each}}
     {{else}}

src/main/handlebars/layout.handlebars

@@ -538,8 +538,11 @@
       overflow: hidden;
 
       &.overview {
-        grid-template-columns: 1fr 1fr 1fr 1fr;
-        padding-bottom: 1rem;
+        grid-template-columns: repeat(4, 1fr);
+      }
+
+      &.is-empty {
+        display: none;
       }
 
       &.all, &.is-single, &.is-preview {
@@ -793,7 +796,7 @@
       }
 
       .images.overview {
-        grid-template-columns: 1fr 1fr;
+        grid-template-columns: repeat(2, 1fr);
       }
 
       .cover h1 {