diff --git a/ckanext/odsh/templates/package/edit_view.html b/ckanext/odsh/templates/package/edit_view.html
index 4be465558fbab3c63a2389ba44972aa2c41e2ee0..92eb2ced41497b384973379e7a1784357cd1d76e 100644
--- a/ckanext/odsh/templates/package/edit_view.html
+++ b/ckanext/odsh/templates/package/edit_view.html
@@ -1,6 +1,6 @@
{% extends "package/view_edit_base.html" %}
-{% block subtitle %}{{ _('Edit view') }} - {{ h.resource_display_name(c.resource) }}{% endblock %}
+{% block subtitle %}{{ _('Edit view') }} - {{ h.resource_display_name(resource) }}{% endblock %}
{% block form_title %}{{ _('Edit view') }}{% endblock %}
{% block breadcrumb_content %}
diff --git a/ckanext/odsh/templates/package/new_view.html b/ckanext/odsh/templates/package/new_view.html
index 9c95fd6b38e987ac1e4be34ddf53e9420f679380..ff0d289370638e7153960740075dbc0f32ec174d 100644
--- a/ckanext/odsh/templates/package/new_view.html
+++ b/ckanext/odsh/templates/package/new_view.html
@@ -1,6 +1,6 @@
{% extends "package/view_edit_base.html" %}
-{% block subtitle %}{{ _('Add view') }} - {{ h.resource_display_name(c.resource) }}{% endblock %}
+{% block subtitle %}{{ _('Add view') }} - {{ h.resource_display_name(resource) }}{% endblock %}
{% block form_title %}{{ _('Add view') }}{% endblock %}
{% block breadcrumb_content %}
diff --git a/ckanext/odsh/templates/package/resource_edit_base.html b/ckanext/odsh/templates/package/resource_edit_base.html
index 55fbe8f0302810105de803425e94582b44bb6450..f2c33fe49a3e2c4da22f60a5a8f03fff12ebb88b 100644
--- a/ckanext/odsh/templates/package/resource_edit_base.html
+++ b/ckanext/odsh/templates/package/resource_edit_base.html
@@ -1,7 +1,7 @@
{% extends "package/base.html" %}
{% set logged_in = true if c.userobj else false %}
-{% set res = c.resource %}
+{% set res = resource %}
{% block breadcrumb_content_selected %}{% endblock %}
@@ -23,11 +23,11 @@
{% set active = data and data.state=='active' %}
{% if res %}
-<div class="odsh-dataset-heading">
+ <div class="odsh-dataset-heading">
<span class='title'>Ressource {%if(res.name)%}＂{{res.name}}＂{%endif%} bearbeiten</span>
{% link_for _('Back'), controller='resource', action='read', id=pkg.name, resource_id=res.id, class_='btn btn-heading', icon='arrow-left' %}
-<span class="clear"></span>
-</div>
+ <span class="clear"></span>
+ </div>
{% endif %}
<h1 class="hide-heading">{% block form_title %}{{ _('Edit resource') }}{% endblock %}</h1>
{% block form %}{% endblock %}
diff --git a/ckanext/odsh/templates/package/resource_read.html b/ckanext/odsh/templates/package/resource_read.html
index 86720a51e278c6662cfe3269dff7807718f72e5e..3c11d74d7081d8b10659e07282efaf7017bf762e 100644
--- a/ckanext/odsh/templates/package/resource_read.html
+++ b/ckanext/odsh/templates/package/resource_read.html
@@ -4,12 +4,12 @@
{% block head_extras -%}
{{ super() }}
- {% set description = h.markdown_extract(h.get_translated(res, 'description'), extract_length=200) if res.description else h.markdown_extract(h.get_translated(c.package, 'notes'), extract_length=200) %}
- <meta property="og:title" content="{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
+ {% set description = h.markdown_extract(h.get_translated(res, 'description'), extract_length=200) if res.description else h.markdown_extract(h.get_translated(package, 'notes'), extract_length=200) %}
+ <meta property="og:title" content="{{ h.dataset_display_name(package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
<meta property="og:description" content="{{ description|forceescape }}">
{% endblock -%}
-{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
+{% block subtitle %}{{ h.dataset_display_name(package) }} - {{ h.resource_display_name(res) }}{% endblock %}
{% block breadcrumb_content_selected %}{% endblock %}
@@ -62,10 +62,10 @@
{% if res.description %}
{{ h.render_markdown(res.description) }}
{% endif %}
- {% if not res.description and c.package.notes %}
+ {% if not res.description and package.notes %}
<h3>{{ _('From the dataset abstract') }}</h3>
- <blockquote>{{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}</blockquote>
- <p>{% trans dataset=c.package.title, url=h.url_for(controller='dataset', action='read', id=c.package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+ <blockquote>{{ h.markdown_extract(h.get_translated(package, 'notes')) }}</blockquote>
+ <p>{% trans dataset=package.title, url=h.url_for(controller='dataset', action='read', id=package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
{% endif %}
</div>
{% endblock %}
@@ -73,32 +73,32 @@
{% block data_preview %}
{% block resource_view %}
{% block resource_view_nav %}
- {% set resource_preview = h.resource_preview(c.resource, c.package) %}
+ {% set resource_preview = h.resource_preview(resource, package) %}
{% snippet "package/snippets/resource_views_list.html",
views=resource_views,
pkg=pkg,
is_edit=false,
view_id=current_resource_view['id'],
resource_preview=resource_preview,
- resource=c.resource,
+ resource=resource,
extra_class="nav-tabs-plain"
%}
{% endblock %}
<div class="module-content">
{% block resource_view_content %}
<div class="resource-view">
- {% set resource_preview = h.resource_preview(c.resource, c.package) %}
+ {% set resource_preview = h.resource_preview(resource, package) %}
{% set views_created = res.has_views or resource_preview %}
{% if views_created %}
{% if resource_preview and not current_resource_view %}
- {{ h.resource_preview(c.resource, c.package) }}
+ {{ h.resource_preview(resource, package) }}
{% else %}
{% for resource_view in resource_views %}
{% if resource_view == current_resource_view %}
{% snippet 'package/snippets/resource_view.html',
resource_view=resource_view,
- resource=c.resource,
- package=c.package
+ resource=resource,
+ package=package
%}
{% endif %}
{% endfor %}
@@ -107,7 +107,7 @@
{# Views not created #}
<div class="module-content data-viewer-info">
<p>{{ _("There are no views created for this resource yet.") }}</p>
- {% if h.check_access('resource_view_create', {'resource_id': c.resource.id}) %}
+ {% if h.check_access('resource_view_create', {'resource_id': resource.id}) %}
<p class="muted">
<i class="fa fa-info-circle"></i>
{{ _("Not seeing the views you were expecting?")}}
diff --git a/ckanext/odsh/templates/package/view_edit_base.html b/ckanext/odsh/templates/package/view_edit_base.html
index 416929c152cca25c69d087b3d505cb723f2135e3..ed445941b921f2615ea429b4b102ed4288ef6cad 100644
--- a/ckanext/odsh/templates/package/view_edit_base.html
+++ b/ckanext/odsh/templates/package/view_edit_base.html
@@ -1,7 +1,7 @@
{% extends "package/resource_edit_base.html" %}
{% set logged_in = true if c.userobj else false %}
-{% set res = c.resource %}
+{% set res = resource %}
{% block breadcrumb_edit_selected %}{% endblock %}