refactor nav, blocks, macros, templates. fix image shortcodes

1 files changed, 17 insertions, 2 deletions

diff --git a/templates/pages.html b/templates/pages.html
index 4ef44f5..72f4071 100644
--- a/templates/pages.html
+++ b/templates/pages.html
@@ -1,4 +1,8 @@
-{# This Page Shows the 'Pages' (abridge/content/pages) eg: example.com/about/  example.com/privacy/ #}
+{#
+This Template is for the 'Pages' (abridge/content/pages) eg: example.com/about/  example.com/privacy/
+This Template can also be used as a home page for the index, eg: example.com/
+Some people prefer a landing page for the index, and then use a separate paginated page for their blog.
+#}
 
 {% extends "base.html" %}
 
@@ -9,24 +13,35 @@
   {%- if page.title and config.title %}
     {%- set title = page.title %}
     {%- set title_addition = title_separator ~ config.title %}
+  {%- elif section.title and config.title %}
+    {%- set title = section.title %}
+    {%- set title_addition = title_separator ~ config.title %}
   {%- elif page.title %}
     {%- set title = page.title %}
+  {%- elif section.title %}
+    {%- set title = section.title %}
   {%- else %}
     {%- set title = config.title %}
   {%- endif %}
 
   {%- if page.description %}
     {%- set description = page.description %}
+  {%- elif section.description %}
+    {%- set description = section.description %}
   {%- else %}
     {%- set description = config.description %}
   {%- endif %}
 
-  {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description) }}
+  {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description) }}
 {%- endblock seo %}
 
 {%- block content %}
     <div>
 
+{%- if page.content %}
 {{ page.content | safe }}
+{%- elif section.content %}
+{{ section.content | safe }}
+{%- endif %}
     </div>
 {%- endblock content %}