From 31ced8869a1f11e2a346ee01cbbddb6eafc3382a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Thu, 23 Jul 2026 21:56:06 +0200 Subject: [PATCH] Unify template layout --- templates/base.html | 4 + templates/chzzk/campaign_detail.html | 2 +- templates/core/dashboard.html | 20 +- templates/core/debug.html | 45 +++- templates/kick/campaign_detail.html | 37 ++-- templates/kick/category_detail.html | 1 - templates/kick/dashboard.html | 196 ++++++------------ templates/kick/organization_detail.html | 3 +- templates/twitch/campaign_detail.html | 79 +++---- templates/twitch/channel_detail.html | 13 +- templates/twitch/dashboard.html | 35 ++-- templates/twitch/game_detail.html | 19 +- templates/twitch/games_grid.html | 4 +- .../twitch/includes/reward_campaign_card.html | 111 +++++----- templates/twitch/organization_detail.html | 1 - templates/twitch/reward_campaign_detail.html | 12 +- twitch/models.py | 21 +- 17 files changed, 291 insertions(+), 312 deletions(-) diff --git a/templates/base.html b/templates/base.html index 0f1bbaa..1a47bd9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -199,6 +199,10 @@ margin-right: 4px; border-radius: 2px; } + + dd { + margin-left: 0; + } diff --git a/templates/chzzk/campaign_detail.html b/templates/chzzk/campaign_detail.html index 7a5d8e7..4d1aa4b 100644 --- a/templates/chzzk/campaign_detail.html +++ b/templates/chzzk/campaign_detail.html @@ -38,7 +38,7 @@

{{ campaign.description|linebreaksbr }}

-
+
Published
{% if campaign.scraped_at %} diff --git a/templates/core/dashboard.html b/templates/core/dashboard.html index 1e62548..2a7185d 100644 --- a/templates/core/dashboard.html +++ b/templates/core/dashboard.html @@ -168,15 +168,11 @@
{% if campaign_data.allowed_channels %} - - {% if campaign_data.allowed_channels %}{{ campaign_data.allowed_channels|length }} channel{{ campaign_data.allowed_channels|length|pluralize }}{% endif %} + + {{ campaign_data.allowed_channels|length }} channel{{ campaign_data.allowed_channels|length|pluralize }} {% else %} - Category-wide + Category-wide {% endif %}
@@ -489,15 +485,11 @@
{% if campaign_data.channels %} - - {% if campaign_data.channels %}{{ campaign_data.channels|length }} channel{{ campaign_data.channels|length|pluralize }}{% endif %} + + {{ campaign_data.channels|length }} channel{{ campaign_data.channels|length|pluralize }} {% else %} - Category-wide + Category-wide {% endif %}
diff --git a/templates/core/debug.html b/templates/core/debug.html index 924c085..2d2e080 100644 --- a/templates/core/debug.html +++ b/templates/core/debug.html @@ -119,7 +119,20 @@
  • {{ c.name }} (Game: {{ c.game.display_name }}) - - Start: {{ c.start_at|default:'(none)' }} / End: {{ c.end_at|default:'(none)' }} + - + Start: + {% if c.start_at %} + + {% else %} + (none) + {% endif %} + / + End: + {% if c.end_at %} + + {% else %} + (none) + {% endif %}
  • {% endfor %} @@ -135,7 +148,20 @@
  • {{ c.name }} (Game: {{ c.category.name }}) - - Start: {{ c.starts_at|default:'(none)' }} / End: {{ c.ends_at|default:'(none)' }} + - + Start: + {% if c.starts_at %} + + {% else %} + (none) + {% endif %} + / + End: + {% if c.ends_at %} + + {% else %} + (none) + {% endif %}
  • {% endfor %} @@ -151,7 +177,20 @@
  • {{ c.name }} (Game: {{ c.game.display_name }}) - - Start: {{ c.starts_at|default:'(none)' }} / End: {{ c.ends_at|default:'(none)' }} + - + Start: + {% if c.starts_at %} + + {% else %} + (none) + {% endif %} + / + End: + {% if c.ends_at %} + + {% else %} + (none) + {% endif %}
  • {% endfor %} diff --git a/templates/kick/campaign_detail.html b/templates/kick/campaign_detail.html index ca43ab0..ab9dfe0 100644 --- a/templates/kick/campaign_detail.html +++ b/templates/kick/campaign_detail.html @@ -51,7 +51,6 @@ Campaigns > {{ campaign.name }} -
    {% if campaign.category %}
    Category
    @@ -103,9 +102,7 @@ {% endif %} {% if campaign.duration %}
    Duration
    -
    - {{ campaign.duration }} -
    +
    {{ campaign.duration }}
    {% endif %}
    Added
    @@ -119,6 +116,22 @@ title="{{ campaign.updated_at|date:'DATETIME_FORMAT' }}">{{ campaign.updated_at|date:"M d, Y" }} ({{ campaign.updated_at|timesince }} ago)
    + {% if campaign.created_at %} +
    Created
    +
    + + ({{ campaign.created_at|timesince }} ago) +
    + {% endif %} + {% if campaign.api_updated_at %} +
    API Updated
    +
    + + ({{ campaign.api_updated_at|timesince }} ago) +
    + {% endif %}
    {% if campaign.channels.all %} @@ -133,22 +146,6 @@ {% if campaign.channels.count > 5 %}and {{ campaign.channels.count|add:"-5" }} more{% endif %} {% endif %}
    - {% if campaign.created_at %} -

    - -

    - {% endif %} - {% if campaign.api_updated_at %} -

    - -

    - {% endif %}