NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 17:08:41 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Clean up template blocks

Browse Source
This commit is contained in:
jeremystretch 2022-01-05 09:09:39 -05:00
parent 8338fc405f
commit 01e8017265
3 changed files with 74 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/templates/extras/report.html
View File

@ -10,7 +10,7 @@
{% block breadcrumbs %} {% block breadcrumbs %}
<li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li> <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li>
<li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li> <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
{% endblock %} {% endblock breadcrumbs %}
{% block subtitle %} {% block subtitle %}
{% if report.description %} {% if report.description %}
@ -18,7 +18,7 @@
<div class="text-muted">{{ report.description|render_markdown }}</div> <div class="text-muted">{{ report.description|render_markdown }}</div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock subtitle %}
{% block controls %}{% endblock %} {% block controls %}{% endblock %}
@ -28,13 +28,12 @@
<a href="#report" role="tab" data-bs-toggle="tab" class="nav-link active">Report</a> <a href="#report" role="tab" data-bs-toggle="tab" class="nav-link active">Report</a>
</li> </li>
</ul> </ul>
{% endblock %} {% endblock tabs %}
{% block content-wrapper %} {% block content %}
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="report"> <div role="tabpanel" class="tab-pane active" id="report">
{% if perms.extras.run_report %} {% if perms.extras.run_report %}
<div class="px-3 float-end noprint"> <div class="float-end noprint">
<form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post"> <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
{% csrf_token %} {% csrf_token %}
<button type="submit" name="_run" class="btn btn-primary"> <button type="submit" name="_run" class="btn btn-primary">
@ -47,7 +46,7 @@
</form> </form>
</div> </div>
{% endif %} {% endif %}
<div class="row px-3"> <div class="row">
<div class="col col-md-12"> <div class="col col-md-12">
{% if report.result %} {% if report.result %}
Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}"> Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
@ -57,5 +56,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> {% endblock content %}
{% endblock %}

18
netbox/templates/extras/script.html
View File

@ -7,34 +7,33 @@
{% block object_identifier %} {% block object_identifier %}
{{ script.full_name }} {{ script.full_name }}
{% endblock %} {% endblock object_identifier %}
{% block breadcrumbs %} {% block breadcrumbs %}
<li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li> <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
<li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li> <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
{% endblock %} {% endblock breadcrumbs %}
{% block subtitle %} {% block subtitle %}
<div class="object-subtitle"> <div class="object-subtitle">
<div class="text-muted">{{ script.Meta.description|render_markdown }}</div> <div class="text-muted">{{ script.Meta.description|render_markdown }}</div>
</div> </div>
{% endblock %} {% endblock subtitle %}
{% block controls %}{% endblock %} {% block controls %}{% endblock %}
{% 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">
<a href="#run" role="tab" data-bs-toggle="tab" class="nav-link active">Run</a> <a href="#run" role="tab" data-bs-toggle="tab" class="nav-link active">Run</a>
</li> </li>
<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>
{% endblock %} {% endblock tabs %}
{% block content-wrapper %} {% block content %}
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="run"> <div role="tabpanel" class="tab-pane active" id="run">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
@ -71,5 +70,4 @@
<code class="h6 my-3 d-block">{{ script.filename }}</code> <code class="h6 my-3 d-block">{{ script.filename }}</code>
<pre class="block">{{ script.source }}</pre> <pre class="block">{{ script.source }}</pre>
</div> </div>
</div> {% endblock content %}
{% endblock content-wrapper %}

6
netbox/templates/ipam/vlan/base.html
View File

@ -37,9 +37,3 @@
{% endif %} {% endif %}
</ul> </ul>
{% endblock %} {% endblock %}
{% block content-wrapper %}
<div class="tab-content">
{% block content %}{% endblock %}
</div>
{% endblock %}