diff --git a/ckanext/odsh/templates/datarequests/snippets/comment_item.html b/ckanext/odsh/templates/datarequests/snippets/comment_item.html index 678afe85203c6dd8c6ba13b6f4cdd3ce2435c7ec..899eb7d3e8f51579312f9f19fab6c31bc2250169 100644 --- a/ckanext/odsh/templates/datarequests/snippets/comment_item.html +++ b/ckanext/odsh/templates/datarequests/snippets/comment_item.html @@ -6,7 +6,7 @@ {% endif %} <div class="odsh-comment-wrapper"> - {# <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}" + {# <a href="{{ h.url_for('user.read', id=comment.user.get('name')) }}" class="comment-avatar"> {{ h.gravatar(comment.user.get('email_hash'), 48) }} </a> @@ -29,7 +29,7 @@ #} <div class="comment-header-text"> <i class="icon-comment fa fa-comment"></i> - <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}" class="comment-author">{{ comment.user.get('display_name') }}</a> + <a href="{{ h.url_for('user.read', id=comment.user.get('name')) }}" class="comment-author">{{ comment.user.get('display_name') }}</a> <span class='comment-date' title="{{comment.time}}">{{ h.odsh_render_datetime(comment.time).lower() }}</span> </div> </div> diff --git a/ckanext/odsh/templates/organization/snippets/organization_form.html b/ckanext/odsh/templates/organization/snippets/organization_form.html index 1c4e8b1e1e73bef3d525a8ea6776ce5e084fab0d..1f8f80a564586a5d99e1442667873f3f2915ccb7 100644 --- a/ckanext/odsh/templates/organization/snippets/organization_form.html +++ b/ckanext/odsh/templates/organization/snippets/organization_form.html @@ -10,8 +10,8 @@ {{ form.input('title', label=_('Name'), id='field-name', placeholder=_('My Organization'), value=data.title, error=errors.title, classes=['control-full'], attrs=attrs) }} {# Perhaps these should be moved into the controller? #} - {% set prefix = h.url_for(named_route='organization.read', id='') %} - {% set domain = h.url_for(named_route='organization.read', id='', qualified=true) %} + {% set prefix = h.url_for('organization.read', id='') %} + {% set domain = h.url_for('organization.read', id='', qualified=true) %} {% set domain = domain|replace("http://", "")|replace("https://", "") %} {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain, 'data-module-placeholder': '<organization>'} %} diff --git a/ckanext/odsh/templates/package/resource_read.html b/ckanext/odsh/templates/package/resource_read.html index 758b2e15e23715c607bc40ff8087f2929213fb94..663baecf60c014a0001e0bf3a8c05713f8663547 100644 --- a/ckanext/odsh/templates/package/resource_read.html +++ b/ckanext/odsh/templates/package/resource_read.html @@ -65,7 +65,7 @@ {% if not res.description and package.notes %} <h3>{{ _('From the dataset abstract') }}</h3> <blockquote>{{ h.markdown_extract(h.get_translated(package, 'notes')) }}</blockquote> - <p>{% trans dataset=package.title, url=h.url_for(named_route='dataset.read', id=package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %} + <p>{% trans dataset=package.title, url=h.url_for('dataset.read', id=package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %} {% endif %} </div> {% endblock %} diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html index ce2777904c0f7fac040e49a816262f3f26490592..81983e4bdbe12c55a85057acef83cc2614de70ba 100644 --- a/ckanext/odsh/templates/package/snippets/resource_form.html +++ b/ckanext/odsh/templates/package/snippets/resource_form.html @@ -3,7 +3,7 @@ {% set data = data or {} %} {% set errors = errors or {} %} {% set active = data and data.state=='active' %} -{% set action = form_action or h.url_for(named_route='resource.new', id=pkg_name) %} +{% set action = form_action or h.url_for('resource.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 %} diff --git a/ckanext/odsh/templates/package/snippets/resource_item.html b/ckanext/odsh/templates/package/snippets/resource_item.html index 3f981fd69cdc6755324387e4233e7d768e5b5d94..b08e58bdbaaf4a5afc1f9ca6191556ddf58a0f40 100644 --- a/ckanext/odsh/templates/package/snippets/resource_item.html +++ b/ckanext/odsh/templates/package/snippets/resource_item.html @@ -30,7 +30,7 @@ <div aria-hidden="true" class="icon icon-download"></div> </a> {% if can_edit %} - <a href="{{ h.url_for(named_route='resource.edit', id=pkg.name, resource_id=res.id) }}"> + <a href="{{ h.url_for('resource.edit', id=pkg.name, resource_id=res.id) }}"> <div class="icon icon-edit"></div> </a> {% endif %} @@ -52,7 +52,7 @@ <div aria-hidden="true" class="icon icon-download"></div> </a> {% if can_edit %} - <a href="{{ h.url_for(named_route='resource.edit', id=pkg.name, resource_id=res.id) }}"> + <a href="{{ h.url_for('resource.edit', id=pkg.name, resource_id=res.id) }}"> <div class="icon icon-edit"></div> </a> {% endif %} diff --git a/ckanext/odsh/templates/package/view_edit_base.html b/ckanext/odsh/templates/package/view_edit_base.html index 822af31031768f5b2cfb1377a0800a4c60dcf7c6..6b3e0de85610ec20bdad8e0ef641145561fa8093 100644 --- a/ckanext/odsh/templates/package/view_edit_base.html +++ b/ckanext/odsh/templates/package/view_edit_base.html @@ -8,7 +8,7 @@ {% block content_action %} {% link_for _('All views'), named_route='resource.views', id=pkg.name, resource_id=res.id, class_='btn', icon='arrow-left' %} {% if res %} - {% set url = h.url_for(named_route='resource.read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %} + {% set url = h.url_for('resource.read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %} <a href="{{ url }}" class="btn"><i class="fa fa-eye"></i> {{ _('View view') }}</a> {% endif %} {% endblock %}