From d19efb6c6865967cbcf4bac2608145cd01f14517 Mon Sep 17 00:00:00 2001 From: Peter Molnar Date: Sun, 3 Feb 2019 16:40:08 +0000 Subject: [PATCH] microdata => rdfa so I make academics happy --- templates/Category.j2.html | 40 +++--------- templates/Home.j2.html | 64 ++++++------------- templates/Singular.j2.html | 104 +++++++++++++++++-------------- templates/WebImage.j2.html | 2 +- templates/base.j2.html | 21 +++---- templates/meta-publisher.j2.html | 31 +++++++++ 6 files changed, 126 insertions(+), 136 deletions(-) create mode 100644 templates/meta-publisher.j2.html diff --git a/templates/Category.j2.html b/templates/Category.j2.html index a1644d2..c06c8c4 100644 --- a/templates/Category.j2.html +++ b/templates/Category.j2.html @@ -33,7 +33,7 @@ {% endblock %} {% block content %} -
+

@@ -53,12 +53,12 @@ {% endif %} {% set _ = year.append(post.year)%} -

+ {% if loop.last %} diff --git a/templates/Home.j2.html b/templates/Home.j2.html index 29ff1e8..adca944 100644 --- a/templates/Home.j2.html +++ b/templates/Home.j2.html @@ -14,83 +14,59 @@ {% endblock %} {% block content %} -
+
- {% for category, latest in elements %} + {% for category, post in elements %}
-

Latest in +

post in {{ category.name }}

-
+
-

- {% if latest.is_reply %} +

+ {% if post.is_reply %} - + RE: - - {{ latest.is_reply }} + + {{ post.is_reply }} {% else %} - - {{ latest.title }} + + {{ post.title }} {% endif %}

- +
- {% if latest.summary %} -
- {{ latest.html_summary }} + {% if post.summary %} +
+ {{ post.html_summary }} - - {% if latest.lang == 'hu' %}Tovább »{% else %}Continue »{% endif %} + + {% if post.lang == 'hu' %}Tovább »{% else %}Continue »{% endif %}
{% else %} -
- {{ latest.html_content }} +
+ {{ post.html_content }}
{% endif %} - + {% include 'meta-publisher.j2.html' %}
{% endfor %} diff --git a/templates/Singular.j2.html b/templates/Singular.j2.html index f769273..0a64fcb 100644 --- a/templates/Singular.j2.html +++ b/templates/Singular.j2.html @@ -33,10 +33,10 @@ {% else %} {% set mftype = 'h-entry' %} {% endif %} -
-
+
+
-

+

{% if post.is_reply %} @@ -50,7 +50,7 @@ {% else %} - + {{ post.title }} {% endif %} @@ -58,38 +58,43 @@

{% if post.review %} -
+
Review summary of: {{ post.review.title }}

By - at + + + {{ author.name }} + at

- - - {{ post.review.rated }} + + + {{ post.review.rated }} out of - {{ post.review.outof }} + {{ post.review.outof }}

-

{{ post.review.summary }}

+

{{ post.review.summary }}

{% endif %} {% if post.summary %} -
+
{{ post.html_summary }}
{% endif %} -
+
{{ post.html_content }}
+ {% if not post.enclosure %} + + {% else %} + + {% endif %}
{% if post.event %}
Trip details
@@ -109,34 +114,35 @@ {% endif %}
Author
-
+ + Photo of {{ author.name }} + + {{ author.name }} + + + +
Published
@@ -144,7 +150,7 @@
License
{% if post.licence == 'CC-BY-4.0' %} - + {{ post.licence }}
    @@ -155,7 +161,7 @@
  • you always need to make a link back here
{% elif post.licence == 'CC-BY-NC-4.0' %} - + {{ post.licence }}
    @@ -167,7 +173,7 @@
For commercial use, please contact me. {% elif post.licence == 'CC-BY-NC-ND-4.0' %} - + {{ post.licence }}
    @@ -183,10 +189,7 @@
    Entry URL
    - {% if not post.has_mainimg %} - - {% endif %} - + {{ post.url }}
    @@ -198,7 +201,7 @@ {% if post.syndicate|length %} {% endif %} @@ -206,14 +209,21 @@

    Encourage creation!

    - If this entry helped you, or you simply liked it, leave a tip via
    + If this entry helped you, or you simply liked it, leave a tip via
    {% for provider, info in author.tips.items() %} + {% if loop.last and not loop.first %} or {% endif %} - + {{ info.text }} {% if not loop.last and not loop.first %}, {% endif %} + + {% endfor %}

    diff --git a/templates/WebImage.j2.html b/templates/WebImage.j2.html index 345d907..d4bf0c4 100644 --- a/templates/WebImage.j2.html +++ b/templates/WebImage.j2.html @@ -2,7 +2,7 @@ {% if href != src %} {% endif %} - + {% if href != src %} {% endif %} diff --git a/templates/base.j2.html b/templates/base.j2.html index 35a3054..4b27cb8 100644 --- a/templates/base.j2.html +++ b/templates/base.j2.html @@ -23,7 +23,7 @@ - + {% macro activemenu(name) %} {% if (post is defined and post.slug == name ) @@ -62,15 +62,15 @@ -
    - + + - +
@@ -82,25 +82,22 @@ {% block pagination %} {% endblock %} -