Commit 94abed92 authored by Marko Kuder's avatar Marko Kuder
Browse files

downloadall fixes

- medium column for button should be of width 5
- moved non_download_formats list to correct position
- removed redundant xxx output
- removed redundant parameters in downloadall macro
- only show downloadall button in resources, not additional links
parent b827804a
......@@ -120,7 +120,7 @@
<div class="small-12 medium-8 columns">
<h2>Podatkovni viri ({{ h.individual_resources(not can_update)|length }})</h2>
</div>
{{ download_all(h.individual_resources(not can_update), publisher_name) }}
{{ download_all() }}
</div>
{{ resource_table(h.individual_resources(not can_update), publisher_name) }}
{% endif %}
......@@ -129,7 +129,7 @@
<div class="small-12 medium-8 columns">
<h2>Podatkovni viri ({{ h.timeseries_resources(not can_update)|length }} v periodični vrsti)</h2>
</div>
{{ download_all(items, publisher_name) }}
{{ download_all() }}
</div>
{% for year, items in h.groupby(h.timeseries_resources(not can_update)|reverse, h.extract_year) %}
<div class="year">
......@@ -150,7 +150,6 @@
<div class="small-12 medium-8 columns">
<h2>Dodatne povezave ({{h.additional_resources(not can_update)|length + h.gemini_resources()|length + h.csv_resources()|length}})</h2>
</div>
{{ download_all(h.additional_resources(not can_update) + h.gemini_resources() + h.csv_resources(), publisher_name) }}
</div>
{{resource_table(h.additional_resources(not can_update) + h.gemini_resources() + h.csv_resources(), publisher_name)}}
{% endif %}
......@@ -257,13 +256,10 @@
{% endmacro %}
{% macro download_all(resources, publisher_name) %}
{% set non_download_formats = ('HTML', 'API', 'WMS', 'WCS', 'SPARQL') %}
<div class="small-12 medium-5 columns text-right">
{% macro download_all() %}
<div class="small-12 medium-4 columns text-right">
<div class="mr-15">
{% if h.is_plugin_enabled('downloadall') %}
xxx:{{ xxx }}
{% set zip_res = h.downloadall__pop_zip_resource(c.pkg_dict) %}
{% if zip_res %}
<a class="button w-230 resource-url-analytics resource-type-{{ zip_res.resource_type }}" href="{{ zip_res.url }}">
......@@ -278,6 +274,7 @@
{% endmacro %}
{% macro resource_table(resources, publisher_name) %}
{% set non_download_formats = ('HTML', 'API', 'WMS', 'WCS', 'SPARQL') %}
<div class="row">
{% for res in resources %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment