Skip to content
Snippets Groups Projects
Commit cb16673c authored by Thorge Petersen's avatar Thorge Petersen
Browse files

Removed usage of global var c

parent 70d7cefe
No related branches found
No related tags found
2 merge requests!41Version 2.0.0,!38Merge py3 into dev
{% extends "package/view_edit_base.html" %} {% 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 form_title %}{{ _('Edit view') }}{% endblock %}
{% block breadcrumb_content %} {% block breadcrumb_content %}
......
{% extends "package/view_edit_base.html" %} {% 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 form_title %}{{ _('Add view') }}{% endblock %}
{% block breadcrumb_content %} {% block breadcrumb_content %}
......
{% extends "package/base.html" %} {% extends "package/base.html" %}
{% set logged_in = true if c.userobj else false %} {% set logged_in = true if c.userobj else false %}
{% set res = c.resource %} {% set res = resource %}
{% block breadcrumb_content_selected %}{% endblock %} {% block breadcrumb_content_selected %}{% endblock %}
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
{% block head_extras -%} {% block head_extras -%}
{{ super() }} {{ 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) %} {% 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(c.package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}"> <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 }}"> <meta property="og:description" content="{{ description|forceescape }}">
{% endblock -%} {% 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 %} {% block breadcrumb_content_selected %}{% endblock %}
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
{% if res.description %} {% if res.description %}
{{ h.render_markdown(res.description) }} {{ h.render_markdown(res.description) }}
{% endif %} {% endif %}
{% if not res.description and c.package.notes %} {% if not res.description and package.notes %}
<h3>{{ _('From the dataset abstract') }}</h3> <h3>{{ _('From the dataset abstract') }}</h3>
<blockquote>{{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}</blockquote> <blockquote>{{ h.markdown_extract(h.get_translated(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 %} <p>{% trans dataset=package.title, url=h.url_for(controller='dataset', action='read', id=package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
{% endif %} {% endif %}
</div> </div>
{% endblock %} {% endblock %}
...@@ -73,32 +73,32 @@ ...@@ -73,32 +73,32 @@
{% block data_preview %} {% block data_preview %}
{% block resource_view %} {% block resource_view %}
{% block resource_view_nav %} {% 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", {% snippet "package/snippets/resource_views_list.html",
views=resource_views, views=resource_views,
pkg=pkg, pkg=pkg,
is_edit=false, is_edit=false,
view_id=current_resource_view['id'], view_id=current_resource_view['id'],
resource_preview=resource_preview, resource_preview=resource_preview,
resource=c.resource, resource=resource,
extra_class="nav-tabs-plain" extra_class="nav-tabs-plain"
%} %}
{% endblock %} {% endblock %}
<div class="module-content"> <div class="module-content">
{% block resource_view_content %} {% block resource_view_content %}
<div class="resource-view"> <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 %} {% set views_created = res.has_views or resource_preview %}
{% if views_created %} {% if views_created %}
{% if resource_preview and not current_resource_view %} {% if resource_preview and not current_resource_view %}
{{ h.resource_preview(c.resource, c.package) }} {{ h.resource_preview(resource, package) }}
{% else %} {% else %}
{% for resource_view in resource_views %} {% for resource_view in resource_views %}
{% if resource_view == current_resource_view %} {% if resource_view == current_resource_view %}
{% snippet 'package/snippets/resource_view.html', {% snippet 'package/snippets/resource_view.html',
resource_view=resource_view, resource_view=resource_view,
resource=c.resource, resource=resource,
package=c.package package=package
%} %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
{# Views not created #} {# Views not created #}
<div class="module-content data-viewer-info"> <div class="module-content data-viewer-info">
<p>{{ _("There are no views created for this resource yet.") }}</p> <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"> <p class="muted">
<i class="fa fa-info-circle"></i> <i class="fa fa-info-circle"></i>
{{ _("Not seeing the views you were expecting?")}} {{ _("Not seeing the views you were expecting?")}}
......
{% extends "package/resource_edit_base.html" %} {% extends "package/resource_edit_base.html" %}
{% set logged_in = true if c.userobj else false %} {% set logged_in = true if c.userobj else false %}
{% set res = c.resource %} {% set res = resource %}
{% block breadcrumb_edit_selected %}{% endblock %} {% block breadcrumb_edit_selected %}{% endblock %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment