Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Improve exercise history overview

Roland Geider116a9793689d
diff --git a/wger/exercises/templates/history/overview.html b/wger/exercises/templates/history/overview.html
index a28f7b1eb..2517bf74a 100644
--- a/wger/exercises/templates/history/overview.html
+++ b/wger/exercises/templates/history/overview.html
@@ -2,24 +2,11 @@
{% load i18n %}
{% load static %}
{% load wger_extras %}
-{% load cache %}
-{% load thumbnail %}
-
-<!--
- Title
--->
-{% block title %}{% translate "Exercise admin history" %}{% endblock %}
-
-{% block header %}
-
-{% endblock %}
+{% block title %}{% translate "Exercise admin history" %}{% endblock %}
-<!--
- Main Content
--->
{% block content %}
<div class="row mb-3">
@@ -49,7 +36,9 @@
</div>
</div>
- <form method="get" class="row g-2 align-items-end mb-3">
+ {# #}
+ {# Filter form #}
+ <form method="get" class="row g-2 align-items-end mb-4">
{% for field in filter.form %}
<div class="col-md-2">
<label for="{{ field.id_for_label }}" class="form-label mb-0">{{ field.label }}</label>
@@ -62,148 +51,170 @@
</div>
</form>
- <table class="table">
- <thead class="thead-light">
- <tr>
- <th scope="col" style="width: 5%">{% translate 'Action' %}</th>
- <th scope="col" style="width: 10%">{% translate 'User' %}</th>
- <th scope="col" style="width: 8%">{% translate 'Type' %}</th>
- <th scope="col" style="width: 32%">{% translate 'Object' %}</th>
- <th scope="col" style="width: 15%">{% translate 'Time' %}</th>
- <th scope="col" style="width: 15%">{% translate 'Changes' %}</th>
- <th scope="col" style="width: 15%">{% translate 'Revert' %}</th>
- </tr>
- </thead>
- <tbody>
- {% for event in context %}
- <tr {% if event.is_new_contributor %}class="table-warning"{% endif %}>
- <td>
- {% if event.stream.verb == verbs.CREATED.value %}
- <span class="{% fa_class 'circle-plus' %}"></span>
- {% elif event.stream.verb == verbs.UPDATED.value %}
- <span class="{% fa_class 'pen' %}"></span>
- {% else %}
- {{ event.verb }}
- {% endif %}
- </td>
- <td>
- {{ event.stream.actor }}
- {% if event.is_new_contributor %}
- <span class="badge bg-warning text-dark" title="{% translate 'Account younger than 60 days' %}">
- {% translate 'new' %}
- </span>
- {% endif %}
- </td>
- <td>
- {% if event.model_key %}
- <span class="badge text-bg-light">{{ event.model_key }}</span>
- {% endif %}
- </td>
- <td>
- {% if event.object_missing %}
- <em class="text-muted">{% translate "Object was deleted" %}</em>
- {% elif event.stream.action_object.get_absolute_url %}
- <a href="{{ event.stream.action_object.get_absolute_url }}">{{ event.stream.action_object }}</a>
- {% else %}
- {{ event.stream.action_object }}
- {% endif %}
+ {# #}
+ {# Feed #}
+ {% if context %}
+ {% regroup context by stream.timestamp.date as days %}
+ {% for day in days %}
+ <h6 class="text-uppercase text-muted small mt-4 mb-2">
+ {{ day.grouper|date:"l, j F Y" }}
+ </h6>
+ <ul class="list-group list-group-flush mb-3">
+ {% for event in day.list %}
+ <li class="list-group-item px-2 {% if event.is_new_contributor %}border-start border-warning border-4{% endif %}">
+ <div class="d-flex align-items-start gap-3">
- {% if event.stream.data.info %}
- <span class="badge badge-secondary">{{ event.stream.data.info }}</span>
- {% endif %}
- </td>
- <td>{{ event.stream.timesince }}</td>
- {% if event.stream.verb == verbs.CREATED.value %}
- <td>
- {% if not event.object_missing %}
- <a href="{{ event.stream.action_object.get_absolute_url }}" id="view-changes"
- class="btn btn-success btn-sm btn-block">
- {% translate "View Object" %}
- </a>
- {% endif %}
- </td>
- <td>
+ {# Action icon #}
+ <div class="pt-1">
+ {% if event.stream.verb == verbs.CREATED.value %}
+ <span class="text-success {% fa_class 'circle-plus' %}"></span>
+ {% elif event.stream.verb == verbs.UPDATED.value %}
+ <span class="text-primary {% fa_class 'pen' %}"></span>
+ {% else %}
+ <span class="text-muted {% fa_class 'circle-question' %}"></span>
+ {% endif %}
+ </div>
- </td>
- {% elif event.stream.verb == verbs.UPDATED.value %}
- <td>
- <a class="btn btn-success btn-sm btn-block" data-bs-toggle="collapse"
- href="#collapse-{{ event.stream.id }}"
- role="button">
- {% translate "View changes" %}
- </a>
- </td>
- <td>
- <a href="#"
- id="revert-changes"
- data-bs-toggle="modal"
- data-bs-target="#revert-modal-{{ event.stream.id }}"
- class="btn btn-danger btn-sm btn-block"
- {% if not event.history_id %}disabled{% endif %}
- >
- {% translate "Revert changes" %}
- </a>
- {% if event.history_id %}
- <div class="modal fade" id="revert-modal-{{ event.stream.id }}">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h4 class="modal-title">{% translate 'Are you sure?' %}</h4>
- </div>
- <div class="modal-body">
- <form method="post"
- action="{% url 'exercise:history:revert' event.history_id event.content_type_id %}">
- {% csrf_token %}
- <button type="submit"
- class="btn btn-danger btn-sm btn-block">
- {% translate "Yes" %}
- </button>
- </form>
- </div>
- <div class="modal-footer">
- <button type="button"
- class="btn btn-light"
- data-bs-dismiss="modal">
- {% translate "No" %}
- </button>
- </div>
- </div>
+ {# Main column #}
+ <div class="flex-grow-1 min-w-0">
+ <div class="d-flex flex-wrap align-items-center gap-2">
+ <strong>{{ event.stream.actor }}</strong>
+ {% if event.is_new_contributor %}
+ <span class="badge text-bg-warning"
+ title="{% translate 'Account younger than 60 days' %}">
+ {% translate 'new' %}
+ </span>
+ {% endif %}
+
+ {% if event.stream.verb == verbs.CREATED.value %}
+ <span class="text-muted">{% translate "created" %}</span>
+ {% elif event.stream.verb == verbs.UPDATED.value %}
+ <span class="text-muted">{% translate "edited" %}</span>
+ {% else %}
+ <span class="text-muted">{{ event.verb }}</span>
+ {% endif %}
+
+ {% if event.model_key %}
+ <span class="badge {{ event.badge_class }}">{{ event.model_key }}</span>
+ {% endif %}
+
+ {% if event.object_missing %}
+ <em class="text-muted">{% translate "Object was deleted" %}</em>
+ {% elif event.stream.action_object.get_absolute_url %}
+ <a href="{{ event.stream.action_object.get_absolute_url }}"
+ class="fw-semibold text-decoration-none">
+ {{ event.stream.action_object }}
+ </a>
+ {% else %}
+ {{ event.stream.action_object }}
+ {% endif %}
+
+ {% if event.stream.data.info %}
+ <span class="badge text-bg-light">{{ event.stream.data.info }}</span>
+ {% endif %}
</div>
+
+ {# Diff: one compact line per changed field #}
+ {% if event.delta and event.delta.changes %}
+ <div class="small font-monospace mt-1">
+ {% for change in event.delta.changes %}
+ <div class="text-truncate">
+ <span class="text-muted">{{ change.field }}:</span>
+ <span class="text-decoration-line-through text-danger">{{ change.old|default_if_none:""|truncatechars:60 }}</span>
+ →
+ <span class="text-success">{{ change.new|default_if_none:""|truncatechars:60 }}</span>
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
</div>
- {% endif %}
- </td>
- {% endif %}
- </tr>
- <tr class="collapse" id="collapse-{{ event.stream.id }}">
- <td colspan="7">
- <table class="table">
- <thead>
- <tr>
- <td>Field</td>
- <td>Old</td>
- <td>New</td>
- </tr>
- </thead>
- <tbody>
- {% if event.delta %}
- {% for change in event.delta.changes %}
- <tr>
- <td>{{ change.field }}</td>
- <td>{{ change.old }}</td>
- <td>{{ change.new }}</td>
- </tr>
- {% endfor %}
- {% endif %}
- </tbody>
- </table>
- </td>
+ {# Right column: timestamp + revert dropdown #}
+ <div class="d-flex flex-column align-items-end text-nowrap">
+ <small class="text-muted"
+ title="{{ event.stream.timestamp|date:'Y-m-d H:i:s' }}">
+ {{ event.stream.timesince }}
+ </small>
- </tr>
+ {% if event.history_id %}
+ <div class="dropdown mt-1">
+ <button type="button"
+ class="btn btn-sm btn-link text-muted p-0"
+ data-bs-toggle="dropdown"
+ aria-expanded="false">
+ <span class="{% fa_class 'ellipsis-vertical' %}"></span>
+ </button>
+ <ul class="dropdown-menu dropdown-menu-end">
+ <li>
+ <button type="button"
+ class="dropdown-item text-danger"
+ data-bs-toggle="modal"
+ data-bs-target="#revert-modal-{{ event.stream.id }}">
+ {% translate "Revert change" %}
+ </button>
+ </li>
+ {% if not event.object_missing and event.stream.action_object.get_absolute_url %}
+ <li>
+ <a class="dropdown-item"
+ href="{{ event.stream.action_object.get_absolute_url }}">
+ {% translate "Open object" %}
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
+
+ <div class="modal fade" id="revert-modal-{{ event.stream.id }}" tabindex="-1">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">{% translate 'Revert this change?' %}</h4>
+ <button type="button"
+ class="btn-close"
+ data-bs-dismiss="modal"
+ aria-label="{% translate 'Close' %}"></button>
+ </div>
+ <div class="modal-body">
+ <p class="mb-0 text-muted small">
+ {% translate "The object will be restored to its previous state." %}
+ </p>
+ </div>
+ <div class="modal-footer">
+ <button type="button"
+ class="btn btn-light"
+ data-bs-dismiss="modal">
+ {% translate "Cancel" %}
+ </button>
+ <form method="post"
+ action="{% url 'exercise:history:revert' event.history_id event.content_type_id %}"
+ class="d-inline">
+ {% csrf_token %}
+ <button type="submit" class="btn btn-danger">
+ {% translate "Revert" %}
+ </button>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ </div>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
{% endfor %}
- </tbody>
- </table>
+ {% else %}
+ <div class="text-center text-muted py-5">
+ <p>{% translate "No changes match the filters." %}</p>
+ <a href="{% url 'exercise:history:overview' %}" class="btn btn-link btn-sm">
+ {% translate "Reset filters" %}
+ </a>
+ </div>
+ {% endif %}
+ {# #}
+ {# Pagination #}
{% if is_paginated %}
<nav aria-label="{% translate 'History pagination' %}">
<ul class="pagination justify-content-center">
@@ -247,18 +258,5 @@
</ul>
</nav>
{% endif %}
-{% endblock %}
-
-
-<!--
- Sidebar
--->
-{% block sidebar %}
-
-{% endblock %}
-
-
-
-{% block options %}
{% endblock %}
diff --git a/wger/exercises/views/history.py b/wger/exercises/views/history.py
index 1580b1fe3..ca6c77906 100644
--- a/wger/exercises/views/history.py
+++ b/wger/exercises/views/history.py
@@ -63,6 +63,16 @@ TRACKED_MODELS = (
('alias', 'exercises', 'alias'),
)
+# Bootstrap badge variant per tracked model
+BADGE_CLASS_BY_MODEL = {
+ 'exercise': 'text-bg-success',
+ 'translation': 'text-bg-primary',
+ 'image': 'text-bg-info',
+ 'video': 'text-bg-danger',
+ 'comment': 'text-bg-warning',
+ 'alias': 'text-bg-secondary',
+}
+
NEW_CONTRIBUTOR_DAYS = 60
"""
Edits made by accounts younger than this are visually flagged so admins can
@@ -208,10 +218,12 @@ def control(request: HttpRequest) -> HttpResponse:
actor and actor.date_joined and actor.date_joined >= new_contributor_cutoff
)
+ model_key = ct_id_to_key.get(entry.action_object_content_type_id)
data = {
'verb': entry.verb,
'stream': entry,
- 'model_key': ct_id_to_key.get(entry.action_object_content_type_id),
+ 'model_key': model_key,
+ 'badge_class': BADGE_CLASS_BY_MODEL.get(model_key, 'text-bg-light'),
'is_new_contributor': is_new_contributor,
'object_missing': False,
}