Skip to content
This repository was archived by the owner on Nov 2, 2021. It is now read-only.

Commit e1f29bf

Browse files
ll911ll911
authored
Merge pull request #40 from bcgov/revert-38-372-add-pdf-view-req
Revert "372 add pdf view req"
2 parents 386d9be + 55b2037 commit e1f29bf

File tree

1 file changed

+73
-78
lines changed

1 file changed

+73
-78
lines changed

‎ckanext/openapi/templates/package/snippets/resource_view.html

+73-78
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,82 @@
11
{% import 'macros/form.html' as form %}
2-
{#
3-
This h.can_view_resource helper function is defined in ckanext-bcgov/ckanext/bcgov/util/util. Thus ckanext-bcgov is required for this extension to function dependencie
4-
#}
5-
{% if h.can_view_resource(resource) %}
6-
<div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
7-
8-
<a class="btn pull-right"
9-
href="{{ h.url('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}" target="_blank">
10-
{% trans %}Open in new tab{% endtrans %}
11-
</a>
12-
<a class="btn pull-right"
13-
href="#embed-{{ resource_view['id'] }}"
14-
data-module="resource-view-embed"
15-
data-module-id="{{ resource_view['id'] }}"
16-
data-module-url="{{ h.url('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
17-
<i class="icon-code"></i>
18-
{{ _("Embed") }}
19-
</a>
20-
<p class="desc">{{ resource_view['description'] }}</p>
21-
<div class="m-top ckanext-datapreview">
22-
{% if not to_preview and h.resource_view_is_filterable(resource_view) %}
23-
{% snippet 'package/snippets/resource_view_filters.html', resource=resource %}
24-
{% endif %}
25-
{% if not h.resource_view_is_iframed(resource_view) %}
26-
{{ h.rendered_resource_view(resource_view, resource, package) }}
27-
{% else %}
28-
<div class="data-viewer-error js-hide">
29-
<p class="text-error">
30-
<i class="icon-info-sign"></i>
31-
{{ _('This resource view is not available at the moment.') }}
32-
<a href="#" data-toggle="collapse" data-target="#data-view-error">
33-
{{ _('Click here for more information.') }}
34-
</a>
35-
</p>
36-
<p id="data-view-error" class="collapse"></p>
37-
<p>
38-
<a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank">
39-
<i class="icon-large icon-download"></i>
40-
{{ _('Download resource') }}
41-
</a>
42-
</p>
43-
</div>
44-
{% if not to_preview %}
45-
{% set current_filters = request.str_GET.get('filters') %}
46-
{% if current_filters %}
47-
{% set src = h.url(qualified=true, controller='package',
48-
action='resource_view', id=package['name'],
49-
resource_id=resource['id'],
50-
view_id=resource_view['id'],
51-
filters=current_filters) %}
52-
{% else %}
53-
{% set src = h.url(qualified=true, controller='package',
54-
action='resource_view', id=package['name'],
55-
resource_id=resource['id'],
56-
view_id=resource_view['id']) %}
57-
{% endif %}
2+
3+
<div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
4+
5+
<a class="btn pull-right"
6+
href="{{ h.url('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}" target="_blank">
7+
{% trans %}Open in new tab{% endtrans %}
8+
</a>
9+
<a class="btn pull-right"
10+
href="#embed-{{ resource_view['id'] }}"
11+
data-module="resource-view-embed"
12+
data-module-id="{{ resource_view['id'] }}"
13+
data-module-url="{{ h.url('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
14+
<i class="icon-code"></i>
15+
{{ _("Embed") }}
16+
</a>
17+
<p class="desc">{{ resource_view['description'] }}</p>
18+
<div class="m-top ckanext-datapreview">
19+
{% if not to_preview and h.resource_view_is_filterable(resource_view) %}
20+
{% snippet 'package/snippets/resource_view_filters.html', resource=resource %}
21+
{% endif %}
22+
{% if not h.resource_view_is_iframed(resource_view) %}
23+
{{ h.rendered_resource_view(resource_view, resource, package) }}
24+
{% else %}
25+
<div class="data-viewer-error js-hide">
26+
<p class="text-error">
27+
<i class="icon-info-sign"></i>
28+
{{ _('This resource view is not available at the moment.') }}
29+
<a href="#" data-toggle="collapse" data-target="#data-view-error">
30+
{{ _('Click here for more information.') }}
31+
</a>
32+
</p>
33+
<p id="data-view-error" class="collapse"></p>
34+
<p>
35+
<a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank">
36+
<i class="icon-large icon-download"></i>
37+
{{ _('Download resource') }}
38+
</a>
39+
</p>
40+
</div>
41+
{% if not to_preview %}
42+
{% set current_filters = request.str_GET.get('filters') %}
43+
{% if current_filters %}
44+
{% set src = h.url(qualified=true, controller='package',
45+
action='resource_view', id=package['name'],
46+
resource_id=resource['id'],
47+
view_id=resource_view['id'],
48+
filters=current_filters) %}
5849
{% else %}
59-
{# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
60-
{% set src = h.url(qualified=true, controller='package', action='resource_view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
50+
{% set src = h.url(qualified=true, controller='package',
51+
action='resource_view', id=package['name'],
52+
resource_id=resource['id'],
53+
view_id=resource_view['id']) %}
6154
{% endif %}
62-
<iframe src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer" allowfullscreen>
63-
<p>{{ _('Your browser does not support iframes.') }}</p>
64-
</iframe>
55+
{% else %}
56+
{# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
57+
{% set src = h.url(qualified=true, controller='package', action='resource_view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
6558
{% endif %}
59+
<iframe src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer" allowfullscreen>
60+
<p>{{ _('Your browser does not support iframes.') }}</p>
61+
</iframe>
62+
{% endif %}
63+
</div>
64+
<div id="embed-{{ resource_view['id'] }}" class="modal resource-view-embed hide">
65+
<div class="modal-header">
66+
<button type="button" class="close" data-dismiss="modal">&times;</button>
67+
<h3>{{ _("Embed resource view") }}</h3>
6668
</div>
67-
<div id="embed-{{ resource_view['id'] }}" class="modal resource-view-embed hide">
68-
<div class="modal-header">
69-
<button type="button" class="close" data-dismiss="modal">&times;</button>
70-
<h3>{{ _("Embed resource view") }}</h3>
71-
</div>
72-
<div class="modal-body">
73-
<p class="embed-content">{{ _("You can copy and paste the embed code into a CMS or blog software that supports raw HTML") }}</p>
74-
<div class="row-fluid">
75-
<div class="span6">
76-
{{ form.input("width", label=_("Width"), value=700, classes=["control-full"]) }}
77-
</div>
78-
<div class="span6">
79-
{{ form.input("height", label=_("Height"), value=400, classes=["control-full"]) }}
80-
</div>
69+
<div class="modal-body">
70+
<p class="embed-content">{{ _("You can copy and paste the embed code into a CMS or blog software that supports raw HTML") }}</p>
71+
<div class="row-fluid">
72+
<div class="span6">
73+
{{ form.input("width", label=_("Width"), value=700, classes=["control-full"]) }}
74+
</div>
75+
<div class="span6">
76+
{{ form.input("height", label=_("Height"), value=400, classes=["control-full"]) }}
8177
</div>
82-
{{ form.textarea("code", label=_("Code"), value="", classes=["pre"], rows=3) }}
8378
</div>
79+
{{ form.textarea("code", label=_("Code"), value="", classes=["pre"], rows=3) }}
8480
</div>
8581
</div>
86-
87-
{% endif %}
82+
</div>

0 commit comments

Comments
 (0)