From f071e05f3af563d799ddf6b89f7ad36e891f8f71 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 28 Jul 2017 11:49:44 +0300 Subject: www: refactor templates --- juick-www/src/main/webapp/WEB-INF/views/blog.html | 57 +--------------------- juick-www/src/main/webapp/WEB-INF/views/index.html | 57 +--------------------- .../main/webapp/WEB-INF/views/partial/message.html | 56 +++++++++++++++++++++ 3 files changed, 58 insertions(+), 112 deletions(-) create mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/message.html diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog.html b/juick-www/src/main/webapp/WEB-INF/views/blog.html index 3b4bf6c4..8d241c82 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog.html @@ -8,62 +8,7 @@

← Все записи с тегом {{ paramTag.name | escape }}

{% endif %} {% for msg in msgs %} -
-
@{{ msg.user.name }}: - -
- -
- {{ tags(msg.user.name, msg.tags | tagsList) }} -
-
-

{{ msg | formatMessage }}

- {% if msg.AttachmentType is not empty %} -

- -

- {% endif %} - - -
+{% include "views/partial/message" %} {% endfor %} {% if (next | default('')) is not empty %} {{ next | raw }} diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html index 5d2ee553..6bf81cac 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -8,62 +8,7 @@ {% include "views/partial/newmessage" %} {% endif %} {% for msg in msgs %} -
-
@{{ msg.user.name }}: - -
- -
- {{ tags(msg.user.name, msg.tags | tagsList ) }} -
-
-

{{ msg | formatMessage }}

- {% if msg.AttachmentType is not empty %} -

- -

- {% endif %} - - -
+{% include "views/partial/message" %} {% endfor %} {{ next | default ('') | raw }} {% endblock %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html new file mode 100644 index 00000000..cdfad6b6 --- /dev/null +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html @@ -0,0 +1,56 @@ +
+
@{{ msg.user.name }}: + +
+ +
+ {{ tags(msg.user.name, msg.tags | tagsList) }} +
+
+

{{ msg | formatMessage }}

+ {% if msg.AttachmentType is not empty %} +

+ +

+ {% endif %} + + +
\ No newline at end of file -- cgit v1.2.3