cleanup formatting, compress header blocks, make header blocks easier to parse by humans, etc

themes/gochowdown/layouts/notes/single.html

@@ -4,14 +4,17 @@
 {{ define "content" }}
 
 <div class="container" itemscope itemtype="http://schema.org/Recipe">
-<!-- call up the image and image credit link -->
   <article class="post-content px2">
     <!-- call up the main recipe title and content -->
     <header class="post-header">
       <h1 class="post-title center m1 sm-mt3" itemprop="name">{{ .Title }}</h1>
     </header>
 
-   <div class="recipe-source">
+    <div class="recipe-source center">
+      <div class="clearfix mt3">
+        Published: {{ .PublishDate.Format "January 2, 2006" }} &bull; Last Updated: {{ .Lastmod.Format "January 2, 2006" }}
+      </div>
+
       <div class="clearfix mt3">
         Chef:
         {{if .Params.authorurl }}
@@ -20,7 +23,6 @@
           {{.Params.AuthorName}}
           {{end}}
       </div>
-    </div>
 
       {{ with .Params.Category }}{{ partial "taxonomy/notes" . }}{{ end }}
       {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
@@ -30,10 +32,9 @@
       <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
     </div>
 
-    <br />
-
     {{ if .Params.inspiration }}
-     <div class="px2 mt3 clearfix"><div class="sm-col-8 mx-auto" itemprop="description">
+    <div class="px2 mt3 clearfix center">
+      <div class="sm-col-8 mx-auto" itemprop="description">
         <h3 class="blue mt0 mb2 xs-center">Inspiration & Resources</h3>
         {{ range .Params.inspiration }}
         <ul class="recipe-source">
@@ -45,9 +46,9 @@
         </ul>
         {{ end }}
         {{ end }}
-     </div></div>
-
       </div>
+    </div>
+
 
     <!-- call up the image and image credit link -->
     {{ if .Params.image }}
@@ -59,7 +60,9 @@
         {{ end }}
         {{ end }}
         {{ if .Params.imagecaption }}
-        <figcaption><p><b>Pictured:</b> {{ .Params.imagecaption }}</p></figcaption>
+        <figcaption>
+          <p><b>Pictured:</b> {{ .Params.imagecaption }}</p>
+        </figcaption>
         {{ end }}
       </figure>
     </div>

themes/gochowdown/layouts/partials/taxonomy/category.html

@@ -1,5 +0,0 @@
-<div class="categories">
-  <p class="clearfix">{{ i18n "category"}}:
-    <a href="{{ ( printf "category/%s/" ( . | urlize ) ) | relLangURL }}"><span itemprop="recipeCategory">{{ . | humanize }}</span></a>
-  </p>
-</div>

themes/gochowdown/layouts/partials/taxonomy/cuisine.html

@@ -1,5 +0,0 @@
-<div class="categories">
-  <p class="clearfix">{{ i18n "cuisine"}}:
-    <a href="{{ ( printf "cuisine/%s/" ( . | urlize ) ) | relLangURL }}"><span itemprop="recipeCuisine">{{ . | humanize }}</span></a>
-  </p>
-</div>

themes/gochowdown/layouts/partials/taxonomy/notes.html

@@ -1,5 +0,0 @@
-<div class="categories">
-  <p class="clearfix">{{ i18n "cuisine"}}:
-    <a href="{{ ( printf "notes/%s/" ( . | urlize ) ) | relLangURL }}"><span itemprop="recipeCuisine">{{ . | humanize }}</span></a>
-  </p>
-</div>

themes/gochowdown/layouts/recipes/single.html

@@ -10,41 +10,29 @@
       <h1 class="post-title center m1 sm-mt3" itemprop="name">{{ .Title }}</h1>
     </header>
 
-    <div class="recipe-source">
+    <div class="recipe-source center">
+      <div class="clearfix mt3">
+        Published: {{ .PublishDate.Format "January 2, 2006" }} &bull; Last Updated: {{ .Lastmod.Format "January 2, 2006" }}
+      </div>
       <div class="clearfix mt3">
-     <div class="sm-col sm-col-3">
           Chef:
-     {{if .Params.authorurl }}
-       <a href="{{.Params.authorurl}}">{{.Params.AuthorName}}</a>
-       {{else}}
-       {{.Params.AuthorName}}
-     {{end}}
-    </div>
-    <div class="sm-col sm-col-3">
-    {{ with .Params.Category }}{{ partial "taxonomy/category" . }}{{ end }} 
-    </div>
-    <div class="sm-col sm-col-3">
-    {{ with .Params.Cuisine }}{{ partial "taxonomy/cuisine" . }}{{ end }}
-    </div>
-    </div>
+          {{ if .Params.authorurl }}<a href="{{ .Params.authorurl }}">{{ .Params.AuthorName }}</a>{{ else }}{{ .Params.AuthorName }}{{ end }}
+		  {{ if .Params.Category }} &bull; {{ end }}
+		  Category: <a href="{{ ( printf "category/%s/" ( .Params.Category | urlize ) ) | relLangURL }}"><span itemprop="recipeCategory">{{ .Params.Category | humanize }}</span></a>
+		  {{ if .Params.Cuisine }} &bull; {{ end }}
+		  Cuisine: <a href="{{ ( printf "cuisine/%s/" ( .Params.Cuisine | urlize ) ) | relLangURL }}"><span itemprop="recipeCuisine">{{ .Params.Cuisine | humanize }}</span></a>
 
+      </div>
+      <div class="clearfix mt3">
         {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
       </div>
-
+      {{ if (or (or .Params.yield .Params.prepTime) .Params.cookTime) }}
       <div class="clearfix mt3">
-      {{ with .Params.yield }}
-      <div class="sm-col sm-col-3">
-          <h4 class="blue mt0 mb2 xs-center">{{ i18n "yields" . }}</h4>
-      </div>
-      {{ end }}
-      {{ with .Params.prepTime }}
-      <div class="sm-col sm-col-3">
-        <h4 class="blue mt0 mb2 xs-center">{{ i18n "prepTime" . }}</h4>
-      </div>
-      {{ end }}
-      {{ with .Params.cookTime }}
-      <div class="sm-col sm-col-3">
-        <h4 class="blue mt0 mb2 xs-center">{{ i18n "cookTime" . }}</h4>
+		{{ if .Params.yield }}Yields: {{ .Params.yield }}{{ end }}
+		{{ if (and .Params.prepTime .Params.yield) }} &bull; {{ end }}
+		{{ if .Params.prepTime }}Prep Time: {{ .Params.prepTime }}{{ end }}
+		{{ if (and .Params.cookTime (or .Params.yield .Params.prepTime)) }} &bull; {{ end }}
+		{{ if .Params.cookTime }}Cook Time: {{ .Params.cookTime }}{{ end }}
       </div>
       {{ end }}
     </div>
@@ -52,19 +40,6 @@
     <!-- call up recipe and directions -->
     <div class="clearfix mt3">
       <div class="sm-col sm-col-6 lg-col-6 recipeItems">
-        <!-- check if it's a component-based recipe -->
-        {{ with .Params.Components}}
-        <h4 class="blue mt0 mb2 xs-center">{{ i18n "components" }}</h4>
-        <ul>
-          <!-- list components that make up recipe -->
-          {{ range . }}
-          <li>
-            {{ with ( . | markdownify) }}{{ partial "recipe_item.html" . }}{{ end }}
-          </li>
-          {{ end }}
-        </ul>
-        {{ end }}
-
         {{ with .Params.Ingredients }}
         <h4 class="blue mt0 mb2 xs-center">{{ i18n "ingredients" }}</h4>
         <ul itemprop="ingredients">
@@ -78,75 +53,25 @@
         {{ end }}
       </div>
 
+	  {{ if .Params.directions }}
       <div class="sm-col sm-col-6 lg-col-6 recipeItems">
         <h4 class="blue mt0 mb2 xs-center">{{ i18n "directions" }}</h4>
         <ul itemprop="recipeInstructions">
           {{ range .Params.Directions }}
           <li>
-            {{ with ( . | markdownify) }}{{ partial "recipe_item.html" . }}{{ end }}</li>
+            {{ with ( . | markdownify) }}{{ partial "recipe_item.html" . }}{{ end }}
+          </li>
           {{ end }}
         </ul>
       </div>
     </div>
+	{{ end }}
     <!-- end recipe and directions -->
 
     <div class="px2 mt3 clearfix">
       <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
     </div>
 
-    <!-- check if it's a component-based recipe, render it -->
-    {{ with .Params.Components }}
-    <div class="components bg-darken-2 p2 mt3 mb3 center">
-      &darr; {{ i18n "this-is-a" }} <strong class="blue">{{ i18n "component-based-recipe" }}</strong> ({{ i18n "fancy-talk" }}). &darr;
-    </div>
-
-    <div class="clearfix mxn2">
-    {{ range  . }}
-      {{ $compTitle := . }}
-      <div class="sm-col sm-col-4 px2 recipeItems">
-      {{ range where $.Site.Pages "Title" $compTitle }}
-        <h4 class="blue center"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
-        {{ range (.Resources.ByType "image") }}
-        <div class="image ratio bg-cover" style="background-image:url({{$.Site.BaseURL}}{{ .RelPermalink }});">
-          <img class="hide" itemprop="photo" src="{{$.Site.BaseURL}}{{ .RelPermalink }}" />
-        </div>
-        {{ end }}
-        {{ if .Params.Imagecredit }}
-          <a href="{{ .Params.Imagecredit }}" class="right">
-            <svg class="js-geomicon geomicon" width="14" height="14" data-icon="camera" viewBox="0 0 32 32" style="fill:currentcolor">
-              <title>camera icon</title>
-              <path d="M0 6 L8 6 L10 2 L22 2 L24 6 L32 6 L32 28 L0 28 z M9 17 A7 7 0 0 0 23 17 A7 7 0 0 0 9 17"></path>
-            </svg>
-          </a>
-        {{ end }}
-
-        <h4 class="blue regular xs-center">{{ i18n "ingredients" }}</h4>
-        <ul class="ingredients" itemprop="ingredients">
-          {{ range .Params.Ingredients }}
-          <li itemprop="ingredient">
-            {{ with ( . | markdownify) }}{{ partial "recipe_item.html" . }}{{ end }}
-          </li>
-          {{ end }}
-        </ul>
-
-        <h4 class="blue regular xs-center">{{ i18n "steps" }}</h4>
-        <ul itemprop="instructions">
-          {{ range .Params.Directions }}
-          <li>
-            {{ with ( . | markdownify) }}{{ partial "recipe_item.html" . }}{{ end }}
-          </li>
-          {{ end }}
-        </ul>
-
-      {{ end }}
-      </div>
-    {{ end }}
-    </div>
-
-    {{ end }}
-    <!-- end components -->
-    <br />
-
     {{ if .Params.inspiration }}
     <h3 class="blue mt0 mb2 xs-center center">Inspiration & Resources</h3>
     {{ range .Params.inspiration }}
@@ -170,7 +95,9 @@
         {{ end }}
         {{ end }}
         {{ if .Params.imagecaption }}
-        <figcaption><p><b>Pictured:</b> {{ .Params.imagecaption }}</p></figcaption>
+        <figcaption>
+          <p><b>Pictured:</b> {{ .Params.imagecaption }}</p>
+        </figcaption>
         {{ end }}
       </figure>
     </div>