aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/assets/style.css8
-rw-r--r--src/main/resources/templates/views/partial/message.html22
-rw-r--r--src/main/resources/templates/views/thread.html10
3 files changed, 17 insertions, 23 deletions
diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index 6acfa0d3..196f2191 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -329,6 +329,7 @@ article > nav.l,
.msg-cont > nav.l {
border-top: 1px solid #eee;
display: flex;
+ align-items: center;
justify-content: space-around;
font-size: 10pt;
}
@@ -355,7 +356,7 @@ article .tags > a,
color: #88958d;
}
article .tags > a::before,
-.msg-tags > a::before{
+.msg-tags > a::before {
content: '#';
}
.badge {
@@ -369,11 +370,6 @@ article .tags > a::before,
padding: 0 10px;
}
.l .msg-button {
- align-items: center;
- display: flex;
- flex-basis: 0;
- flex-direction: column;
- flex-grow: 1;
padding-top: 12px;
}
.l .msg-button-icon {
diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html
index 8b8670ce..132d1ea2 100644
--- a/src/main/resources/templates/views/partial/message.html
+++ b/src/main/resources/templates/views/partial/message.html
@@ -7,6 +7,9 @@
<img src="{{ msg.user.avatar }}" alt="{{ msg.user.name }}"/></a>
</div>
<div class="msg-ts">
+ {% if msg.FriendsOnly %}
+ <i data-icon="ei-lock" data-size="s"></i> &middot;
+ {% endif %}
<a href="/{{ msg.user.name }}/{{ msg.mid }}">
<time datetime="{{ msg.created | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
title="{{ msg.created | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
@@ -50,9 +53,13 @@
<a href="/login" class="a-login msg-button">
<span class="msg-button-icon">
<i data-icon="ei-heart" data-size="s"></i>
- {% if msg.likes > 0 %}&nbsp;{{ msg.likes }}{% endif %}
+ {% if msg.likes > 0 %}
+ {{ msg.likes }}
+ {% else %}
+ <span>&nbsp;{{ i18n("messages","message.recommend") }}</span>
+ {% endif %}
</span>
- <span>&nbsp;{{ i18n("messages","message.recommend") }}</span>
+
</a>
{% endif %}
{% if (not msg.ReadOnly) or (visitor.uid == msg.user.uid) %}
@@ -65,17 +72,12 @@
{% else %}
{{ msg.Replies }}
{% endif %}
+ {% else %}
+ <span>&nbsp;{{ i18n("messages","message.comment") }}</span>
{% endif %}
</span>
- <span>&nbsp;{{ i18n("messages","message.comment") }}</span>
- </a>
- <a href="#" class="msg-menu msg-button">
- <i data-icon="ei-link" data-size="s"></i>
- <span>&nbsp;{{ i18n("messages","message.share") }}</span>
+
</a>
{% endif %}
- {% if msg.FriendsOnly %}
- <a href="#" class="a-privacy">Открыть доступ</a>
- {% endif %}
</nav>
</article> \ No newline at end of file
diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html
index e09c1e60..9337a87c 100644
--- a/src/main/resources/templates/views/thread.html
+++ b/src/main/resources/templates/views/thread.html
@@ -12,6 +12,9 @@
<a href="/{{ msg.user.name }}/"><span>{{ msg.user.name }}</span></a>
</span>
<div class="msg-ts">
+ {% if msg.FriendsOnly %}
+ <i data-icon="ei-lock" data-size="s"></i> &middot;
+ {% endif %}
<a href="/{{ msg.user.name }}/{{ msg.mid }}">
<time datetime="{{ msg.created | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
title="{{ msg.created | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
@@ -63,10 +66,6 @@
</a>
{% endif %}
- <a href="#" class="msg-menu msg-button">
- <i data-icon="ei-link" data-size="s"></i>
- <span>&nbsp;{{ i18n("messages","message.share") }}</span>
- </a>
{% if visitor.uid > 0 %}
{% if visitor.uid != msg.user.uid %}
{% if visitorSubscribed %}
@@ -87,9 +86,6 @@
</a>
{% endif %}
{% endif %}
- {% if msg.FriendsOnly %}
- <a href="#" class="a-privacy">Открыть доступ</a>
- {% endif %}
</nav>
{% if msg.VisitorCanComment %}
<form class="msg-comment-target">