Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-15 04:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a merge mistake by yours truly.

Browse source
This commit is contained in:
Daniel Greenfeld 2013-05-19 14:46:35 +02:00
parent b4d4a6bde7
commit 7597e045a3
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
djadmin2/templates/admin2/bootstrap/index.html
View file

@ -24,12 +24,8 @@
</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
@ -37,11 +33,7 @@
{# 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>