diff options
| author |  alx | 2019-03-16 23:56:27 +0300 |
|---|---|---|
| committer | alx | 2019-03-16 23:56:27 +0300 |
| commit | 06105f76dbfa3b65e63ed06f9c4d5107bd49ed88 (patch) | |
| tree | 5702c01cec9688039d891f4a711878706101c1c5 /src/main/resources/templates/views/thread.html | |
| parent | 3ea4cd1942fa4e763034da11c5fa429407b67829 (diff) | |
| parent | a49105285d0d7719d7f222a507af2d5ac5b4bdb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/resources/templates/views/thread.html')
| -rw-r--r-- | src/main/resources/templates/views/thread.html | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html index 47dfd000..2092cc1b 100644 --- a/src/main/resources/templates/views/thread.html +++ b/src/main/resources/templates/views/thread.html @@ -13,9 +13,9 @@ </span> <div class="msg-ts"> <a href="/{{ msg.user.name }}/{{ msg.mid }}"> - <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" - title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT"> - {{ msg.timestamp | prettyTime }} + <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"> + {{ msg.created | prettyTime }} </time> </a> </div> @@ -99,7 +99,11 @@ {% if recomm is not empty %} <div class="msg-recomms">{{ i18n("messages","message.recommendedBy") }} {% for rec in recomm %} - <a href="/{{ rec }}/">@{{ rec }}</a>{% if loop.index < (loop.length - 1) %}, {% endif %} + {% if rec.uri.toString() is empty %} + <a href="/{{ rec.name }}/">@{{ rec.name }}</a>{% if loop.index < (loop.length - 1) %}, {% endif %} + {% else %} + <a href="{{ rec.uri }}" data-user-uri="1">@{{ rec.name }}</a>{% if loop.index < (loop.length - 1) %}, {% endif %} + {% endif %} {% endfor %} {% if msg.likes > recomm.size() %} {{ i18n("messages","message.recommendedOthers", msg.likes - recomm.size()) }} @@ -136,9 +140,9 @@ {% endif %} <div class="msg-ts"> <a href="/{{ msg.mid }}#{{ msg.rid }}"> - <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" - title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT"> - {{ msg.timestamp | prettyTime }} + <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"> + {{ msg.created | prettyTime }} </time> </a> </div> |