diff --git a/ckanext/odsh/templates/organization/snippets/organization_form.html b/ckanext/odsh/templates/organization/snippets/organization_form.html
index f31c8e401bfa574c07603b98d2d635dcd0d1955f..7e72ce6afd9bc3dcce1ed0c1d473b1572488dbcd 100644
--- a/ckanext/odsh/templates/organization/snippets/organization_form.html
+++ b/ckanext/odsh/templates/organization/snippets/organization_form.html
@@ -50,7 +50,7 @@
<div class="form-actions">
{% block delete_button %}
{% if h.check_access('organization_delete', {'id': data.id}) %}
- <a class="btn btn-danger pull-left" href="{% url_for controller='organization', action='delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this Organization? This will delete all the public and private datasets belonging to this organization.') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+ <a class="btn btn-danger pull-left" href="{% url_for group_type+'.delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ h.humanize_entity_type('organization', group_type, 'delete confirmation') or _('Are you sure you want to delete this Organization? Note*: Deleting cannot be performed while public or private datasets belong to this organization.') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
{% endif %}
{% endblock %}
<button class="btn btn-primary" name="save" type="submit">{% block save_text %}{{ _('Save Organization') }}{% endblock %}</button>
diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html
index dd42ba07e5e508dcdcb5c95e1fc1bd453a0d859e..0c196b9e87fd474dac95d6e0cdc390fd4d1f5651 100644
--- a/ckanext/odsh/templates/package/snippets/resource_form.html
+++ b/ckanext/odsh/templates/package/snippets/resource_form.html
@@ -5,118 +5,124 @@
{% set active = data and data.state=='active' %}
{% set action = form_action or h.url_for(controller='resource', action='new', id=pkg_name) %}
-<form id="resource-edit" class="dataset-form dataset-resource-form {%if(data)%}resource-edit-form{%endif%}" method="post" action="{{ action }}" data-module="basic-form resource-form"
- enctype="multipart/form-data" novalidate>
- {% block stages %}
- <div class='search-form'>
- <h2>{{ _('odsh Create Dataset') }}</h2>
- </div>
- {# An empty stages variable will not show the stages #}
- {% if stage %}
- {{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name) }}
- {% endif %}
- {% endblock %}
-
- {# {% block errors %}{{ form.errors(error_summary) }}{% endblock %} #}
-
- <input name="id" value="{{ data.id }}" type="hidden" />
-
- {% block basic_fields %}
-
- {% block basic_fields_url %}
- {% set is_upload = (data.url_type == 'upload') %}
- {% set error_string = _('odsh_resource_upload_error_label') if error_summary %}
- {{ form.image_upload(data, error_string, field_url='url', field_upload='upload', field_clear='clear_upload',
- is_upload_enabled=h.uploads_enabled(), is_url=data.url and not is_upload, is_upload=is_upload,
- upload_label=_('Data-Upload'), url_label=_('URL'), placeholder=_('http://example.com/external-data.csv'),
- field_name='name') }}
- {% endblock %}
-
- {% block basic_fields_name %}
- {% set error_string = _('odsh_resource_name_error_label') if errors.name %}
- {{ form.input('name', id='field-name', label=_('Name'), placeholder=_('Enter name of the dataset'),
- value=data.name, error=error_string, classes=['control-full'], is_required=false) }}
- {% endblock %}
-
- {% block basic_fields_description %}
- {% endblock %}
-
- {% endblock basic_fields %}
-
- {% block metadata_fields %}
- {% if include_metadata %}
- {# TODO: Where do these come from, they don't exist in /package/new_package_form.html #}
- {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options=[{'value': 'empty', 'text':
- _('Select a type…')}], selected="empty", error=errors.type) }} #}
-
- {{ form.input('last_modified', id='field-last-modified', label=_('Last Modified'), placeholder=_('eg. 2012-06-05'),
- value=data.last_modified, error=errors.last_modified, classes=[]) }}
-
- {{ form.input('size', id='field-size', label=_('File Size'), placeholder=_('eg. 1024'), value=data.size,
- error=errors.size, classes=[]) }}
-
- {{ form.input('mimetype', id='field-mimetype', label=_('MIME Type'), placeholder=_('eg. application/json'),
- value=data.mimetype, error=errors.mimetype, classes=[]) }}
-
- {{ form.input('mimetype_inner', id='field-mimetype-inner', label=_('MIME Type'), placeholder=_('eg.
- application/json'), value=data.mimetype_inner, error=errors.mimetype_inner, classes=[]) }}
- {% endif %}
-
-
- {% block basic_fields_format %}
-
- {% set format_attrs = {'data-module': 'odsh_guessformat', 'data-module-formats':h.odsh_upload_known_formats()} %}
- {% set format_attrs = {} %}
- {% set error_string = _('odsh_resource_format_error_label') if errors.format %}
-
- {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'), value=data.format, error=error_string, is_required=true, classes=['control-full'],attrs=format_attrs) %}
- {% endcall %}
- {% endblock %}
- {% endblock %}
-
- <div class='row-fluid'>
- <div class="span6">
-
- <div class="form-actions resource-buttons">
- {% if stage %}
- {% block previous_button %}
- <button class="btn btn-arrow-right" name="save" value="go-dataset" type="submit">{{ _('Back') }}</button>
- {% endblock %}
- {% block again_button %}
- <button class="btn float-right btn-arrow-right" name="save" value="again" type="submit">{{_('Another dataset')}}</button>
- {% endblock %}
- {% endif %}
- </div>
- <div class="form-actions">
- {% block delete_button %}
- {% if data.id %}
- {% if h.check_access('resource_delete', {'id': data.id}) %}
- <a class="btn btn-danger pull-left" href="{% url_for controller='dataset', action='resource_delete', resource_id=data.id, id=pkg_name %}"
- data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{%
- block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
- {% endif %}
- {% endif %}
- {% endblock %}
- {% if stage %}
- {% block save_button %}
- <input type='hidden' name='save' value='go-metadata'/>
- <div id='form-submit-button' data-module="odsh_form" data-module-validateformat='true' class="btn btn-primary btn-arrow-right" name="save" value="go-metadata">{% block
- save_button_text
- %}{{
- _('Upload dataset') }}{% endblock %}</div>
- {% endblock %}
- {% else %}
- {% block add_button %}
- <button class="btn btn-primary btn-arrow-right" name="save" value="go-dataset-complete" type="submit">{{
- _('Add') }}</button>
- {% endblock %}
- {% endif %}
- </div>
- </div>
- </div>
- <span class='required-text'>*{{ _('Required information') }}</span>
+<form id="resource-edit" class="dataset-form dataset-resource-form {%if(data)%}resource-edit-form{%endif%}" method="post" action="{{ action }}" data-module="basic-form resource-form" enctype="multipart/form-data" novalidate>
+ {% block stages %}
+ <div class='search-form'>
+ <h2>{{ _('odsh Create Dataset') }}</h2>
+ </div>
+ {# An empty stages variable will not show the stages #}
+ {% if stage %}
+ {{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name) }}
+ {% endif %}
+ {% endblock %}
+
+ {# {% block errors %}{{ form.errors(error_summary) }}{% endblock %} #}
+
+ <input name="id" value="{{ data.id }}" type="hidden"/>
+
+ {% block basic_fields %}
+
+ {% block basic_fields_url %}
+ {% set is_upload = (data.url_type == 'upload') %}
+ {% set error_string = _('odsh_resource_upload_error_label') if error_summary %}
+ {{ form.image_upload(data, error_string, field_url='url', field_upload='upload', field_clear='clear_upload',
+ is_upload_enabled=h.uploads_enabled(), is_url=data.url and not is_upload, is_upload=is_upload,
+ upload_label=_('Data-Upload'), url_label=_('URL'), placeholder=_('http://example.com/external-data.csv'),
+ field_name='name') }}
+ {% endblock %}
+
+ {% block basic_fields_name %}
+ {% set error_string = _('odsh_resource_name_error_label') if errors.name %}
+ {{ form.input('name', id='field-name', label=_('Name'), placeholder=_('Enter name of the dataset'),
+ value=data.name, error=error_string, classes=['control-full'], is_required=false) }}
+ {% endblock %}
+
+ {% block basic_fields_description %}{% endblock %}
+
+ {% endblock basic_fields %}
+
+ {% block metadata_fields %}
+ {% if include_metadata %}
+ {# TODO: Where do these come from, they don't exist in /package/new_package_form.html #}
+ {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options=[{'value': 'empty', 'text':
+ _('Select a type…')}], selected="empty", error=errors.type) }} #}
+
+ {{ form.input('last_modified', id='field-last-modified', label=_('Last Modified'), placeholder=_('eg. 2012-06-05'),
+ value=data.last_modified, error=errors.last_modified, classes=[]) }}
+
+ {{ form.input('size', id='field-size', label=_('File Size'), placeholder=_('eg. 1024'), value=data.size,
+ error=errors.size, classes=[]) }}
+
+ {{ form.input('mimetype', id='field-mimetype', label=_('MIME Type'), placeholder=_('eg. application/json'),
+ value=data.mimetype, error=errors.mimetype, classes=[]) }}
+
+ {{ form.input('mimetype_inner', id='field-mimetype-inner', label=_('MIME Type'), placeholder=_('eg.
+ application/json'), value=data.mimetype_inner, error=errors.mimetype_inner, classes=[]) }}
+ {% endif %}
+
+
+ {% block basic_fields_format %}
+
+ {% set format_attrs = {'data-module': 'odsh_guessformat', 'data-module-formats':h.odsh_upload_known_formats()} %}
+ {% set format_attrs = {} %}
+ {% set error_string = _('odsh_resource_format_error_label') if errors.format %}
+
+ {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'),
+ value=data.format, error=error_string, is_required=true, classes=['control-full'],attrs=format_attrs) %}
+ {% endcall %}
+ {% endblock %}
+ {% endblock %}
+
+ <div class='row-fluid'> <div class="span6">
+
+ <div class="form-actions resource-buttons">
+ {% if stage %}
+ {% block previous_button %}
+ <button class="btn btn-arrow-right" name="save" value="go-dataset" type="submit">{{ _('Back') }}</button>
+ {% endblock %}
+ {% block again_button %}
+ <button class="btn float-right btn-arrow-right" name="save" value="again" type="submit">{{_('Another
+ dataset')}}</button>
+ {% endblock %}
+ {% endif %}
+ </div>
+ <div class="form-actions">
+ {% block delete_button %}
+ {% if data.id %}
+ {% if h.check_access('resource_delete', {'id': data.id}) %}
+ <a class="btn btn-danger pull-left" href="{% url_for dataset_type ~ '_resource.delete', resource_id=data.id, id=pkg_name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">
+ {% block delete_button_text
+ %}
+ {{ _('Delete') }}
+ {% endblock %}
+ </a>
+ {% endif %}
+ {% endif %}
+ {% endblock %}
+ {% if stage %}
+ {% block save_button %}
+ <input type='hidden' name='save' value='go-metadata'/>
+ <div id='form-submit-button' data-module="odsh_form" data-module-validateformat='true' class="btn btn-primary btn-arrow-right" name="save" value="go-metadata">
+ {% block
+ save_button_text
+ %}
+ {{
+ _('Upload dataset') }}
+ {% endblock %}
+ </div>
+ {% endblock %}
+ {% else %}
+ {% block add_button %}
+ <button class="btn btn-primary btn-arrow-right" name="save" value="go-dataset-complete" type="submit">{{
+ _('Add') }}</button>
+ {% endblock %}
+ {% endif %}
+ </div>
+ </div>
+ </div>
+ <span class='required-text'>*{{ _('Required information') }}</span>
</form>
{% block scripts %}
- {% asset 'ckanext-odsh/odsh_resource_form_script' %}
+ {% asset 'ckanext-odsh/odsh_resource_form_script' %}
{% endblock scripts %}
diff --git a/ckanext/odsh/templates/user/edit_user_form.html b/ckanext/odsh/templates/user/edit_user_form.html
index 77942c49dddcb64a9c84f856ea80b649ef55da3d..057a29155668ff269d187f13631828f1dc7cafca 100644
--- a/ckanext/odsh/templates/user/edit_user_form.html
+++ b/ckanext/odsh/templates/user/edit_user_form.html
@@ -43,12 +43,12 @@
<div class="form-actions">
{% block delete_button %}
{% if h.check_access('user_delete', {'id': data.id}) %}
- <a class="btn btn-danger pull-left" href="{% url_for controller='user', action='delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this User?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+ <a class="btn btn-danger pull-left" href="{% url_for 'user_delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this User?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
{% endif %}
{% endblock %}
{% block generate_button %}
{% if h.check_access('user_generate_apikey', {'id': data.id}) %}
- <a class="btn btn-warning" href="{% url_for controller='user', action='generate_apikey', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to regenerate the API key?') }}">{% block generate_button_text %}{{ _('Regenerate API Key') }}{% endblock %}</a>
+ <a class="btn btn-warning" href="{% url_for 'user_generate_apikey', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to regenerate the API key?') }}">{% block generate_button_text %}{{ _('Regenerate API Key') }}{% endblock %}</a>
{% endif %}
{% endblock %}
{{ form.required_message() }}