From d82fbb0f007f71fb091cda5212c82af011aa8aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9A=D0=B0=D1=81=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= Date: Sat, 18 May 2019 00:13:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BE=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20[closes=20#32]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flatfilecms/templates/atom.jinja2 | 12 ++++++------ flatfilecms/templates/base.jinja2 | 12 ++++++------ flatfilecms/templates/blogposts.jinja2 | 6 +----- flatfilecms/templates/feedlinks.jinja2 | 22 ++++++++++++++++++++++ flatfilecms/templates/layout.jinja2 | 1 + 5 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 flatfilecms/templates/feedlinks.jinja2 diff --git a/flatfilecms/templates/atom.jinja2 b/flatfilecms/templates/atom.jinja2 index 43c13ac..ea80056 100644 --- a/flatfilecms/templates/atom.jinja2 +++ b/flatfilecms/templates/atom.jinja2 @@ -5,16 +5,16 @@ {{subtitle}} {%- endif %} - {%- if alternate %} - + {%- if 'links' in feed and feed['index'] %} + {%- endif %} {{(pages[0][1].page['updated'] or pages[0][1].page['published']).isoformat()}}+00:00 - urn:uuid:{{id}} + urn:uuid:{{feed['id']}} - {{author['name']}} + {{feed['author']['name']}} - {%- if category %} - + {%- if feed['category'] %} + {%- endif %} flatfilecms {%- for item in pages %} diff --git a/flatfilecms/templates/base.jinja2 b/flatfilecms/templates/base.jinja2 index 4a9b0aa..0fcc915 100644 --- a/flatfilecms/templates/base.jinja2 +++ b/flatfilecms/templates/base.jinja2 @@ -2,19 +2,19 @@ - {% block head -%} + {%- block head %} - {% if amphtml is defined -%} + {%- if amphtml is defined %} - {% endif -%} - {% for link in alternate -%} - - {% endfor -%} + {%- endif %} + {%- if feed is defined %} + + {%- endif %} {{title}} {% block links %} {%- endblock %} diff --git a/flatfilecms/templates/blogposts.jinja2 b/flatfilecms/templates/blogposts.jinja2 index d7a8a05..197ebac 100644 --- a/flatfilecms/templates/blogposts.jinja2 +++ b/flatfilecms/templates/blogposts.jinja2 @@ -1,5 +1,5 @@ {% extends "layout.jinja2" %} -{% if header_class is not defined %}{% set header_class="light" %}{%endif%} +{%- if header_class is not defined %}{% set header_class="light" %}{%endif%} {% block content %}
{% for item in pages %} @@ -17,8 +17,4 @@
{% endfor %} -{% set atom_feed = alternate|selectattr('type', 'equalto', 'application/atom+xml')|first -%} -{% if atom_feed -%} -

Подписаться на обновления:

-{% endif -%} {% endblock %} diff --git a/flatfilecms/templates/feedlinks.jinja2 b/flatfilecms/templates/feedlinks.jinja2 new file mode 100644 index 0000000..94c0116 --- /dev/null +++ b/flatfilecms/templates/feedlinks.jinja2 @@ -0,0 +1,22 @@ +{%- if feed is defined and 'links' in feed %} +
+

Лента сообщений в удобном формате:

+
+ {%- if 'index' in feed['links'] %} + + {%- endif %} + {%- if 'atom' in feed['links'] %} + + {%- endif %} + {%- if 'twitter' in feed['links'] %} + + {%- endif %} + {%- if 'telegram' in feed['links'] %} + + {%- endif %} + {%- if 'facebook' in feed['links'] %} + + {%- endif %} +
+
+{%- endif %} diff --git a/flatfilecms/templates/layout.jinja2 b/flatfilecms/templates/layout.jinja2 index 245b3a8..bd34e47 100644 --- a/flatfilecms/templates/layout.jinja2 +++ b/flatfilecms/templates/layout.jinja2 @@ -20,6 +20,7 @@ {% endblock %} + {%- include 'feedlinks.jinja2' %}