Merge pull request #335 from ludw/savebuttons

Removed some duplication of savebutton markup in templates
jazzband · Jul 16, 2013 · 82934d4 · 82934d4
2 parents 58b0eb5 + 116ae29
commit 82934d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/djadmin2/templates/djadmin2/bootstrap/includes/save_buttons.html b/djadmin2/templates/djadmin2/bootstrap/includes/save_buttons.html
@@ -1,6 +1,16 @@
-{% load i18n %}
-<div class="pull-right">
-  <button class="btn btn-small" type="submit" name="_addanother">{% trans "Save and add another" %}</button>
-  <button class="btn btn-small" type="submit" name="_continue">{% trans "Save and continue editing" %}</button>
-  <button class="btn btn-small btn-success" type="submit" name="_save">{% trans "Save" %}</button>
-</div>
+{% load admin2_tags i18n %}
+<div class="row-fluid">
+  <div class="span12 save_btns">
+      {% if object %}
+      <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
+        <i class="icon-remove icon-white"></i>
+        {% trans "Delete" %}
+      </a>
+      {% endif %}
+      <div class="pull-right">
+        <button class="btn btn-small" type="submit" name="_addanother">{% trans "Save and add another" %}</button>
+        <button class="btn btn-small" type="submit" name="_continue">{% trans "Save and continue editing" %}</button>
+        <button class="btn btn-small btn-success" type="submit" name="_save">{% trans "Save" %}</button>
+      </div>
+    </div>
+</div>
diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
@@ -43,17 +43,7 @@
     <form method="post">
 
       {% if view.model_admin.save_on_top %}
-      <div class="row-fluid">
-        <div class="span12 save_btns">
-            {% if object %}
-            <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
-              <i class="icon-remove icon-white"></i>
-              {% trans "Delete" %}
-            </a>
-            {% endif %}
-              {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
-          </div>
-      </div>
+        {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
       {% endif %}
 
 <div class="row-fluid"><!-- begin main form row -->
@@ -110,17 +100,7 @@ <h4>{{ formset.model|model_verbose_name_plural|capfirst }}</h4>
 </div><!-- end main form row -->
 
       {% if view.model_admin.save_on_bottom %}
-      <div class="row-fluid">
-        <div class="span12 save_btns">
-            {% if object %}
-            <a class="btn btn-small btn-danger" href="{% url view|admin2_urlname:'delete' pk=object.pk %}">
-              <i class="icon-remove icon-white"></i>
-              {% trans "Delete" %}
-            </a>
-            {% endif %}
-              {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
-          </div>
-      </div>
+        {% include "djadmin2/bootstrap/includes/save_buttons.html" %}
       {% endif %}
 
 </form>