- Fix overridden publish date/time

- Add books to devotion theme
- Tweak styles on devotion theme

src/MyWebLog/Handlers/Post.fs

@@ -336,8 +336,10 @@ let save : HttpHandler = fun next ctx -> task {
         let post =
             match model.setPublished with
             | true ->
-                let dt = DateTime (model.pubOverride.Value.ToUniversalTime().Ticks, DateTimeKind.Utc)
-                printf $"**** DateKind = {dt.Kind}"
+                let dt =
+                    TimeZoneInfo.ConvertTimeToUtc
+                        (DateTime (model.pubOverride.Value.Ticks, DateTimeKind.Unspecified),
+                         TimeZoneInfo.FindSystemTimeZoneById webLog.timeZone)
                 match model.setUpdated with
                 | true ->
                     { post with

src/MyWebLog/appsettings.json

@@ -3,7 +3,7 @@
     "hostname": "data02.bitbadger.solutions",
     "database": "myWebLog_dev"
   },
-  "Generator": "myWebLog 2.0-alpha29",
+  "Generator": "myWebLog 2.0-alpha30",
   "Logging": {
     "LogLevel": {
       "MyWebLog.Handlers": "Debug"

src/MyWebLog/themes/admin/post-edit.liquid

@@ -55,8 +55,7 @@
               </button>
             </legend>
             <div id="metaItemContainer" class="collapse">
-              {%- assign has_media = model.metaNames | where: "episode_media_file" | size -%}
-              {%- unless has_media == 0 %}
+              {%- unless model.meta_names contains "episode_media_file" %}
                 <button class="btn btn-sm btn-secondary" onclick="Admin.addPodcastFields()" id="addPodcastFieldButton">
                   Add Podcast Episode Fields
                 </button>

src/MyWebLog/themes/awftw/index.liquid

@@ -1,29 +1,20 @@
+{%- assign ot_books = "ZPSOFpd27EeFQvrTZE296Q|VERPK2rYN0G44bo7LjBSRw|fA6zV4ON002oMPoVUZs17Q|vLsJo3GL1ECOQbSIEMUaig|WZ933xSw6kmo7644X9mmXw|68f2_zVlekaaIZD_BX0sZg|WffJH3t68kuVUyNZXYSFYw|xNlTF35s_UulA7S-NTgcAA|0y4PDhOc7kiw9hp0RwaJCg|59ysY5363EaVCG_g7fUH5A|aBlyuIzm206LTKx-uYIGnA|YoQKqdkrbUivAeUf3DISow|WOAq8A9bB0a8TKmYAB7IdA|TsxpRv1lrUiNNeGGfIx6XA|rJkq5d_MyUGPgACkMm0iTw|F_X9vUdpAUy957_qSejcnw|5jvC66CtG06zRlkKuP1naw|su8Qq5KUwEyoDmssUQhjHQ|FtVxmNkn_EavFJY3jqodfA|oToPYf8OQkCBsB6J65j3SA|rKzSJptZjU6YAOy6nIhfbw|K2lHyseO6UWdHftwLswhgg|rpThtWd1HUuSeyHLIs7gpw|CD8jYdoi0kGyXTbsD6F0aA|ttObDyRHnUudsSNUsdQ8BA|fi4ORg0B90C-DeQGTrOaMA|6AW2cZfbAkWX5HT4XEGjig|Pf6Gllf9gU-IF9xDcmWd0g|7cDaYscN6kmKsgwuiwPt9Q|WG_j96GOH0KzGORwKL8YVA|p7wi1sNiGUWhUa1tqRhS8Q|CgIcCoHtpUiCshdHe8wMoA|V1PTu4Xoq0eUnniYIb8Mkw|1h1LTN1XyU-qWIPHVY398A|t34QuaRN6kOWizvKNPtdSg|Tw5oe-kzfkiqCc6_4AVskQ|At7RBOfiN0aWMKln0Dkreg|JiUy9RgUZUOrjeMdBpln9g|hc7roSimX0mukJPTe6clWA|kTbX-fYdFk6TJ8Tikec-AQ" | split: "|" -%}
+{%- assign nt_books = "Ksr4Dto97Um5NxhLpoRk5A|w-4_O87lYE-9_nrIXOuIHw|oJ_dgZir80mv2hat1rK4Qg|9QCQnNlevES8cYwHZWzrJw|DbkcRuTlnUyPXPPQso3L6g|CJZtcewtvUKqJH-rIUoR6g|xMRsXDsvDUiylTlFq6Tv-w|RmItBW75JUG7Iish-KRw1g|lKSYua82uE-YeMAzxqfrMg|Bopzxr31bkWJrFqO6o1oxg|KhiJGiHzvkiHXvkk9fEUOg|vFCY7egZskyaH-0jwDdQTQ|uxYuSzlDzU-AYGK-uo3RTg|VANy1bANREmh2DLujlaKGQ|CyO7saVd8kWHwzs3MaLe5w|71tayZrmnk6E8E-z8IWeIw|5H2xaOfutEyeZ755pY0mmA|uPHRl846Xk-SG-HEmITW-w|DF4Ub1Vqg0GSBIGWYJgCGw|-LfywKHkMEqRb1WVNSkcxg|AgO2o_kbG0GVTNVNT0233A|R6oXNiKgIkqjGhp-42inxg|WI1S5jo5-kOb5bgoNSb8Hg|MVsyPrQ8iUa_M6DJ4IR0CQ|6iDQYEk4yUa6B_-z49KYHA|MznlCejhZUqq_rxf4xrmwg|kG4B-4Pt6ECSxm14f3FWiA|T9GJpphYiUGYVgw7lmkmDA" | split: "|" -%}
+{%- assign series_ids = "fpgE1kmfr0-xNBMbxUWxMA|FP7IiNghSEeZLBW21kkAgw|ca1OWFTvMU2H-lHpjsm5MQ|aK4djQBz_UCObjyPq5At_A" | split: "|" -%}
+{%- assign series_details = "FP7IiNghSEeZLBW21kkAgw,Advent Readings,2019/advent-readings.html|aK4djQBz_UCObjyPq5At_A,Twisted Scripture,2017/twisted-scripture.html|ca1OWFTvMU2H-lHpjsm5MQ,The “3:16”s of the New Testament,2007/the-316s-of-the-new-testament.html" | split: "|" -%}
 <div class="content">
-  {% if is_category or is_tag %}
+  {%- if is_category or is_tag %}
     <h1 class="index-title">{{ page_title }}</h1>
-    <!--
-    TODO: Convert this to Liquid
-    if page.tag || page.category
-    h1.index-title
-    if page.category
-    if oldTestamentBooks.indexOf(page.category) >= 0 || newTestamentBooks.indexOf(page.category) >= 0
-    | Posts referencing the
-    if page.category !== 'Old Testament' && page.category !== 'New Testament'
-    = ' book of'
-    = ' ' + page.category
-    else
-    | Posts categorized &ldquo;#{page.category}&rdquo;
-    else
-    | Posts tagged &ldquo;#{page.tag}&rdquo;
-    if 1 !== page.current
-    small &nbsp; &nbsp; (page #{page.current})
-    -->
-  {% endif %}
+    {%- if is_category %}
+      {%- assign cat = categories | where: "slug", slug | first -%}
+      {%- if cat.description %}<h2 class="index-title">{{ cat.description.value }}</h2>{% endif -%}
+    {%- endif %}
+  {%- endif %}
   {% for post in model.posts %}
     <article class="item">
       <h1 class="item-heading">
         <a href="{{ post.permalink | relative_link }}"
-           title="Permanent Link to &ldquo;{{ post.title | strip_html | escape }}&rdquo;">
+           title="Permanent Link to &ldquo;{{ post.title | strip_html | escape_once }}&rdquo;">
           {{ post.title }}
         </a>
       </h1>
@@ -67,116 +58,101 @@
   </div>
   <div class="item">
     <h4 class="item-heading">Series</h4>
-    <h4 class="text-center">Advent Readings</h4>
+    {%- for series in series_details %}
+      {% assign parts = series | split: "," %}
+      {% assign cat = categories | where: "id", parts[0] | first %}
+      <h4 class="text-center">{{ cat.name }}</h4>
       <p class="text-center">
-      <a href="{{ "2019/advent-readings.html" | relative_link }}"
-         title="Advent Readings &bull; A Word from the Word">
+        <a href="{{ parts[2] | relative_link }}"
+           title="About the series &ldquo;{{ cat.name | escape_once }}&rdquo; &bull; A Word from the Word">
           About the Series
         </a> &bull;
-      <a href=" {{ "category/series/advent-readings/" | relative_link }}">Read All</a>
-      <small class="count">(-{% comment %} TODO: count
-        #{catCount('series/advent-readings')})
-      {% endcomment %})</small>
-    </p>
-    <hr class="sidebar-sep">
-    <h4 class="text-center">Twisted Scripture</h4>
-    <p class="text-center">
-      <a href="{{ "2017/twisted-scripture.html" | relative_link }}"
-         title="Twisted Scripture &bull; A Word from the Word">
-        About the Series
-      </a> &bull;
-      <a href="{{ "category/series/twisted-scripture/" | relative_link }}">Read All</a>
-      <small class="count">(-{% comment %} TODO: count
-        #{catCount('series/twisted-scripture')})
-      {% endcomment %})</small>
-    </p>
-    <hr class="sidebar-sep">
-    <h4 class="text-center">The &ldquo;3:16s&rdquo; of the New Testament</h4>
-    <p class="text-center">
-      <a href="{{ "2007/the-316s-of-the-new-testament.html" | relative_link }}"
-         title="The &ldquo;3:16s&rdquo; of the New Testament &bull; A Word from the Word">
-        About the Series
-      </a> &bull;
-      <a href="{{ "category/series/the-3-16-s-of-the-new-testament/" | relative_link }}">Read All</a>
-      <small class="count">(-{% comment %} TODO: count
-        #{catCount('series/the-3-16-s-of-the-new-testament')})
-      {% endcomment %})</small>
+        <a href="{{ cat | category_link }}">Read All</a> <small class="count">({{ cat.post_count }})</small>
       </p>
+      {% unless forloop.last %}<hr class="sidebar-sep">{% endunless %}
+    {% endfor %}
   </div>
-  {% comment %}
-  TODO: group categories by Old Testament / New Testament / Topics
-        (may work better once the categories are loaded and we can hard-code IDs
-  {% endcomment %}
   <div class="item">
     <h4 class="item-heading">Books</h4>
     <p>Each devotion is categorized under the books of the Bible which are referenced within it.</p>
     <hr class="sidebar-sep">
     <h4 class="text-center">Old Testament</h4>
     <p class="text-center">
-      <a href="{{ "category/old-testament/" | relative_link }}"
-         title="Devotions referencing the Old Testament">
+      {%- assign cat_id = ot_books | first -%}
+      {%- assign cat = categories | where: "id", cat_id | first -%}
+      <a href="{{ cat | category_link }}"
+         {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
         See All
-      </a> <small class="count">(-{% comment %} TODO: count
-        #{catCount('old-testament')})
-      {% endcomment %})</small>
+      </a> <small class="count">({{ cat.post_count }})</small>
     </p>
     <ul>
+      {%- assign first_time = true -%}
       {% for cat_id in ot_books -%}
+        {%- if first_time -%}
+          {%- assign first_time = false -%}
+        {%- else %}
           {%- assign cat = categories | where: "id", cat_id | first -%}
           <li>
             {% if cat.post_count == 0 -%}
-            <span title="Devotions referencing the book of {{ cat.name }}">{{ cat.name }}</span>
-            <small class="count">(0)</small>
+              <span{% if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
+                {{ cat.name }}
+              </span> <small class="count">(0)</small>
             {%- else -%}
               <a href="{{ cat | category_link }}"
-               title="Devotions referencing the book of {{ cat.name}}">
+                 {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
                 {{ cat.name }}
               </a> <small class="count">({{ cat.post_count }})</small>
             {%- endif %}
           </li>
+        {%- endif %}
       {%- endfor %}
     </ul>
     <hr class="sidebar-sep">
     <h4 class="text-center">New Testament</h4>
     <p class="text-center">
-      <a href="{{ "category/new-testament/" | relative_link }}"
-         title="Devotions referencing the New Testament">
+      {%- assign cat_id = nt_books | first -%}
+      {%- assign cat = categories | where: "id", cat_id | first -%}
+      <a href="{{ cat | category_link }}"
+         {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
         See All
-      </a> <small class="count">(-{% comment %} TODO: count
-        #{catCount('new-testament')})
-        {% endcomment %})</small>
+      </a> <small class="count">({{ cat.post_count }})</small>
     </p>
     <ul>
-      {% for cat_id in nt_books -%}
+      {%- assign first_time = true -%}
+      {%- for cat_id in nt_books -%}
+        {%- if first_time -%}
+          {%- assign first_time = false -%}
+        {%- else %}
           {%- assign cat = categories | where: "id", cat_id | first -%}
           <li>
-          {% if cat.post_count == 0 %}
-            <span title="Devotions referencing the book of {{ cat.name }}">{{ cat.name }}</span>
-            <small class="count">(0)</small>
-          {% else %}
+            {% if cat.post_count == 0 -%}
+              <span{% if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
+                {{ cat.name }}
+              </span> <small class="count">(0)</small>
+            {%- else -%}
               <a href="{{ cat | category_link }}"
-               title="Devotions referencing the book of {{ cat.name }}">
+              {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
                 {{ cat.name }}
               </a> <small class="count">({{ cat.post_count }})</small>
-          {% endif %}
+            {%- endif %}
           </li>
+        {% endif %}
       {% endfor %}
     </ul>
   </div>
   <div class="item">
-    {% comment %}
-    - var topics = cats.filter(excludeBooks).filter(cat => !cat.slug.startsWith('series')).sort((a, b) => a.name.localeCompare(b.name))
-    {% endcomment %}
     <h4 class="item-heading">Topics</h4>
     <ul>
-      {% for cat_id in topics %}
-        {%- assign cat = categories | where: "id", cat_id | first -%}
+      {%- for cat in categories -%}
+        {%- unless ot_books contains cat.id or nt_books contains cat.id or series_ids contains cat.id -%}
           <li>
+            {%- for it in cat.parent_names %} &nbsp; {% endfor -%}
             <a href="{{ cat | category_link }}"
-             title="Devotions about {{ cat.name | escape }}">
+               {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
               {{ cat.name }}
             </a> <small class="count">({{ cat.post_count }})</small>
           </li>
+        {% endunless %}
       {% endfor %}
     </ul>
   </div>

src/MyWebLog/themes/awftw/single-post.liquid

@@ -1,8 +1,11 @@
+{%- assign ot_books = "ZPSOFpd27EeFQvrTZE296Q|VERPK2rYN0G44bo7LjBSRw|fA6zV4ON002oMPoVUZs17Q|vLsJo3GL1ECOQbSIEMUaig|WZ933xSw6kmo7644X9mmXw|68f2_zVlekaaIZD_BX0sZg|WffJH3t68kuVUyNZXYSFYw|xNlTF35s_UulA7S-NTgcAA|0y4PDhOc7kiw9hp0RwaJCg|59ysY5363EaVCG_g7fUH5A|aBlyuIzm206LTKx-uYIGnA|YoQKqdkrbUivAeUf3DISow|WOAq8A9bB0a8TKmYAB7IdA|TsxpRv1lrUiNNeGGfIx6XA|rJkq5d_MyUGPgACkMm0iTw|F_X9vUdpAUy957_qSejcnw|5jvC66CtG06zRlkKuP1naw|su8Qq5KUwEyoDmssUQhjHQ|FtVxmNkn_EavFJY3jqodfA|oToPYf8OQkCBsB6J65j3SA|rKzSJptZjU6YAOy6nIhfbw|K2lHyseO6UWdHftwLswhgg|rpThtWd1HUuSeyHLIs7gpw|CD8jYdoi0kGyXTbsD6F0aA|ttObDyRHnUudsSNUsdQ8BA|fi4ORg0B90C-DeQGTrOaMA|6AW2cZfbAkWX5HT4XEGjig|Pf6Gllf9gU-IF9xDcmWd0g|7cDaYscN6kmKsgwuiwPt9Q|WG_j96GOH0KzGORwKL8YVA|p7wi1sNiGUWhUa1tqRhS8Q|CgIcCoHtpUiCshdHe8wMoA|V1PTu4Xoq0eUnniYIb8Mkw|1h1LTN1XyU-qWIPHVY398A|t34QuaRN6kOWizvKNPtdSg|Tw5oe-kzfkiqCc6_4AVskQ|At7RBOfiN0aWMKln0Dkreg|JiUy9RgUZUOrjeMdBpln9g|hc7roSimX0mukJPTe6clWA|kTbX-fYdFk6TJ8Tikec-AQ" | split: "|" -%}
+{%- assign nt_books = "Ksr4Dto97Um5NxhLpoRk5A|w-4_O87lYE-9_nrIXOuIHw|oJ_dgZir80mv2hat1rK4Qg|9QCQnNlevES8cYwHZWzrJw|DbkcRuTlnUyPXPPQso3L6g|CJZtcewtvUKqJH-rIUoR6g|xMRsXDsvDUiylTlFq6Tv-w|RmItBW75JUG7Iish-KRw1g|lKSYua82uE-YeMAzxqfrMg|Bopzxr31bkWJrFqO6o1oxg|KhiJGiHzvkiHXvkk9fEUOg|vFCY7egZskyaH-0jwDdQTQ|uxYuSzlDzU-AYGK-uo3RTg|VANy1bANREmh2DLujlaKGQ|CyO7saVd8kWHwzs3MaLe5w|71tayZrmnk6E8E-z8IWeIw|5H2xaOfutEyeZ755pY0mmA|uPHRl846Xk-SG-HEmITW-w|DF4Ub1Vqg0GSBIGWYJgCGw|-LfywKHkMEqRb1WVNSkcxg|AgO2o_kbG0GVTNVNT0233A|R6oXNiKgIkqjGhp-42inxg|WI1S5jo5-kOb5bgoNSb8Hg|MVsyPrQ8iUa_M6DJ4IR0CQ|6iDQYEk4yUa6B_-z49KYHA|MznlCejhZUqq_rxf4xrmwg|kG4B-4Pt6ECSxm14f3FWiA|T9GJpphYiUGYVgw7lmkmDA" | split: "|" -%}
+{%- assign series_ids = "fpgE1kmfr0-xNBMbxUWxMA|FP7IiNghSEeZLBW21kkAgw|ca1OWFTvMU2H-lHpjsm5MQ|aK4djQBz_UCObjyPq5At_A" | split: "|" -%}
 {%- assign post = model.posts | first -%}
 <div class="content">
   <article class="item">
     <h1 class="item-heading">{{ post.title }}</h1>
-    {% assign media = post.meta | value: "episode_media_file" %}
+    {% assign media = post.metadata | value: "episode_media_file" %}
     {%- unless media == "-- episode_media_file not found --" %}
       <aside class="podcast">
         <p class="text-center"><strong>Listen While<br>You Read</strong></p>
@@ -22,13 +25,13 @@
     <div class="nav-previous">
       {% if model.newer_link %}
         <span class="post-nav">Previous Post</span><br>
-        <a class="post-nav-title" href="{{ model.newer_link.value }}">{{ model.newer_name.value }}</a>
+        <a class="post-nav-title" href="{{ model.newer_link.value | relative_link }}">{{ model.newer_name.value }}</a>
       {% endif %}
     </div>
     <div class="nav-next">
       {% if model.older_link %}
         <span class="post-nav">Next Post</span> <br>
-        <a class="post-nav-title" href="{{ model.older_link.value }}">{{ model.older_name.value }}</a>
+        <a class="post-nav-title" href="{{ model.older_link.value | relative_link }}">{{ model.older_name.value }}</a>
       {% endif %}
     </div>
   </nav>
@@ -51,59 +54,71 @@
     </div>
   </div>
   {% endcomment %}
-  {%- if post_ot_book_count > 0 or post_nt_book_count > 0 %}
+  {%- assign has_ot = false -%}
+  {%- for ot_id in ot_books -%}
+    {%- if post.category_ids contains ot_id %}{% assign has_ot = true %}{% endif -%}
+  {%- endfor -%}
+  {%- assign has_nt = false -%}
+  {%- for nt_id in nt_books -%}
+    {%- if post.category_ids contains nt_id %}{% assign has_nt = true %}{% endif -%}
+  {%- endfor -%}
+  {%- if has_ot or has_nt %}
     <div class="item">
       <h4 class="item-heading">Scripture</h4>
-      {%- if post_ot_book_count > 0 %}
+      {%- if has_ot %}
         <ul>
           <li>
-            {%- assign cat_id = post_ot_books | first -%}
+            {%- assign cat_id = ot_books | first -%}
             {%- assign cat = categories | where: "id", cat_id | first -%}
-            <span class=post-meta" style="white-space:nowrap;">
             <i class="fa fa-book" title="Book" aria-hidden="true"></i>
-              <a href="{{ cat | category_link }}" title="References the {{ cat.name }}">{{ cat.name }}</a>
-            </span>
-            <ul>
-              {%- assign skipped_one = false -%}
-              {%- for cat_id in post_ot_books %}
-                {%- if skipped_one %}
-                  {% assign cat = categories | where: "id", cat_id | first %}
-                  <span class=post-meta" style="white-space:nowrap;">
-                    <i class="fa fa-book" title="Book" aria-hidden="true"></i>
-                    <a href="{{ cat | category_link }}" title="References the book of {{ cat.name }}">
+            <a href="{{ cat | category_link }}"
+               {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
               {{ cat.name }}
             </a>
-                  </span>
-                {%- else -%}
-                  {%- assign skipped_on = true -%}
+            <ul>
+              {%- assign first_time = true -%}
+              {%- for cat_id in ot_books %}
+                {%- if first_time %}
+                  {%- assign first_time = false -%}
+                {%- elsif post.category_ids contains cat_id %}
+                  {% assign cat = categories | where: "id", cat_id | first %}
+                  <li>
+                    <i class="fa fa-book" title="Book" aria-hidden="true"></i>
+                    <a href="{{ cat | category_link }}"
+                       {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
+                      {{ cat.name }}
+                    </a>
+                  </li>
                 {%- endif %}
               {%- endfor %}
             </ul>
           </li>
         </ul>
       {%- endif %}
-      {%- if post_nt_book_count > 0 %}
+      {%- if has_nt %}
         <ul>
           <li>
-            {%- assign cat_id = post_nt_books | first -%}
+            {%- assign cat_id = nt_books | first -%}
             {%- assign cat = categories | where: "id", cat_id | first -%}
-            <span class=post-meta" style="white-space:nowrap;">
             <i class="fa fa-book" title="Book" aria-hidden="true"></i>
-              <a href="{{ cat | category_link }}" title="References the {{ cat.name }}">{{ cat.name }}</a>
-            </span>
-            <ul>
-              {%- assign skipped_one = false -%}
-              {%- for cat_id in post_nt_books %}
-                {%- if skipped_one %}
-                  {% assign cat = categories | where: "id", cat_id | first %}
-                  <span class=post-meta" style="white-space:nowrap;">
-                    <i class="fa fa-book" title="Book" aria-hidden="true"></i>
-                    <a href="{{ cat | category_link }}" title="References the book of {{ cat.name }}">
+            <a href="{{ cat | category_link }}"
+               {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
               {{ cat.name }}
             </a>
-                  </span>
-                {%- else -%}
-                  {%- assign skipped_on = true -%}
+            <ul>
+              {%- assign first_time = true -%}
+              {%- for cat_id in nt_books %}
+                {%- if first_time %}
+                  {%- assign first_time = false -%}
+                {%- elsif post.category_ids contains cat_id %}
+                  {% assign cat = categories | where: "id", cat_id | first %}
+                  <li>
+                    <i class="fa fa-book" title="Book" aria-hidden="true"></i>
+                    <a href="{{ cat | category_link }}"
+                       {%- if cat.description %} title="{{ cat.description.value | escape_once }}"{% endif %}>
+                      {{ cat.name }}
+                    </a>
+                  </li>
                 {%- endif %}
               {%- endfor %}
             </ul>
@@ -112,18 +127,42 @@
       {%- endif %}
     </div>
   {%- endif %}
-  {%- if post_topic_count > 0 %}
+  {%- assign in_series = false -%}
+  {%- for series_id in series_ids %}
+    {%- if post.category_ids contains series_id -%}
+      {%- assign in_series = true -%}
+      {%- assign series_cat = categories | where: "id", series_id | first -%}
+    {%- endif -%}
+  {%- endfor -%}
+  {%- if in_series %}
+    <div class="item text-center">
+      <h4 class="item-heading">Series</h4>
+      <a href="{{ series_cat | category_link }}"
+         {% if series_cat.description %} title="{{ series_cat.description.value | escape_once }}"{% endif %}>
+        {{ series_cat.name }}
+      </a>
+    </div>
+  {%- endif %}
+  {%- assign has_topics = false -%}
+  {% for cat_id in post.category_ids -%}
+    {%- unless ot_books contains cat_id or nt_books contains cat_id or series_ids contains cat_id -%}
+      {% assign has_topics = true -%}
+    {%- endunless -%}
+  {% endfor %}
+  {%- if has_topics %}
     <div class="item">
       <h4 class="item-heading">Topics</h4>
       <ul>
-        {%- for cat_id in post_topics %}
+        {%- for cat_id in post.category_ids %}
+          {% unless ot_books contains cat_id or nt_books contains cat_id or series_ids contains cat_id %}
             {%- assign cat = categories | where: "id", cat_id | first -%}
             <li>
-            <span class="post-meta" style="white-space:nowrap;">
               <i class="fa fa-folder-open-o" title="Category" aria-hidden="true"></i>
-              <a href="{{ cat | category_link }}" title="Categorized under {{ cat.name | escape }}">{{ cat.name }}</a>
-            </span>
+              <a href="{{ cat | category_link }}" rel="tag" title="Categorized under {{ cat.name | escape }}">
+                {{ cat.name }}
+              </a>
             </li>
+          {% endunless %}
         {%- endfor %}
       </ul>
     </div>
@@ -135,11 +174,9 @@
       <ul>
         {%- for tag in post.tags %}
           <li>
-            <span class="post-meta" style="white-space:nowrap;">
             <a href="{{ tag | tag_link }}" title="Tagged &ldquo;{{ tag }}&rdquo;">
               <i class="fa fa-tag" aria-hidden="true"></i> {{ tag }}
             </a>
-            </span>
         {%- endfor %}
       </ul>
     </div>

src/MyWebLog/wwwroot/themes/awftw/style.css

@@ -108,7 +108,7 @@ h1, h2, h3, h4, p, ul {
   max-width: 1400px;
   margin: auto;
 }
-@media all and (max-width:78rem) {
+@media all and (max-width:81rem) {
   .container {
     flex-direction: column;
     align-items: center;
@@ -124,7 +124,7 @@ h1, h2, h3, h4, p, ul {
 }
 .sidebar {
   min-width: 10rem;
-  max-width: 18rem;
+  max-width: 20rem;
   font-size: 1rem;
   display: flex;
   flex-direction: column;
@@ -134,7 +134,7 @@ h1, h2, h3, h4, p, ul {
     padding: 0 .4rem;
   }
 }
-@media all and (max-width:78rem) {
+@media all and (max-width:81rem) {
   .sidebar {
     width: 100%;
     max-width: 60rem;
@@ -168,7 +168,7 @@ h1, h2, h3, h4, p, ul {
 .post-sidebar {
   margin-top: 4rem;
 }
-@media all and (max-width:78rem) {
+@media all and (max-width:81rem) {
   .post-sidebar {
     margin-top: 0;
   }
@@ -191,12 +191,19 @@ blockquote {
   display: flow-root;
   font-size: 1.2rem;
 }
+blockquote p:last-of-type {
+  margin-bottom: 0;
+}
+blockquote p:nth-last-of-type(2) {
+  margin-bottom: .5rem;
+}
+blockquote.standard p:nth-last-of-type(2) {
+  margin-bottom: inherit;
+}
 blockquote.standard {
   margin: 1rem 2rem 1rem 1rem;
   border-left: solid 3px var(--accent-color);
-}
-blockquote p.cite {
-  margin-bottom: 0;
+  font-family: inherit;
 }
 blockquote cite {
   display: block;
@@ -210,6 +217,9 @@ blockquote cite {
   top: 5px;
   margin: 0 -11px -11px -12px;
 }
+blockquote cite::before {
+  content: "— ";
+}
 .ref {
   color: red;
 }
@@ -223,11 +233,19 @@ blockquote sup {
 .u {
   text-decoration: underline;
 }
-blockquote.standard footer cite {
-  font-style: normal;
+blockquote.standard footer {
+  padding-top: 1rem;
 }
-blockquote.standard footer cite::before {
-  content: ", ";
+blockquote.standard footer cite {
+  font-style: italic;
+  background: unset;
+  display: inline;
+  text-align: left;
+  height: unset;
+  background: unset;
+  position: unset;
+  top: unset;
+  margin: inherit;
 }
 cite {
   font-size: 1rem;
@@ -288,13 +306,13 @@ h1 {
   color: var(--title-text-color);
 }
 .item-meta {
-  margin: -.4rem;
   margin-bottom: 1.2rem;
   font-size: 1rem;
   text-align: center;
 }
 .date-posted {
   padding: 0 1rem;
+  text-align: center;
 }
 .text-center {
   text-align: center;