Merge pull request #2 from udacity/update_django

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

diff --git a/forum/skins/default/templates/osqaadmin/dashboard.html b/forum/skins/default/templates/osqaadmin/dashboard.html
index 3cd1da9a2ca911efaa0ae30d261b889995b9c359..f5586a85deeefaab3e8c9eca0671b471e2527d4e 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/dashboard.html
+++ b/forum/skins/default/templates/osqaadmin/dashboard.html
@@ -46,10 +46,10 @@
                         {% endifequal %}
                     {% endifequal %}
                     {% ifnotequal settings_pack "default" %}
                         {% endifequal %}
                     {% endifequal %}
                     {% ifnotequal settings_pack "default" %}

-                        <button onclick="if (window.confirm('{% trans "Are you sure you want to revert to the defaults?" %}')) window.location='{% url admin_go_defaults %}';">{% trans "revert to defaults" %}</button>
+                        <button onclick="if (window.confirm('{% trans "Are you sure you want to revert to the defaults?" %}')) window.location='{% url "admin_go_defaults" %}';">{% trans "revert to defaults" %}</button>

                     {% endifnotequal %}
                     {% ifnotequal settings_pack "bootstrap" %}
                     {% endifnotequal %}
                     {% ifnotequal settings_pack "bootstrap" %}

-                        <button onclick="if (window.confirm('{% trans "Are you sure you want to run bootstrap mode?" %}')) window.location='{% url admin_go_bootstrap %}';">{% trans "go bootstrap" %}</button>
+                        <button onclick="if (window.confirm('{% trans "Are you sure you want to run bootstrap mode?" %}')) window.location='{% url "admin_go_bootstrap" %}';">{% trans "go bootstrap" %}</button>

                     {% endifnotequal %}
                 </td>
             </tr>
                     {% endifnotequal %}
                 </td>
             </tr>


@@ -66,13 +66,16 @@
         <caption>{% trans "Recent activity" %}</caption>
             <tr>
                 <td colspan="2">
         <caption>{% trans "Recent activity" %}</caption>
             <tr>
                 <td colspan="2">

-                    <table width="100%">
-                    {% for activity in recent_activity %}
-                        <tr><td>{% activity_item activity request.user %}</td></tr>
+                    <table id="result_list" width="100%">
+                    {% for activity in recent_activity.paginator.page %}
+                        <tr class="{% cycle 'row1' 'row2' %}"><td>{% activity_item activity request.user %}</td></tr>

                     {% endfor %}
                     </table>
                 </td>
             </tr>
         </table>
                     {% endfor %}
                     </table>
                 </td>
             </tr>
         </table>

+        <p class="paginator">
+            {{ recent_activity.paginator.page_numbers }}
+        </p>

     </div>
 {% endblock %}
\ No newline at end of file
     </div>
 {% endblock %}
\ No newline at end of file