2 files changed, 27 insertions, 37 deletions
diff --git a/templates/categories/list.html b/templates/categories/list.html
index 4566a75..966fd03 100644
--- a/templates/categories/list.html
+++ b/templates/categories/list.html
@@ -1,26 +1,21 @@
-{% extends "base.html" %}
+{%- extends "base.html" -%}
 {%- set uglyurls = config.extra.uglyurls | default(value=false) -%}
-{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %}
-
-{%- block seo %}
-  {{- super() }}
-  {%- set title = "Categories" %}
-
-  {%- if config.title %}
-    {%- set title_addition = title_separator ~ config.title %}
-  {%- else %}
-    {%- set title_addition = "" %}
-  {%- endif %}
-
-  {%- set description = config.description %}
-
-  {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }}
-{%- endblock seo %}
-
+{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%}
+{%- block seo -%}
+  {{- super() -}}
+  {%- set title = "Categories" -%}
+  {%- if config.title -%}
+    {%- set title_addition = title_separator ~ config.title -%}
+  {%- else -%}
+    {%- set title_addition = "" -%}
+  {%- endif -%}
+  {%- set description = config.description -%}
+  {{<seo config={config}  title={title}  title_addition={title_addition}  description={description or ""}  is_home={true} />}}
+{%- endblock seo -%}
 {%- block content %}
     <div>
       <div class="c">
-        <h1>{{ terms | length }} {{ macros::translate(key="Categories", default="Categories", i18n=i18n) }} </h1>
+        <h1>{{ terms | length }} {{<translate key="Categories"  default="Categories"  i18n={i18n} />}} </h1>
         <p>{% for term in terms %} [<a href="#{{ term.name }}">{{ term.name }}</a>]<sup>{{ term.pages | length }}</sup> {% endfor %}</p>
       </div>
       {%- for term in terms %}
diff --git a/templates/categories/single.html b/templates/categories/single.html
index 08b4327..de68a4f 100644
--- a/templates/categories/single.html
+++ b/templates/categories/single.html
@@ -1,22 +1,17 @@
-{% extends "base.html" %}
+{%- extends "base.html" -%}
 {%- set uglyurls = config.extra.uglyurls | default(value=false) -%}
-{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %}
-
-{%- block seo %}
-  {{- super() }}
-  {%- set title = term.name ~ " category" %}
-
-  {%- if config.title %}
-    {%- set title_addition = title_separator ~ config.title %}
-  {%- else %}
-    {%- set title_addition = "" %}
-  {%- endif %}
-
-  {%- set description = config.description %}
-
-  {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }}
-{%- endblock seo %}
-
+{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%}
+{%- block seo -%}
+  {{- super() -}}
+  {%- set title = term.name ~ " category" -%}
+  {%- if config.title -%}
+    {%- set title_addition = title_separator ~ config.title -%}
+  {%- else -%}
+    {%- set title_addition = "" -%}
+  {%- endif -%}
+  {%- set description = config.description -%}
+  {{<seo config={config}  title={title}  title_addition={title_addition}  description={description or ""}  is_home={true} />}}
+{%- endblock seo -%}
 {%- block content %}
     <div>
       <h2>{{ term.name }}</h2>