Merge pull request #526 from SpineEventEngine/fix-blog

Fix the date rendering in the blog

Author: JuliaEvseeva

site/layouts/_default/baseof.html

@@ -14,7 +14,6 @@
             {{ partial "components/footer/footer.html" . }}
         </div>
     </div>
-    {{ partial "components/cookie-notice.html" . }}
     {{ partial "scripts/body-scripts.html" . }}
 </body>
 </html>

site/layouts/_partials/blog/post-info.html

@@ -28,19 +28,21 @@
 {{ $hasLabel := .has_label | default false }}
 
 {{ $label := "" }}
-{{ if and (not $context.Params.author) $hasLabel }}
+{{ $postAuthor := $context.Params.author }}
+
+{{ if and (not $postAuthor) $hasLabel }}
     {{ $label = "Posted on" }}
 {{ end }}
 
 <div class="post-info">
-    {{ with $context.Params.author }}
-        <span class="post-author">{{ . }}</span>
-        <span>on</span>
-    {{ end }}
-    {{ with $context.Params.publishdate }}
-        {{ partial "components/iso-date.html" (dict
+    {{- with $postAuthor -}}
+        {{- $author := printf "%s %s&nbsp;" . "on" -}}
+        <span class="post-author">{{ $author | safeHTML }}</span>
+    {{- end -}}
+    {{- with $context.Params.publishdate -}}
+        {{- partial "components/iso-date.html" (dict
             "date" .
             "label" $label
-        ) }}
-    {{ end }}
+        ) -}}
+    {{- end -}}
 </div>

site/layouts/_partials/components/cookie-notice.html

@@ -24,14 +24,14 @@
   ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
-{{ $date := .date }}
-{{ $label := .label }}
+{{- $date := .date -}}
+{{- $label := .label -}}
 
-{{ $formattedDate := $date | time.Format ":date_long" }}
-{{ $isoDate := $date | time.Format "2006-01-02" }}
+{{- $formattedDate := $date | time.Format ":date_long" -}}
+{{- $isoDate := $date | time.Format "2006-01-02" -}}
 <p class="date">
-    {{ with $label }}
-        {{ .}}
-    {{ end }}
+    {{- with $label -}}
+        <span>{{ . }}&nbsp;</span>
+    {{- end -}}
     <time datetime="{{ $isoDate }}">{{ $formattedDate }}</time>
 </p>