TheLovinator/twitch-drop-notifier
1
Fork 0
Code Issues Actions Packages Releases Activity

Refactor drop display structure: replace list with table for benefits

Browse Source
This commit is contained in:
Joakim Hellsén
2025-05-01 17:40:55 +02:00
parent 14f2cdc9f9
commit ebed72f5fa
1 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
core/templates/index.html
View File

@ -11,7 +11,6 @@
</h2> </h2>
{% if grouped_drops %} {% if grouped_drops %}
{% for game, drops_list in grouped_drops.items %} {% for game, drops_list in grouped_drops.items %}
{# Retain card structure for layout, replace table with list #}
<div class="card mb-4 shadow-sm"> <div class="card mb-4 shadow-sm">
<div class="row g-0"> <div class="row g-0">
<!-- Game Box Art --> <!-- Game Box Art -->
@ -20,7 +19,7 @@
<img src="{{ game.box_art_url }}" alt="{{ game.display_name|default:'Game name unknown' }} box art" <img src="{{ game.box_art_url }}" alt="{{ game.display_name|default:'Game name unknown' }} box art"
class="img-fluid rounded-start" height="283" width="212" loading="lazy" /> class="img-fluid rounded-start" height="283" width="212" loading="lazy" />
{% else %} {% else %}
<img src="{% static 'images/404_boxart.jpg' %}" <img src="https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg"
alt="{% if game %}{{ game.display_name }}{% else %}Unknown Game{% endif %} box art" alt="{% if game %}{{ game.display_name }}{% else %}Unknown Game{% endif %} box art"
class="img-fluid rounded-start" height="283" width="212" loading="lazy" /> class="img-fluid rounded-start" height="283" width="212" loading="lazy" />
{% endif %} {% endif %}
@ -42,53 +41,65 @@
</h2> </h2>
{% if drops_list %} {% if drops_list %}
<!-- NEW Drop List Structure --> <div class="mt-4">
<ul class="list-unstyled mt-3">
{% for drop in drops_list %} {% for drop in drops_list %}
<li class="mb-3"> {# Add margin between list items #} {% with campaign=drop.campaign %}
<strong>{{ drop.name|default:'Unknown Drop' }}</strong> <h4 class="h6">{{ campaign.name|default:"Unknown Campaign" }}</h4>
(Requires {{ drop.required_minutes_watched|minutes_to_hours }}) <a href="{{ campaign.details_url|default:'#' }}" class="text-decoration-none">Details</a>
<br> {% if campaign.details_url != campaign.account_link_url and campaign.account_link_url %}
<em>Campaign: | <a href="{{ campaign.account_link_url }}" class="text-decoration-none">Link Account</a>
<a href="{{ drop.campaign.details_url|default:'#' }}" class="text-decoration-none" {% endif %}
title="{{ drop.campaign.name|default:'Unknown Campaign' }}"> <p class="mb-2 text-muted">
{{ drop.campaign.name|truncatechars:40|default:'N/A' }} {# Adjusted truncate #} Ends in:
</a> <abbr
{% if drop.campaign.details_url != drop.campaign.account_link_url and drop.campaign.account_link_url %} title="{{ campaign.start_at|date:'l d F H:i' }} - {{ campaign.end_at|date:'l d F H:i' }}">
| <a href="{{ drop.campaign.account_link_url }}" class="text-decoration-none" {{ campaign.end_at|timeuntil }}
title="Link Account for {{ drop.campaign.name }}">Link</a>
{% endif %}
</em>
<br>
Ends in: <abbr
title="{{ drop.campaign.start_at|date:'l d F H:i' }} - {{ drop.campaign.end_at|date:'l d F H:i' }}">
{{ drop.campaign.end_at|timeuntil }}
</abbr> </abbr>
</p>
{% if drop.benefits.exists %} <div class="table-responsive mb-4">
<br> <table class="table table-striped table-hover align-middle">
Benefits: <thead>
<ul class="list-inline"> <tr>
{% for benefit in drop.benefits.all %} <th>Benefit Image</th>
<li class="list-inline-item"> <th>Benefit Name</th>
<abbr title="{{ benefit.name|default:'Unknown Benefit' }}"> <th>Required Minutes Watched</th>
{% if benefit.image_asset_url %} </tr>
<img src="{{ benefit.image_asset_url|default:'https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg' }}" </thead>
alt="{{ benefit.name|default:'Unknown Benefit' }}" <tbody>
class="img-fluid rounded me-1 align-middle" {# Added align-middle #} {% if drop.benefits.exists %}
height="20" width="20" loading="lazy" /> {% for benefit in drop.benefits.all %}
{% endif %} <tr>
<small>{{ benefit.name|truncatechars:25|default:'Unknown Benefit' }}</small> <td>
{# Wrap text in small #} <img src="{{ benefit.image_asset_url|default:'https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg' }}"
</abbr> alt="{{ benefit.name|default:'Unknown Benefit' }}"
</li> class="img-fluid rounded" height="50" width="50" loading="lazy" />
{% endfor %} </td>
</ul> <td>
{% endif %} <abbr title="{{ drop.name|default:'Unknown Drop' }}">
{# Removed hr, using li margin instead #} {{ benefit.name|default:'Unknown Benefit' }}
</li> </abbr>
</td>
<td>{{ drop.required_minutes_watched|minutes_to_hours }}</td>
</tr>
{% endfor %}
{% else %}
<tr>
<td>
<img src="https://static-cdn.jtvnw.net/ttv-static/404_boxart.jpg"
alt="{{ drop.name|default:'Unknown Drop' }}"
class="img-fluid rounded" height="50" width="50" loading="lazy" />
</td>
<td>{{ drop.name|default:'Unknown Drop' }}</td>
<td>N/A</td>
</tr>
{% endif %}
</tbody>
</table>
</div>
{% endwith %}
{% endfor %} {% endfor %}
</ul> </div>
{% else %} {% else %}
<p class="mt-3 text-muted">No active drops found for this game currently.</p> <p class="mt-3 text-muted">No active drops found for this game currently.</p>
{% endif %} {% endif %}