mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Clean up report & script templates

Browse Source
This commit is contained in:
jeremystretch
2021-12-21 08:43:01 -05:00
parent 17ba0a97d5
commit 8af12b22bb
5 changed files with 96 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/templates/extras/htmx/report_result.html
View File

@ -1,21 +1,15 @@
{% load helpers %}
<p>
Run: <strong>{{ result.created|annotated_date }}</strong>
Initiated: <strong>{{ result.created|annotated_date }}</strong>
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
{% else %}
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
</div>
{% endif %}
<span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
<span id="pending-result-label">{% include 'extras/inc/job_label.html' %}</span>
</p>
{% if result.completed %}
<div class="card">
<h5 class="card-header">
Report Methods
</h5>
<h5 class="card-header">Report Methods</h5>
<div class="card-body">
<table class="table table-hover">
{% for method, data in result.data.items %}
@ -33,9 +27,7 @@
</div>
</div>
<div class="card">
<h5 class="card-header">
Report Results
</h5>
<h5 class="card-header">Report Results</h5>
<div class="card-body">
<table class="table table-hover report">
<thead>
@ -77,5 +69,5 @@
</div>
</div>
{% else %}
<div class="well">Pending results</div>
{% include 'extras/inc/result_pending.html' %}
{% endif %}

14
netbox/templates/extras/htmx/script_result.html
View File

@ -1,13 +1,14 @@
{% load helpers %}
{% load log_levels %}
{% if result.completed %}
<p>
Run: <strong>{{ result.created|annotated_date }}</strong>
<p>
Initiated: <strong>{{ result.created|annotated_date }}</strong>
{% if result.completed %}
Duration: <strong>{{ result.duration }}</strong>
{% endif %}
</p>
<span id="pending-result-label">{% include 'extras/inc/job_label.html' %}</span>
</p>
{% if result.completed %}
<div class="card mb-3">
<h5 class="card-header">Script Log</h5>
<div class="card-body">
@ -45,8 +46,5 @@
<p class="text-muted">None</p>
{% endif %}
{% else %}
<div class="spinner-border" id="spinner" role="status">
<span class="visually-hidden">Loading...</span>
</div>
<h3>Results pending...</h3>
{% include 'extras/inc/result_pending.html' %}
{% endif %}

6
netbox/templates/extras/inc/result_pending.html Normal file
View File

@ -0,0 +1,6 @@
{# Indicates that a job result is still pending; used for HTMX requests #}
<div class="spinner-border float-start me-1" id="spinner" role="status">
<span class="visually-hidden">Loading...</span>
</div>
<h3>Results pending...</h3>
<small class="text-muted">Last updated {% now "H:i:s" %}</small>

4
netbox/templates/extras/report_result.html
View File

@ -1,10 +1,8 @@
{% extends 'extras/report.html' %}
{% load helpers %}
{% load static %}
{% block content-wrapper %}
<div class="row px-3">
<div class="col col-md-12" hx-get="{% url 'extras:report_result' job_result_pk=result.pk %}" hx-trigger="every 3s">
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:report_result' job_result_pk=result.pk %}" hx-trigger="every 3s"{% endif %}>
{% include 'extras/htmx/report_result.html' %}
</div>
</div>

5
netbox/templates/extras/script_result.html
View File

@ -1,8 +1,5 @@
{% extends 'base/layout.html' %}
{% load helpers %}
{% load form_helpers %}
{% load log_levels %}
{% load static %}
{% block title %}{{ script }}{% endblock %}
@ -38,7 +35,7 @@
<div class="tab-content mb-3">
<div role="tabpanel" class="tab-pane active" id="log">
<div class="row">
<div class="col col-md-12" hx-get="{% url 'extras:script_result' job_result_pk=result.pk %}" hx-trigger="every 3s">
<div class="col col-md-12"{% if not result.completed %} hx-get="{% url 'extras:script_result' job_result_pk=result.pk %}" hx-trigger="every 3s"{% endif %}>
{% include 'extras/htmx/script_result.html' %}
</div>
</div>