Fix tests.

[redakcja.git] / apps / catalogue / templates / catalogue / wall.html

diff --git a/apps/catalogue/templates/catalogue/wall.html b/apps/catalogue/templates/catalogue/wall.html
index 2ec3c0a..a107dfa 100755 (executable)
--- a/apps/catalogue/templates/catalogue/wall.html
+++ b/apps/catalogue/templates/catalogue/wall.html
@@ -1,32 +1,37 @@
 {% load i18n %}
 {% load gravatar %}
 {% load i18n %}
 {% load gravatar %}

+{% load email %}
+{% load username from common_tags %}

 
 

-<ul class='wall' style='padding-left: 0; list-style: none;'>
+<ul class='wall'>

 {% for item in wall %}
 {% for item in wall %}

-    <li style='clear: left; border-top: 1px dotted gray;  padding-bottom:1em; margin-bottom: 1em;'>
-        <div style='float: left;margin-right: 1em;'>
+    <li class="{{ item.tag }}{% if not item.user %} anonymous{% endif %}">
+        <div class='gravatar'>

             {% if item.get_email %}
             {% if item.get_email %}

-                {% gravatar_img_for_email item.get_email 32 %}
+                <img src="{% gravatar_url item.get_email 32 %}"
+                    height="32" width="32" alt='Avatar' />

                 <br/>
             {% endif %}
                 <br/>
             {% endif %}

-
-            <!--img src='{{ STATIC_URL }}img/wall/{{ item.tag}}.png' alt='{% trans item.tag %}' /-->

         </div>
 
         </div>
 

-        <span style='float:right'>{{ item.timestamp }}</span>
+        <div class="time">{{ item.timestamp }}</div>

         <h3>{{ item.header }}</h3>
         <h3>{{ item.header }}</h3>

+        <a target="_blank" href='{{ item.url }}'>{{ item.title }}</a>
+        <br/><strong>{% trans "user" %}:</strong>

         {% if item.user %}
         {% if item.user %}

-            <a href="{% url catalogue_user item.user.username %}">
-            {{ item.user.first_name }} {{ item.user.last_name }}</a>
-            &lt;{{ item.user.email }}>
+            <a href="{% url 'catalogue_user' item.user.username %}">
+            {{ item.user|username }}</a>
+            &lt;{{ item.user.email|email_link }}>

         {% else %}
             {{ item.user_name }}
         {% else %}
             {{ item.user_name }}

-            {% if item.get_email %}
-                &lt;{{ item.get_email }}>
+            {% if item.email %}
+                &lt;{{ item.email|email_link }}>

             {% endif %}
             {% endif %}

+            ({% trans "not logged in" %})

         {% endif %}
         {% endif %}

-        <br/><a target="_blank" href='{{ item.url }}'>{{ item.title }}</a>
-        <br/>{{ item.summary }}
-        </li>
+        <br/>{{ item.summary|linebreaksbr }}
+    </li>
+{% empty %}
+    <li>{% trans "No activity recorded." %}</li>

 {% endfor %}
 </ul>
 {% endfor %}
 </ul>