diff --git a/src/formatter/html/5.2/combinedview.html b/src/formatter/html/5.2/combinedview.html index 367e6797..1ea55fd3 100644 --- a/src/formatter/html/5.2/combinedview.html +++ b/src/formatter/html/5.2/combinedview.html @@ -1,161 +1,158 @@ . - - - {% if articles %} {% for article in articles %}
{% with article.articleStatus as result %} {% ifequal article.Unread result %}
{{ article.markAsReadAction|safe }}
{% endifequal %} {% ifequal article.Read result %}
{{ article.markAsUnreadAction|safe }}
{% endifequal %} {% endwith %}
{{ article.markAsImportantAction|safe }}
{{ article.openInExternalBrowser|safe }}
{{ article.openInBackgroundTab|safe }}
{{ article.sendFileAction|safe }}
{{ article.sendUrlAction|safe }}
{{ article.deleteAction|safe }}
{% if article.strippedTitle %}
{{ article.strippedTitle|safe }}
{% endif %} {%if article.articlePubDate %} {{ dateI18n }}:{{ article.articlePubDate }} {% endif %} {% if article.author %}
{{ authorI18n }}:{{ article.author|safe }} {% endif %} {% if article.enclosure %}
{{ enclosureI18n }}:{{ article.enclosure|safe }} {% endif %}
{% if article.imageFeed %} {{ article.imageFeed }} {% endif %}
{% if article.content %}
{{ article.content|safe }} {% endif %} {% if article.articleCompleteStoryLink %}

{{ completeStoryI18n }}

{% endif %}

{% endfor %} {% endif %} diff --git a/src/formatter/html/5.2/defaultnormalvisitfeed.html b/src/formatter/html/5.2/defaultnormalvisitfeed.html index d4e43794..e0ef3b9d 100644 --- a/src/formatter/html/5.2/defaultnormalvisitfeed.html +++ b/src/formatter/html/5.2/defaultnormalvisitfeed.html @@ -1,87 +1,86 @@ . -

{{ strippedTitle }}{{ feedCount }}
{{ feedImage|safe }} {{ feedDescription|safe }} {{ feedHomePage|safe }} diff --git a/src/formatter/html/5.2/defaultnormalvisitfolder.html b/src/formatter/html/5.2/defaultnormalvisitfolder.html index 288877d7..beb9e5ac 100644 --- a/src/formatter/html/5.2/defaultnormalvisitfolder.html +++ b/src/formatter/html/5.2/defaultnormalvisitfolder.html @@ -1,85 +1,84 @@ . -
{{ nodeTitle }} {{nodeCount}}
diff --git a/src/formatter/html/5.2/normalview.html b/src/formatter/html/5.2/normalview.html index 9108a7fd..1ae9b79c 100644 --- a/src/formatter/html/5.2/normalview.html +++ b/src/formatter/html/5.2/normalview.html @@ -1,120 +1,118 @@ - . - {% if articles %} {% for article in articles %}

{% if article.strippedTitle %}
{{ article.strippedTitle|safe }}
{% endif %} {%if article.articlePubDate %} {{ dateI18n }}:{{ article.articlePubDate }} {% endif %} {% if article.author %}
{{ authorI18n }}:{{ article.author|safe }} {% endif %} {% if article.enclosure %}
{{ enclosureI18n }}:{{ article.enclosure|safe }} {% endif %}
{% if article.imageFeed %} {{ article.imageFeed }} {% endif %}
{% if article.content %}
{{ article.content|safe }} {% endif %} {% if article.articleCompleteStoryLink %}

{{ completeStoryI18n }}

{% endif %} {% endfor %} {% endif %}