Merging the experimental branch back to trunk.

[osqa.git] / forum / skins / default / templates / users / activity.html

diff --git a/forum/skins/default/templates/users/activity.html b/forum/skins/default/templates/users/activity.html
index 39aa9bff8cada94054dabb84f978159507801b88..0b6a9142d859da60441008c5b48fe89f72afe876 100644 (file)
--- a/forum/skins/default/templates/users/activity.html
+++ b/forum/skins/default/templates/users/activity.html
@@ -1,18 +1,12 @@
 {% load extra_tags %}\r
 {% load humanize %}\r
+{% load extra_tags %}\r
 \r
-<div style="clear:both;line-height:20px" >\r
-    <div style="width:180px;float:left">{% diff_date active_at 3 %}</div>\r
-    <div style="width:150px;float:left">\r
-    <span class="user-action-{{ type }}">{{ description }}</span>\r
+<div class="action_container">\r
+    <div class="action_body">\r
+        {{ describe }}\r
     </div>\r
-    <div style="float:left;overflow:hidden;">\r
-        {% if badge %}\r
-        <a href="{{ url }}" title="{{ title }}" class="medal"><span class="badge{{ badge_type }}">&#9679;</span>&nbsp;{{ title }}</a>\r
-        {% else %}\r
-        <span class="post-type-{{ type }}"><a href="{{ url }}">{{ title }}</a></span>\r
-            {% if revision %}<span class="revision-summary">{{ summary }}</span>{% endif %}\r
-        {% endif %}\r
-        <div style="height:5px"></div>\r
+    <div class="action_date" style="text-align: right;">\r
+        {% diff_date action.action_date  %}\r
     </div>\r
 </div>
\ No newline at end of file