Tweaks to make #308 work

This commit is contained in:
Daniel Greenfeld 2013-07-08 19:14:19 +02:00
parent a909ab1517
commit da6ff9f3ce
3 changed files with 30 additions and 24 deletions

View file

@ -82,6 +82,7 @@ textarea {
border-radius: 5px;*/ border-radius: 5px;*/
} }
.save_btns { .save_btns {
margin-top: 10px; margin-top: 10px;
border: 1px solid #CCCCC1; border: 1px solid #CCCCC1;

View file

@ -40,24 +40,25 @@
{% block content %} {% block content %}
<div class="row-fluid">
<div class="span12">
<form method="post"> <form method="post">
{% if view.model_admin.save_on_top %} {% if view.model_admin.save_on_top %}
<div class="save_btns"> <div class="row-fluid">
<!-- <hr/> --> <div class="span12 save_btns">
{% if object %} {% if object %}
<a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}"> <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
<i class="icon-remove icon-white"></i> <i class="icon-remove icon-white"></i>
{% trans "Delete" %} {% trans "Delete" %}
</a> </a>
{% endif %} {% endif %}
{% include "djadmin2/bootstrap/includes/save_buttons.html" %} {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
<!-- <hr /> --> </div>
</div> </div>
{% endif %} {% endif %}
<div class="row-fluid"><!-- begin main form row -->
<div class="span12">
<div class="change_form"> <div class="change_form">
{% csrf_token %} {% csrf_token %}
{{ form|crispy }} {{ form|crispy }}
@ -105,21 +106,24 @@
</table> </table>
{% endfor %} {% endfor %}
</div>
</div><!-- end main form row -->
{% if view.model_admin.save_on_bottom %} {% if view.model_admin.save_on_bottom %}
<div class="save_btns"> <div class="row-fluid">
<!-- <hr/> --> <div class="span12 save_btns">
{% if object %} {% if object %}
<a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}"> <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
<i class="icon-remove icon-white"></i> <i class="icon-remove icon-white"></i>
{% trans "Delete" %} {% trans "Delete" %}
</a> </a>
{% endif %} {% endif %}
{% include "djadmin2/bootstrap/includes/save_buttons.html" %} {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
</div>
</div> </div>
{% endif %} {% endif %}
</form> </form>
</div>
</div>
{% endblock content %} {% endblock content %}

View file

@ -33,6 +33,7 @@ class PostAdmin(djadmin2.ModelAdmin2):
field_renderers = { field_renderers = {
'title': renderers.title_renderer, 'title': renderers.title_renderer,
} }
save_on_top = True
class CommentAdmin(djadmin2.ModelAdmin2): class CommentAdmin(djadmin2.ModelAdmin2):