From c6ea6f685a291c56409c932257ffb0eb6e732237 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: Mon, 17 Dec 2018 13:13:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flatfilecms/templates/amp.jinja2 | 3 ++- flatfilecms/templates/base.jinja2 | 6 +++++- flatfilecms/templates/bootstrap/blockquote.jinja2 | 6 ++++++ flatfilecms/templates/header.jinja2 | 11 ++++++----- flatfilecms/templates/onepage.jinja2 | 4 ++-- flatfilecms/templates/solution.jinja2 | 2 +- setup.py | 2 +- 7 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 flatfilecms/templates/bootstrap/blockquote.jinja2 diff --git a/flatfilecms/templates/amp.jinja2 b/flatfilecms/templates/amp.jinja2 index b9949b5..e5451b3 100644 --- a/flatfilecms/templates/amp.jinja2 +++ b/flatfilecms/templates/amp.jinja2 @@ -1,3 +1,4 @@ +{%- import 'macros.jinja2' as macros -%} @@ -11,7 +12,7 @@ {% block body %} - {{content}} + {{content|markdown}} {% endblock %} {% include 'amp-counter.jinja2' %} diff --git a/flatfilecms/templates/base.jinja2 b/flatfilecms/templates/base.jinja2 index 5b2d0f0..d46b4cb 100644 --- a/flatfilecms/templates/base.jinja2 +++ b/flatfilecms/templates/base.jinja2 @@ -1,4 +1,5 @@ -{%- from 'macros.jinja2' import b -%} +{%- import 'macros.jinja2' as macros -%} +{%- import 'forms.jinja2' as forms -%} @@ -9,6 +10,9 @@ + {% if amphtml is defined -%} + + {% endif -%} {{title}} {% block links %} {%- endblock %} diff --git a/flatfilecms/templates/bootstrap/blockquote.jinja2 b/flatfilecms/templates/bootstrap/blockquote.jinja2 new file mode 100644 index 0000000..238b0b7 --- /dev/null +++ b/flatfilecms/templates/bootstrap/blockquote.jinja2 @@ -0,0 +1,6 @@ +
+ + {{blockquote_content}} + + +
diff --git a/flatfilecms/templates/header.jinja2 b/flatfilecms/templates/header.jinja2 index 79ba08e..405f16d 100644 --- a/flatfilecms/templates/header.jinja2 +++ b/flatfilecms/templates/header.jinja2 @@ -1,5 +1,6 @@ - -