juick-www: cleanup templates

1 files changed, 14 insertions, 14 deletions

diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html
index 88178cc5..05ee25c5 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/index.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/index.html
@@ -8,16 +8,16 @@
 {% include "views/partial/newmessage" %}
 {% endif %}
 {% for msg in msgs %}
-<article data-mid="{{ msg.getMid() }}">
-    <header class="h">@<a href="/{{ msg.getUser().getName() }}/">{{ msg.getUser().getName() }}</a>:
-        <div class="msg-avatar"><a href="/{{ msg.getUser().getName() }}/">
-            <img src="//i.juick.com/a/{{ msg.getUser().getUid() }}.png" alt="{{ msg.getUser().getName() }}"/></a></div>
+<article data-mid="{{ msg.mid }}">
+    <header class="h">@<a href="/{{ msg.user.name }}/">{{ msg.user.name }}</a>:
+        <div class="msg-avatar"><a href="/{{ msg.user.name }}/">
+            <img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a></div>
         <div class="msg-menu"><a href="#"></a></div>
         <div class="msg-ts">
-            <a href="/{{ msg.getUser().getName() }}/{{ msg.getMid() }}">
-                <time datetime="{{ msg.getDate() | date('yyyy-MM-dd HH:mm:ss')}}Z"
-                      title="{{msg.getDate() | date('yyyy-MM-dd HH:mm:ss')}} GMT">
-                    {{ msg.getDate() | prettyTime }}
+            <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>
             </a>
         </div>
@@ -27,8 +27,8 @@
     </header>
     <p>{{ msg | formatMessage }}</p>
     {% if msg.AttachmentType is not empty %}
-    <p class="ir"><a href="//i.juick.com/p/{{ msg.getMid() }}.{{ msg.AttachmentType }}" data-fname="{{ msg.getMid() }}.{{ msg.AttachmentType }}">
-        <img src="//i.juick.com/photos-512/{{ msg.getMid() }}.{{ msg.AttachmentType }}" alt=""/></a>
+    <p class="ir"><a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}">
+        <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/></a>
     </p>
     {% endif %}
     {% if msg.AttachmentType is not empty %}
@@ -37,12 +37,12 @@
     {% if not readonly %}
     <nav class="l">
         {% if visitor.uid > 0 %}
-        <a href="/post?body=!+%23{{ msg.getMid() }}" class="a-like">{{ i18n("messages","message.recommend") }}</a>
+        <a href="/post?body=!+%23{{ msg.mid }}" class="a-like">{{ i18n("messages","message.recommend") }}</a>
         {% else %}
         <a href="/login" class="a-login">{{ i18n("messages","message.recommend") }}</a>
         {% endif %}
         {% if visitor.uid > 0 and (not msg.ReadOnly or visitor.uid == msg.user.uid) %}
-        <a href="/{{ msg.getMid() }}" class="a-comment">{{ i18n("messages","message.comment") }}</a>
+        <a href="/{{ msg.mid }}" class="a-comment">{{ i18n("messages","message.comment") }}</a>
         {% elseif visitor.uid == 0 and not msg.ReadOnly %}
         <a href="/login" class="a-login">{{ i18n("messages","message.comment") }}</a>
         {% endif %}
@@ -58,11 +58,11 @@
     {% endif %}
     <nav class="s">
         {% if msg.Likes > 0 %}
-        <a href="/{{ msg.getUser().getName() }}/{{ msg.getMid() }}" class="likes">
+        <a href="/{{ msg.user.name }}/{{ msg.mid }}" class="likes">
             <i data-icon="ei-heart" data-size="s"></i>&nbsp;{{ msg.Likes }}</a>
         {% endif %}
         {% if msg.Replies > 0 %}
-        <a href="/{{ msg.getUser().getName() }}/{{ msg.getMid() }}" class="replies">
+        <a href="/{{ msg.user.name }}/{{ msg.mid }}" class="replies">
             <i data-icon="ei-comment" data-size="s"></i>&nbsp;&nbsp;{{ msg.Replies }}</a>
         {% endif %}
     </nav>