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/partial | |
| parent | 3ea4cd1942fa4e763034da11c5fa429407b67829 (diff) | |
| parent | a49105285d0d7719d7f222a507af2d5ac5b4bdb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/resources/templates/views/partial')
| -rw-r--r-- | src/main/resources/templates/views/partial/footer.html | 2 | ||||
| -rw-r--r-- | src/main/resources/templates/views/partial/message.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/resources/templates/views/partial/footer.html b/src/main/resources/templates/views/partial/footer.html index 35972254..bb6ccb97 100644 --- a/src/main/resources/templates/views/partial/footer.html +++ b/src/main/resources/templates/views/partial/footer.html @@ -8,7 +8,7 @@ <a href="https://vk.com/juick" rel="nofollow"><i data-icon="ei-sc-vk" data-size="m"></i></a> <a href="https://www.facebook.com/JuickCom" rel="nofollow"><i data-icon="ei-sc-facebook" data-size="m"></i></a> </div> - <div id="footer-left">juick.com © 2008-2018 + <div id="footer-left">juick.com © 2008-2019 {% if links | default ('') is not empty %} <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }} {% endif %} diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html index b1d27ae5..bb36b25e 100644 --- a/src/main/resources/templates/views/partial/message.html +++ b/src/main/resources/templates/views/partial/message.html @@ -8,9 +8,9 @@ </div> <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> |