Permalink
Browse files

Fixed merge conflict

  • Loading branch information...
1 parent 231e1b8 commit de350576e513001e6a8a5c4b5db2e9c093ed5afd @codeinthehole codeinthehole committed May 10, 2012
Showing with 9 additions and 7 deletions.
  1. +9 −7 oscar/templates/customer/address-delete.html
@@ -30,13 +30,15 @@
{% endblock header %}
{% block content %}
-<form action="." method="post" class="form-horizontal">
- {% csrf_token %}
- {% include "partials/form_fields.html" with form=form %}
- <div class="form-actions">
- <button type="submit" value="Delete address" class="btn btn-danger btn-large">Delete address</button> <a href="{% url customer:address-list %}">Cancel</a>
- </div>
-</form>
+<form action="." method="post">
+ {% csrf_token %}
+ <p>Are you sure you want to delete this address?</p>
+ {{ object.summary }}
+ {% include "partials/form_fields.html" with form=form %}
+ <div class="form-actions">
+ <button type="submit" value="Delete address" class="btn btn-danger btn-large">Delete</button> or <a href="{% url customer:address-list %}">cancel</a>
+ </div>
+</form>
{% endblock content %}

0 comments on commit de35057

Please sign in to comment.