Skip to content

Removed incompatible code with 2.11 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-daly merged 1 commit into from
Mar 18, 2025
Merged

Removed incompatible code with 2.11 #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions ckanext/ukdstheme/templates/package/resource_read.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

{% block breadcrumb_content %}
{{ super() }}
<li class="active"><a href="">{{ h.resource_display_name(res)|truncate(30) }}</a></li>
<li class="active"><a href="" aria-current="page" aria-label="{{ _('Current resource: {name}').format(name=h.resource_display_name(res)) }}">{{ h.resource_display_name(res)|truncate(30) }}</a></li>
{% endblock %}

{% block pre_primary %}
Expand All @@ -41,7 +41,7 @@
{% elif not res.has_views and not res.url_type == 'upload' %}
<i class="fa fa-external-link"></i> {{ _('Go to resource') }}
{% else %}
<i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
<i class="fa fa-arrow-circle-down"></i> {{ _('Download') }}
{% endif %}
</a>
{% block download_resource_button %}
Expand Down Expand Up @@ -104,25 +104,18 @@ <h3>{{ _('Dataset description:') }}</h3>
{% block data_preview %}
{% block resource_view %}
{% block resource_view_nav %}
{% 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=resource,
extra_class="nav-tabs nav-tabs-plain"
%}
{% endblock %}
{% block resource_view_content %}
<div class="resource-view">
{% 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(resource, package) }}
{% else %}
{% if resource_views %}
{% for resource_view in resource_views %}
{% if resource_view == current_resource_view %}
{% snippet 'package/snippets/resource_view.html',
Expand All @@ -141,7 +134,7 @@ <h3>{{ _('Dataset description:') }}</h3>
<p class="text-muted">
<i class="fa fa-info-circle"></i>
{{ _("Not seeing the views you were expecting?")}}
<a href="javascript:void(0);" data-toggle="collapse" data-target="#data-view-info">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target="#data-view-info">
{{ _('Click here for more information.') }}</a>
</p>
<div id="data-view-info" class="collapse">
Expand Down Expand Up @@ -221,7 +214,7 @@ <h2>{{ _('Additional Information') }}</h2>
{% snippet "package/snippets/resources.html", pkg=pkg, active=res.id, action='read', is_activity_archive=is_activity_archive %}
{% endblock %}

{% block resource_license %}
{% block resource_social %}
{% snippet "snippets/social.html" %}
{% endblock %}
{% endblock %}