Reapply current djlint

This commit is contained in:
Adam Goldsmith 2023-04-14 01:07:35 -04:00
parent 74a5289dd8
commit 52fad7ccb0
5 changed files with 18 additions and 15 deletions

View File

@ -1,15 +1,12 @@
{% extends "base.dj.html" %}
{% block title %}{{ selected_report }} | Door Controls | CMS{% endblock %}
{% block content %}
<ul class="nav nav-tabs">
{% for report_name, report_url in report_types %}
<li class="nav-item">
<a class="nav-link{% if report_name == selected_report %} active{% endif %}"
href="{{ report_url }}?{{ query_params }}">
{{ report_name }}
</a>
href="{{ report_url }}?{{ query_params }}">{{ report_name }}</a>
</li>
{% endfor %}
</ul>
@ -70,13 +67,12 @@
</tbody>
</table>
<nav aria-label="Page navigation">
<div class="text-center mb-2">
Showing {{ page_obj.object_list|length }} of {{ paginator.count }} results.
</div>
<div class="text-center mb-2">Showing {{ page_obj.object_list|length }} of {{ paginator.count }} results.</div>
<ul class="pagination justify-content-center">
{% if page_obj.has_previous %}
<li class="page-item">
<a class="page-link" href="?{{ query_params }}&page={{ page_obj.previous_page_number }}">Previous</a>
<a class="page-link"
href="?{{ query_params }}&page={{ page_obj.previous_page_number }}">Previous</a>
</li>
{% endif %}
{% for page_num in paginator_range %}
@ -86,7 +82,8 @@
{% endfor %}
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?{{ query_params }}&page={{ page_obj.next_page_number }}">Next</a>
<a class="page-link"
href="?{{ query_params }}&page={{ page_obj.next_page_number }}">Next</a>
</li>
{% endif %}
</ul>

View File

@ -16,7 +16,11 @@
<tr>
<td>{{ department.name }}</td>
<td>{{ department.shop_lead_flag.members.all|join:", " }}</td>
<td>{% if department.list_address is not none %}<a href="mailto:{{ department.list_address }}">{{ department.list_address }}</a>{% endif %}</td>
<td>
{% if department.list_address is not none %}
<a href="mailto:{{ department.list_address }}">{{ department.list_address }}</a>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>

View File

@ -25,8 +25,8 @@
{% for certification in certifications %}
{% with current=certification.certification_version.is_current %}
{% if current or show_outdated %}
<tr {% if not current %} class="table-warning"{% endif %}>
<td {% if not current %} class="text-decoration-line-through"{% endif %}>
<tr {% if not current %}class="table-warning"{% endif %}>
<td {% if not current %}class="text-decoration-line-through"{% endif %}>
{{ certification.certification_version.definition.name }}
</td>
<td>

View File

@ -127,7 +127,8 @@
{% endfor %}
{% endblock %}
{% block footer %}
<script type="text/javascript" src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script>
<script type="text/javascript"
src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script>
<script>
// reset form when dropdown menu is closed
document.addEventListener('hide.bs.dropdown', (e) => {

View File

@ -1,5 +1,6 @@
{% load static %}
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -51,7 +52,7 @@
{% for message in messages %}
{# TODO: should use tags correctly for bootstrap alerts #}
<div role="alert"
class="alert alert-info alert-dismissible fade show {% if message.tags %} {{ message.tags }}{% endif %}">
class="alert alert-info alert-dismissible fade show {% if message.tags %}{{ message.tags }}{% endif %}">
{{ message }}
<button type="button"
class="btn-close"