[#688] Adds form blocks to confirm delete pages within groups and orgs

ckan · Mar 26, 2013 · 9cb9d7a · 9cb9d7a
1 parent b6cc784
commit 9cb9d7a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/ckan/templates/group/confirm_delete.html b/ckan/templates/group/confirm_delete.html
@@ -7,13 +7,15 @@
 {% block main_content %}
   <section class="module span6 offset3">
     <div class="module-content">
+      {% block form %}
       <p>{{ _('Are you sure you want to delete group - {name}?').format(name=c.group_dict.name) }}</p>
       <p class="form-actions">
       <form action="{% url_for controller='group', action='delete', id=c.group_dict.name %}" method="post">
         <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
       </form>
       </p>
+      {% endblock %}
     </div>
   </section>
 {% endblock %}
diff --git a/ckan/templates/group/confirm_delete_member.html b/ckan/templates/group/confirm_delete_member.html
@@ -7,6 +7,7 @@
 {% block main_content %}
   <section class="module span6 offset3">
     <div class="module-content">
+      {% block form %}
       <p>{{ _('Are you sure you want to delete member - {name}?').format(name=c.user_dict.name) }}</p>
       <p class="form-actions">
       <form action="{% url_for controller='group', action='member_delete', id=c.group_id %}" method="post">
@@ -15,6 +16,7 @@
         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
       </form>
       </p>
+      {% endblock %}
     </div>
   </section>
 {% endblock %}
diff --git a/ckan/templates/organization/confirm_delete.html b/ckan/templates/organization/confirm_delete.html
@@ -7,13 +7,15 @@
 {% block main_content %}
   <section class="module span6 offset3">
     <div class="module-content">
+      {% block form %}
       <p>{{ _('Are you sure you want to delete organization - {name}?').format(name=c.group_dict.name) }}</p>
       <p class="form-actions">
       <form action="{% url_for controller='organization', action='delete', id=c.group_dict.name %}" method="post">
         <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
       </form>
       </p>
+      {% endblock %}
     </div>
   </section>
 {% endblock %}
diff --git a/ckan/templates/organization/confirm_delete_member.html b/ckan/templates/organization/confirm_delete_member.html
@@ -7,6 +7,7 @@
 {% block main_content %}
   <section class="module span6 offset3">
     <div class="module-content">
+      {% block form %}
       <p>{{ _('Are you sure you want to delete member - {name}?').format(name=c.user_dict.name) }}</p>
       <p class="form-actions">
       <form action="{% url_for controller='organization', action='member_delete', id=c.group_id %}" method="post">
@@ -15,6 +16,7 @@
         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
       </form>
       </p>
+      {% endblock %}
     </div>
   </section>
 {% endblock %}