merge of @RaphaelKimmig's work

djadmin2/templates/admin2/bootstrap/index.html

@@ -1,4 +1,5 @@
 {% extends "admin2/bootstrap/base.html" %}
+{% load admin2_urls %}
 
 {% block content %}
 <h3>Site administration</h3>
@@ -23,15 +24,24 @@
                             </a>
                         </td>
                         <td class="text-right">
+<<<<<<< HEAD
                         {# if has_add_permission #}
                             <a href="TODO">
+=======
+                            <a href="{% url model_admin|admin2_urlname:'create' %}">
+>>>>>>> fix-admin-index-links
                                 <i class="icon-plus"></i>
+
                                 Add
                             </a>
                         {# endif #}
                         </td>
                         <td class="text-right">
+<<<<<<< HEAD
                             <a href="{{ model_admin.get_index_url }}">
+=======
+                            <a href="{# FIXME: edit kind of doesn't make sense for the whole ModelAdmin #}">
+>>>>>>> fix-admin-index-links
                                 <i class="icon-pencil"></i>
                                 Change
                             </a>

docs/contributing.rst

@@ -173,7 +173,7 @@ First we pull the code into a local branch::
 
 Then we run the tests::
 
-    python manage.py test
+    ./runtests.py
 
 We finish with a non-fastforward merge (to preserve the branch history) and push to GitHub::