From f3963f0b12055ba6710b9b28ddc93a5b5fe91d67 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 22 Sep 2017 16:39:00 +0300
Subject: Initial getNotifications query

* using Java 8 DateTime API where possible
---
 juick-www/src/main/webapp/WEB-INF/views/macros/tree.html         | 6 +++---
 juick-www/src/main/webapp/WEB-INF/views/partial/message.html     | 6 +++---
 juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html | 6 +++---
 juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html            | 2 +-
 juick-www/src/main/webapp/WEB-INF/views/pm_sent.html             | 2 +-
 juick-www/src/main/webapp/WEB-INF/views/thread.html              | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'juick-www/src/main/webapp/WEB-INF')

diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
index 09ba5365..f0c283e9 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html
@@ -20,9 +20,9 @@
                 </div>
                 <div class="msg-ts">
                     <a href="/{{ msg.mid }}#{{ msg.rid }}">
-                        <time datetime="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                              title="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                            {{ msg.date | prettyTime }}
+                        <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>
                     </a>
                 </div>
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 b3ff86cd..f3a42ff2 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
@@ -7,9 +7,9 @@
         <div class="msg-menu"><a href="#"><i data-icon="ei-link" data-size="s"></i></a></div>
         <div class="msg-ts">
             <a href="/{{ msg.user.name }}/{{ msg.mid }}">
-                <time datetime="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                      title="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                    {{ msg.date | prettyTime }}
+                <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>
             </a>
         </div>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
index 275ffeaf..918c4fb0 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html
@@ -18,9 +18,9 @@
             </div>
             <div class="msg-ts">
                 <a href="/{{ msg.mid }}#{{ msg.rid }}">
-                    <time datetime="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                          title="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                        {{ msg.date | prettyTime }}
+                    <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>
                 </a>
             </div>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
index a8a8a1e9..156877c0 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_inbox.html
@@ -12,7 +12,7 @@
                     	<img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/>
                 	</a>
             	</div>
-            	 <div class="msg-ts">{{ msg.date }}</div>
+            	 <div class="msg-ts">{{ msg.timestamp | prettyTime }}</div>
             </div>
            
             <div class="msg-txt">{{ msg | formatMessage }}</div>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
index 48aaa7e1..08b9585a 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/pm_sent.html
@@ -19,7 +19,7 @@
                     	<img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/>
                 	</a>
             	</div>
-            	<div class="msg-ts">{{ msg.date }}</div>
+            	<div class="msg-ts">{{ msg.timestamp | prettyTime }}</div>
             </div>
             <div class="msg-txt">{{ msg | formatMessage }}</div>
         </div>
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 5f1cb148..57d7e0a1 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/thread.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html
@@ -6,9 +6,9 @@
         <div class="msg-cont">
             <div class="msg-menu"><a href="#"><i data-icon="ei-link" data-size="s"></i></a></div>
             <div class="msg-ts"><a href="/{{ msg.user.name }}/{{ msg.mid }}">
-                <time datetime="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                      title="{{ msg.date | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                    {{ msg.date | prettyTime }}
+                <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>
             </a>
             </div>
-- 
cgit v1.2.3