Merge changelog.html into home.html

This commit is contained in:
jeremystretch 2021-05-17 13:28:59 -04:00
parent cb6dbc801f
commit 8545974e47
2 changed files with 82 additions and 85 deletions

View File

@ -1,47 +0,0 @@
{% load helpers %} {% load get_status %}
{% if changelog and perms.extras.view_objectchange %}
<table class="table align-middle table-hover">
<thead>
<tr>
<th scope="col">User</th>
<th scope="col">Action</th>
<th scope="col">Type</th>
<th scope="col">Object</th>
<th scope="col">Time</th>
<th scope="col" align="right"></th>
</tr>
</thead>
<tbody>
{% for change in changelog %}
<tr class="{% get_status change.get_action_display %}">
<th scope="row">{{ change.user|default:change.user_name }}</th>
<td>{{ change.get_action_display|bettertitle }}</td>
<td>{{ change.changed_object_type.name|bettertitle }}</td>
<td>
{% if change.changed_object.get_absolute_url %}
<a class="text-body" href="{{ change.changed_object.get_absolute_url }}">{{ change.changed_object }}</a>
{% else %} {{ change.changed_object|default:change.object_repr }} {% endif %}
</td>
<td>{{ change.time|date:'SHORT_DATETIME_FORMAT' }}</td>
<td>
<a role="button" class="text-body" href="{{ change.get_absolute_url }}">
<i class="mdi mdi-dots-horizontal" data-bs-toggle="tooltip" data-bs-placement="left" title="View Change Details"></i>
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% elif perms.extras.view_objectchange %}
<div class="alert alert-secondary mt-4" role="alert">
No change history found.
</div>
{% else %}
<div class="alert alert-danger mt-4" role="alert">
<strong>{{ request.user|truncatechars:"30" }}</strong> does not have
permission to view changes.
</div>
{% endif %}

View File

@ -1,11 +1,14 @@
{% extends 'layout.html' %}
{% load get_status %}
{% load helpers %}
{% block title_container %}{% endblock %}
{% block title %}Home{% endblock %}
{% block content %}
<div class="stats-container">
{# General stats #}
<div class="stats-container">
<div class="row masonry">
{% for section in stats %}
<div class="col col-sm-12 col-md-4 my-2 masonry-item">
@ -41,16 +44,57 @@
</div>
{% endfor %}
</div>
</div>
</div>
<div class="row my-4 flex-grow-1 changelog-container">
{# Changelog #}
<div class="row my-4 flex-grow-1 changelog-container">
<div class="col">
<div class="card">
<h4 class="card-header">Changelog</h4>
<div class="card-body">
{% include 'changelog.html' %}
{% if changelog and perms.extras.view_objectchange %}
{# TODO: Replace this with a django-tables2 Table #}
<table class="table align-middle table-hover">
<thead>
<tr>
<th scope="col">User</th>
<th scope="col">Action</th>
<th scope="col">Type</th>
<th scope="col">Object</th>
<th scope="col">Time</th>
<th scope="col" align="right"></th>
</tr>
</thead>
<tbody>
{% for change in changelog %}
<tr class="{% get_status change.get_action_display %}">
<th scope="row">{{ change.user|default:change.user_name }}</th>
<td>{{ change.get_action_display|bettertitle }}</td>
<td>{{ change.changed_object_type.name|bettertitle }}</td>
<td>
{% if change.changed_object.get_absolute_url %}
<a class="text-body" href="{{ change.changed_object.get_absolute_url }}">{{ change.changed_object }}</a>
{% else %} {{ change.changed_object|default:change.object_repr }} {% endif %}
</td>
<td>{{ change.time|date:'SHORT_DATETIME_FORMAT' }}</td>
<td>
<a role="button" class="text-body" href="{{ change.get_absolute_url }}">
<i class="mdi mdi-dots-horizontal" data-bs-toggle="tooltip" data-bs-placement="left" title="View Change Details"></i>
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% elif perms.extras.view_objectchange %}
<div class="alert alert-secondary mt-4" role="alert">
No change history found.
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>
{% endblock %}