Merge branch 'fix-package-delete-button' into dev

ckanext/odsh/templates/package/snippets/package_form.html

@@ -26,13 +26,11 @@
     <div class="form-actions">
       <div class="row-fluid">
         <div class="span6">
-          {% block delete_button %}
+          <!-- {% block delete_button %} -->
             {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
-            <a class="btn btn-danger pull-left" href="{% url_for 'dataset.delete', id=data.id %}"
-              data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">
-              {% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+              <a class="btn btn-danger pull-left" href="{% url_for dataset_type ~ '.delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ h.humanize_entity_type('package', dataset_type, 'delete confirmation') or _('Are you sure you want to delete this dataset?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
             {% endif %}
-          {% endblock %}
+          <!-- {% endblock %} -->
           {% block save_button %}
             <button class="btn btn-primary btn-arrow-right" type="submit" name="save">
               {% block save_button_text %}{{