NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 03:16:25 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix scripts/reports template layout

Browse Source
This commit is contained in:
checktheroads 2021-04-21 10:39:56 -07:00
parent 1cd91ac94b
commit 31bc919520
2 changed files with 109 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,14 @@
{% load helpers %} {% load helpers %}
{% load static %} {% load static %}
{% block title %}{{ report.name }} - {{ result.get_status_display }}{% endblock %} {% block title %}{{ report.name }} <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>{% endblock %}
{% block head %}
<script src="{% static 'jobs.js' %}?v{{ settings.VERSION }}"
onerror="window.location='{% url 'media_failure' %}?filename=jobs.js'"></script>
{% endblock %}
{% block content %} {% block content %}
<span id="jobId" data-value="{{ result.pk }}" style="display: none;"></span>
<span id="jobComplete" data-value="{{ result.completed }}" style="display: none;"></span>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<p> <p>
@ -18,7 +21,7 @@
<span class="visually-hidden">Loading...</span> <span class="visually-hidden">Loading...</span>
</div> </div>
{% endif %} {% endif %}
<span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
</p> </p>
{% if result.completed %} {% if result.completed %}
<div class="card"> <div class="card">
@ -92,7 +95,7 @@
</div> </div>
{% endblock %} {% endblock %}
{% block javascript %} {% block data %}
<script src="{% static 'jobs.js' %}?v{{ settings.VERSION }}" <span data-job-id="{{ result.pk }}"></span>
onerror="window.location='{% url 'media_failure' %}?filename=jobs.js'"></script> <span data-job-complete="{{ result.completed }}"></span>
{% endblock %} {% endblock %}

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

@ -4,12 +4,15 @@
{% load log_levels %} {% load log_levels %}
{% load static %} {% load static %}
{% block title %}{{ script }} - {{ result.get_status_display }}{% endblock %} {% block title %}{{ script }} <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>{% endblock %}
{% block head %}
<script src="{% static 'jobs.js' %}?v{{ settings.VERSION }}"
onerror="window.location='{% url 'media_failure' %}?filename=jobs.js'"></script>
{% endblock %}
{% block content %} {% block content %}
<span id="jobId" data-value="{{ result.pk }}" style="display: none;"></span> <div class="row noprint">
<span id="jobComplete" data-value="{{ result.completed }}" style="display: none;"></span>
<div class="row noprint">
<div class="col-md-12"> <div class="col-md-12">
<nav class="breadcrumb-container" aria-label="breadcrumb"> <nav class="breadcrumb-container" aria-label="breadcrumb">
<ol class="breadcrumb"> <ol class="breadcrumb">
@ -20,9 +23,9 @@
</ol> </ol>
</nav> </nav>
</div> </div>
</div> </div>
<p class="text-muted">{{ script.Meta.description|render_markdown }}</p> <p class="text-muted">{{ script.Meta.description|render_markdown }}</p>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">Log</a> <a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">Log</a>
</li> </li>
@ -32,8 +35,8 @@
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">Source</a> <a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">Source</a>
</li> </li>
</ul> </ul>
<div class="tab-content my-3"> <div class="tab-content my-3">
<p> <p>
Run: <strong>{{ result.created }}</strong> Run: <strong>{{ result.created }}</strong>
{% if result.completed %} {% if result.completed %}
@ -43,7 +46,6 @@
<span class="visually-hidden">Loading...</span> <span class="visually-hidden">Loading...</span>
</div> </div>
{% endif %} {% endif %}
<span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
</p> </p>
<div role="tabpanel" class="tab-pane active" id="log"> <div role="tabpanel" class="tab-pane active" id="log">
{% if result.completed %} {% if result.completed %}
@ -98,10 +100,10 @@
<p><code>{{ script.filename }}</code></p> <p><code>{{ script.filename }}</code></p>
<pre>{{ script.source }}</pre> <pre>{{ script.source }}</pre>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block javascript %} {% block data %}
<script src="{% static 'jobs.js' %}?v{{ settings.VERSION }}" <span data-job-id="{{ result.pk }}"></span>
onerror="window.location='{% url 'media_failure' %}?filename=jobs.js'"></script> <span data-job-complete="{{ result.completed }}"></span>
{% endblock %} {% endblock %}