From 45a8cd55e8b28abc36884a28527b58842c5cee10 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 4 Oct 2017 15:31:44 +0300 Subject: www: microdata --- .../src/main/java/com/juick/www/controllers/User.java | 1 + juick-www/src/main/webapp/WEB-INF/layouts/content.html | 17 ++++++++++++++--- juick-www/src/main/webapp/WEB-INF/views/blog.html | 3 +++ .../src/main/webapp/WEB-INF/views/partial/message.html | 16 +++++++++------- juick-www/src/main/webapp/WEB-INF/views/thread.html | 15 +++++++++------ 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java index 8b7f2e09..d42d3ed3 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/User.java +++ b/juick-www/src/main/java/com/juick/www/controllers/User.java @@ -142,6 +142,7 @@ public class User { } else if (before > 0 || paramShow != null) { head += ""; } + model.addAttribute("pageUrl", "http://juick.com/" + user.getName()); model.addAttribute("title", title); model.addAttribute("headers", head); model.addAttribute("visitor", visitor); diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index 74146a0b..4e8073ce 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,8 @@ {% block headers %} {{ headers | default('') | raw }} {% endblock %} - {{ title | default('Juick') }} + {{ title | default('Juick') }} + @@ -26,11 +27,21 @@ - + + 0 %}data-hash="{{visitor.authHash}}"{% endif %}> {% include "views/partial/navigation" %} 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 87007ea8..29b636dd 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog.html @@ -7,9 +7,12 @@ {% if paramTag | default('') is not empty %}

← {{ i18n("messages","blog.allPostsWithTag") }} {{ paramTag.name | escape }}

{% endif %} +
+ {% for msg in msgs %} {% include "views/partial/message" %} {% endfor %} +
{% if nextpage | default('') is not empty %}

{% endif %} 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 index f3a42ff2..c0d345ba 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/message.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/message.html @@ -1,26 +1,28 @@ -
+
- @{{ msg.user.name }}: +
{{ msg.user.name }}
-
-
+
{{ tags(msg.user.name, msg.tags | tagsList) }}
-

{{ msg | formatMessage }}

+

{{ msg | formatMessage }}

{% if msg.AttachmentType is not empty %}

- +

{% endif %}
\ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/thread.html b/juick-www/src/main/webapp/WEB-INF/views/thread.html index 57d7e0a1..10fa9141 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/thread.html +++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html @@ -3,10 +3,10 @@ {% block content %}