Update templates for #12128

This commit is contained in:
Jeremy Stretch 2024-01-17 16:39:48 -05:00
parent 644dbb761a
commit 56002b1984
3 changed files with 20 additions and 55 deletions

View File

@ -1,19 +1,9 @@
{% extends 'base/layout.html' %} {% extends 'generic/_base.html' %}
{% load buttons %}
{% load helpers %}
{% load i18n %} {% load i18n %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block title %}{% trans "Background Tasks" %}{% endblock %} {% block title %}{% trans "Background Tasks" %}{% endblock %}
{% block controls %}
<div class="controls">
<div class="control-group">
{% block extra_controls %}{% endblock %}
</div>
</div>
{% endblock controls %}
{% block tabs %} {% block tabs %}
<ul class="nav nav-tabs px-3"> <ul class="nav nav-tabs px-3">
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
@ -22,9 +12,6 @@
</ul> </ul>
{% endblock tabs %} {% endblock tabs %}
{% block content-wrapper %} {% block content %}
<div class="tab-content"> {% render_table table %}
{% render_table table %} {% endblock content %}
</div>
{% endblock content-wrapper %}

View File

@ -1,24 +1,17 @@
{% extends 'base/layout.html' %} {% extends 'generic/object.html' %}
{% load buttons %}
{% load helpers %}
{% load i18n %} {% load i18n %}
{% load helpers %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block header %} {% block breadcrumbs %}
<div class="d-flex justify-content-between align-items-center"> <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
{# Breadcrumbs #} <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_queues' queue_index=queue_index %}">{{ queue.name }}</a></li>
<nav class="breadcrumb-container px-3" aria-label="breadcrumb"> {% endblock breadcrumbs %}
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
<li class="breadcrumb-item"><a href="{% url 'core:background_tasks_queues' queue_index=queue_index %}">{{ queue.name }}</a></li>
</ol>
</nav>
</div>
{{ block.super }}
{% endblock header %}
{% block title %}{% trans "Job" %} {{ job.id }}{% endblock %} {% block title %}{% trans "Job" %} {{ job.id }}{% endblock %}
{% block object_identifier %}{% endblock %}
{% block controls %} {% block controls %}
<div class="controls"> <div class="controls">
<div class="control-group"> <div class="control-group">
@ -35,8 +28,7 @@
</ul> </ul>
{% endblock tabs %} {% endblock tabs %}
{% block content-wrapper %} {% block content %}
<div class="tab-content">
<div class="row"> <div class="row">
<div class="col col-md-12"> <div class="col col-md-12">
<div class="card"> <div class="card">
@ -88,5 +80,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> {% endblock content %}
{% endblock content-wrapper %}

View File

@ -1,10 +1,8 @@
{% extends 'base/layout.html' %} {% extends 'generic/_base.html' %}
{% load buttons %}
{% load helpers %}
{% load i18n %} {% load i18n %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block header %} {% block page-header %}
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
{# Breadcrumbs #} {# Breadcrumbs #}
<nav class="breadcrumb-container px-3" aria-label="breadcrumb"> <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
@ -14,18 +12,10 @@
</nav> </nav>
</div> </div>
{{ block.super }} {{ block.super }}
{% endblock header %} {% endblock page-header %}
{% block title %}{% trans "Queued Jobs in " %}{{ queue.name }}{% endblock %} {% block title %}{% trans "Queued Jobs in " %}{{ queue.name }}{% endblock %}
{% block controls %}
<div class="controls">
<div class="control-group">
{% block extra_controls %}{% endblock %}
</div>
</div>
{% endblock controls %}
{% block tabs %} {% block tabs %}
<ul class="nav nav-tabs px-3"> <ul class="nav nav-tabs px-3">
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
@ -34,9 +24,6 @@
</ul> </ul>
{% endblock tabs %} {% endblock tabs %}
{% block content-wrapper %} {% block content %}
<div class="tab-content"> {% render_table table %}
{% render_table table %} {% endblock content %}
</div>
{% endblock content-wrapper %}