Turned tiled charts into include

This commit is contained in:
Krateng 2020-09-02 14:03:03 +02:00
parent 7bc70ed0bd
commit 26f6a1af58
5 changed files with 24 additions and 30 deletions

View File

@ -35,8 +35,7 @@
</table>
{% if settings('CHARTS_DISPLAY_TILES') %}
{% import 'partials/charts_artists_tiles.jinja' as charts_artists_tiles %}
{{ charts_artists_tiles.charts_artists_tiles(limitkeys,amountkeys,compare=true) }}
{% include 'partials/charts_artists_tiles.jinja' %}
<br/><br/>
{% endif %}

View File

@ -37,8 +37,7 @@
</table>
{% if settings('CHARTS_DISPLAY_TILES') %}
{% import 'partials/charts_tracks_tiles.jinja' as charts_tracks_tiles %}
{{ charts_tracks_tiles.charts_tracks_tiles(filterkeys,limitkeys,amountkeys,compare=true) }}
{% include 'partials/charts_tracks_tiles.jinja' %}
<br/><br/>
{% endif %}

View File

@ -1,13 +1,12 @@
{% import 'snippets/links.jinja' as links %}
{% macro charts_artists_tiles(limitkeys,amountkeys,charts=None,compare=False) %}
{% if charts is none %}
{% if charts is undefined %}
{% set charts = dbp.get_charts_artists(limitkeys) %}
{% endif %}
{% set charts = charts | fixlength(14) %}
{% set charts_cycler = cycler(*charts) %}
{% set charts_14 = charts | fixlength(14) %}
{% set charts_cycler = cycler(*charts_14) %}
<table class="tiles_top"><tr>
@ -39,5 +38,3 @@
</td>
{% endfor %}
</tr></table>
{%- endmacro %}

View File

@ -1,13 +1,12 @@
{% import 'snippets/links.jinja' as links %}
{% macro charts_tracks_tiles(filterkeys,limitkeys,amountkeys,charts=None,compare=False) %}
{% if charts is none %}
{% if charts is undefined %}
{% set charts = dbp.get_charts_tracks(filterkeys,limitkeys) %}
{% endif %}
{% set charts = charts | fixlength(14) %}
{% set charts_cycler = cycler(*charts) %}
{% set charts_14 = charts | fixlength(14) %}
{% set charts_cycler = cycler(*charts_14) %}
<table class="tiles_top"><tr>
@ -39,5 +38,3 @@
</td>
{% endfor %}
</tr></table>
{%- endmacro %}

View File

@ -18,20 +18,21 @@
<!-- ARTIST CHARTS -->
<h1><a class="stat_link_topartists" href="/charts_artists?in=alltime">Top Artists</a></h1>
{% for range in xcurrent -%}
<span onclick="showRangeManual('topartists','{{ range.identifier }}')" class="stat_selector_topartists selector_topartists_{{ range.identifier }}">
{{ range.localisation }}
{% for r in xcurrent -%}
<span onclick="showRangeManual('topartists','{{ r.identifier }}')" class="stat_selector_topartists selector_topartists_{{ r.identifier }}">
{{ r.localisation }}
</span>
{{ "|" if not loop.last }}
{%- endfor %}
<br/><br/>
{% import 'partials/charts_artists_tiles.jinja' as cha %}
{% for range in xcurrent %}
<span class="stat_module_topartists topartists_{{ range.identifier }}" style="display:none;">
{{ cha.charts_artists_tiles({"timerange":range.range}) }}
{% for r in xcurrent %}
<span class="stat_module_topartists topartists_{{ r.identifier }}" style="display:none;">
{% with limitkeys = {"timerange":r.range} %}
{% include 'partials/charts_artists_tiles.jinja' %}
{% endwith %}
</span>
{% endfor %}
@ -41,20 +42,21 @@
<!-- TRACK CHARTS -->
<h1><a class="stat_link_toptracks" href="/charts_tracks?in=alltime">Top Tracks</a></h1>
{% for range in xcurrent -%}
<span onclick="showRangeManual('toptracks','{{ range.identifier }}')" class="stat_selector_toptracks selector_toptracks_{{ range.identifier }}">
{{ range.localisation }}
{% for r in xcurrent -%}
<span onclick="showRangeManual('toptracks','{{ r.identifier }}')" class="stat_selector_toptracks selector_toptracks_{{ r.identifier }}">
{{ r.localisation }}
</span>
{{ "|" if not loop.last }}
{%- endfor %}
<br/><br/>
{% import 'partials/charts_tracks_tiles.jinja' as cht %}
{% for range in xcurrent %}
<span class="stat_module_toptracks toptracks_{{ range.identifier }}" style="display:none;">
{{ cht.charts_tracks_tiles({},{"timerange":range.range}) }}
{% for r in xcurrent %}
<span class="stat_module_toptracks toptracks_{{ r.identifier }}" style="display:none;">
{% with limitkeys = {"timerange":r.range} %}
{% include 'partials/charts_tracks_tiles.jinja' %}
{% endwith %}
</span>
{% endfor %}