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

Merge pull request #5964 from rodvand/develop

Browse Source 
Closes #5953: Adds Markdown rendering of Custom Scripts' descriptions
This commit is contained in:
Jeremy Stretch
2021-03-12 10:56:33 -05:00
committed by GitHub
parent ad43373f5b d58291d119
commit c061f7021e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<h1>{{ script }}</h1> <h1>{{ script }}</h1>
<p>{{ script.Meta.description }}</p> <p>{{ script.Meta.description|render_markdown }}</p>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"> <li role="presentation" class="active">
<a href="#run" role="tab" data-toggle="tab" class="active">Run</a> <a href="#run" role="tab" data-toggle="tab" class="active">Run</a>

2
netbox/templates/extras/script_list.html
View File

@ -26,7 +26,7 @@
<td> <td>
{% include 'extras/inc/job_label.html' with result=script.result %} {% include 'extras/inc/job_label.html' with result=script.result %}
</td> </td>
<td>{{ script.Meta.description }}</td> <td>{{ script.Meta.description|render_markdown }}</td>
{% if script.result %} {% if script.result %}
<td class="text-right"> <td class="text-right">
<a href="{% url 'extras:script_result' job_result_pk=script.result.pk %}">{{ script.result.created }}</a> <a href="{% url 'extras:script_result' job_result_pk=script.result.pk %}">{{ script.result.created }}</a>

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

@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<h1>{{ script }}</h1> <h1>{{ script }}</h1>
<p>{{ script.Meta.description }}</p> <p>{{ script.Meta.description|render_markdown }}</p>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"> <li role="presentation" class="active">
<a href="#log" role="tab" data-toggle="tab" class="active">Log</a> <a href="#log" role="tab" data-toggle="tab" class="active">Log</a>
@ -110,4 +110,4 @@ function jobTerminatedAction(){
</script> </script>
<script src="{% static 'js/job_result.js' %}?v{{ settings.VERSION }}" <script src="{% static 'js/job_result.js' %}?v{{ settings.VERSION }}"
onerror="window.location='{% url 'media_failure' %}?filename=js/job_result.js'"></script> onerror="window.location='{% url 'media_failure' %}?filename=js/job_result.js'"></script>
{% endblock %} {% endblock %}