Merge remote-tracking branch 'brew/organization-templates'

ckan · Sep 17, 2015 · 969995b · 969995b
2 parents 7c2f2e0 + 7f5283e
commit 969995b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ckanext/scheming/templates/scheming/organization/about.html b/ckanext/scheming/templates/scheming/organization/about.html
@@ -1,4 +1,4 @@
-{% extends "group/about.html" %}
+{% extends "organization/about.html" %}
 
 {% block primary_content_inner %}
 <dl>

diff --git a/ckanext/scheming/templates/scheming/organization/group_form.html b/ckanext/scheming/templates/scheming/organization/group_form.html
@@ -16,10 +16,10 @@
     <div class="form-actions">
         {% block delete_button %}
         {% if h.check_access('group_delete', {'id': data.id}) and action=='edit'  %}
-        {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Group?')}) %}
-        <a class="btn btn-danger pull-left" href="{% url_for controller='group', action='delete', id=data.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+        {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organization?')}) %}
+        <a class="btn btn-danger pull-left" href="{% url_for controller='organization', action='delete', id=data.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
         {% endif %}
         {% endblock %}
-        <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ _('Save Group') }}{% endblock %}</button>
+        <button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ _('Save Organization') }}{% endblock %}</button>
     </div>
 </form>