From 7aaa3f9a29c280f01c677c918932620be45cdbd7 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 8 Nov 2018 21:38:27 +0300 Subject: Merge everything into single Spring Boot application --- .../resources/templates/views/partial/footer.html | 16 ++++ .../templates/views/partial/homecolumn.html | 25 ++++++ .../resources/templates/views/partial/message.html | 76 ++++++++++++++++++ .../templates/views/partial/navigation.html | 36 +++++++++ .../templates/views/partial/settings_tabs.html | 6 ++ .../templates/views/partial/tagcolumn.html | 33 ++++++++ .../resources/templates/views/partial/tags.html | 3 + .../templates/views/partial/usercolumn.html | 89 ++++++++++++++++++++++ .../templates/views/partial/usertags.html | 3 + 9 files changed, 287 insertions(+) create mode 100644 src/main/resources/templates/views/partial/footer.html create mode 100644 src/main/resources/templates/views/partial/homecolumn.html create mode 100644 src/main/resources/templates/views/partial/message.html create mode 100644 src/main/resources/templates/views/partial/navigation.html create mode 100644 src/main/resources/templates/views/partial/settings_tabs.html create mode 100644 src/main/resources/templates/views/partial/tagcolumn.html create mode 100644 src/main/resources/templates/views/partial/tags.html create mode 100644 src/main/resources/templates/views/partial/usercolumn.html create mode 100644 src/main/resources/templates/views/partial/usertags.html (limited to 'src/main/resources/templates/views/partial') diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html new file mode 100644 index 00000000..35972254 --- /dev/null +++ b/src/main/resources/templates/views/partial/footer.html @@ -0,0 +1,16 @@ + diff --git a/src/main/resources/templates/views/partial/homecolumn.html b/src/main/resources/templates/views/partial/homecolumn.html new file mode 100644 index 00000000..01448bca --- /dev/null +++ b/src/main/resources/templates/views/partial/homecolumn.html @@ -0,0 +1,25 @@ + +
+

{{ i18n("messages","link.trends") }}

+ {% include "views/partial/tags" %} + {% if showAdv | default(false) %} +

Наши друзья

+ конструктор сайтов + {% endif %} +
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html new file mode 100644 index 00000000..00ca048c --- /dev/null +++ b/src/main/resources/templates/views/partial/message.html @@ -0,0 +1,76 @@ +
+
+ + {{ msg.user.name }} + +
+ {{ 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 diff --git a/src/main/resources/templates/views/partial/navigation.html b/src/main/resources/templates/views/partial/navigation.html new file mode 100644 index 00000000..03b6c56d --- /dev/null +++ b/src/main/resources/templates/views/partial/navigation.html @@ -0,0 +1,36 @@ +
+
+ {% if visitor.uid > 0 %} + + {% else %} + + {% endif %} + + +
+
diff --git a/src/main/resources/templates/views/partial/settings_tabs.html b/src/main/resources/templates/views/partial/settings_tabs.html new file mode 100644 index 00000000..4715253e --- /dev/null +++ b/src/main/resources/templates/views/partial/settings_tabs.html @@ -0,0 +1,6 @@ +
\ No newline at end of file diff --git a/src/main/resources/templates/views/partial/tagcolumn.html b/src/main/resources/templates/views/partial/tagcolumn.html new file mode 100644 index 00000000..3e61d3d3 --- /dev/null +++ b/src/main/resources/templates/views/partial/tagcolumn.html @@ -0,0 +1,33 @@ +
+

*{{ tag.name }}

+
+{% if visitor is not empty and visitor.uid > 0 %} + +{% endif %} diff --git a/src/main/resources/templates/views/partial/tags.html b/src/main/resources/templates/views/partial/tags.html new file mode 100644 index 00000000..3235213e --- /dev/null +++ b/src/main/resources/templates/views/partial/tags.html @@ -0,0 +1,3 @@ +{% for tag in tags %} + {{ tag | raw }} +{% endfor %} \ No newline at end of file diff --git a/src/main/resources/templates/views/partial/usercolumn.html b/src/main/resources/templates/views/partial/usercolumn.html new file mode 100644 index 00000000..2b1963e3 --- /dev/null +++ b/src/main/resources/templates/views/partial/usercolumn.html @@ -0,0 +1,89 @@ +{% if visitor is not empty and visitor.uid > 0 and visitor.uid != user.uid %} +
+ + {{ user.name }} + +
+ +{% else %} +
+{% endif %} + +
+
+

+
+{% include "views/partial/usertags" %} +
+
+ + {% if iread is not empty %} +
+ {% for u in iread %} + + + {{ u.name }} + + + {% endfor %} +
+ {% endif %} + +
diff --git a/src/main/resources/templates/views/partial/usertags.html b/src/main/resources/templates/views/partial/usertags.html new file mode 100644 index 00000000..71d1303e --- /dev/null +++ b/src/main/resources/templates/views/partial/usertags.html @@ -0,0 +1,3 @@ +{% import "views/macros/tags" %} +{{ tags(user.name, tagStats) }} +... \ No newline at end of file -- cgit v1.2.3