Merging the experimental branch back to trunk.

[osqa.git] / forum / skins / default / templates / osqaadmin / index.html

diff --git a/forum/skins/default/templates/osqaadmin/index.html b/forum/skins/default/templates/osqaadmin/index.html
index e9a8bf56ad02432cee420719ba7bb652c3c1721e..64670f54519c5dad58ec18186c71a84ce7c541ef 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/index.html
+++ b/forum/skins/default/templates/osqaadmin/index.html
@@ -1,10 +1,7 @@
 {% extends "osqaadmin/base.html" %}\r
 \r
 {% load i18n %}\r
-\r
-{% block adminjs %}\r
- \r
-{% endblock %}\r
+{% load user_tags %}\r
 \r
 {% block subtitle %}\r
     {% trans "Dashboard" %}\r
@@ -59,6 +56,8 @@
                         </td>\r
                     </tr>\r
                 </table>\r
+                <h3>{%trans "Recalculate scores and reputation" %}</h3>\r
+                 <button onclick="if (window.confirm('{% trans "This is a heavy operation, are you sure?" %}')) window.location='{% url admin_denormalize %}';">{% trans "Recalculate" %}</button>\r
             </td>\r
         </tr>\r
         <tr>\r
@@ -66,12 +65,7 @@
                 <h3>{% trans "Recent activity" %}</h3>\r
                 <table width="100%">\r
                 {% for activity in recent_activity %}\r
-                <tr>\r
-                    <td>\r
-                        {{ activity.user.get_profile_link }} {{ activity.type_as_string }} {% trans "on" %} <a href="{{ activity.question.get_absolute_url }}">{{ activity.question.title }}</a><br />\r
-                        <sub>{{ activity.active_at|date }}, {{ activity.active_at|time }}</sub>\r
-                    </td>\r
-                </tr>\r
+                    {% activity_item activity request.user %}\r
                 {% endfor %}\r
                 </table>\r
             </td>\r