From 3a54ecb5224253ef2be808276fa58484d1773292 Mon Sep 17 00:00:00 2001
From: kkthxbye-code <festll234@gmail.com>
Date: Mon, 20 Dec 2021 23:31:24 +0100
Subject: [PATCH] Fix #8097: Re-fix markdown table rendering

---
 netbox/project-static/dist/netbox-dark.css  | Bin 788892 -> 789153 bytes
 netbox/project-static/dist/netbox-light.css | Bin 493648 -> 493807 bytes
 netbox/project-static/dist/netbox-print.css | Bin 1623714 -> 1624275 bytes
 netbox/project-static/styles/netbox.scss    |  13 +++++++++++++
 netbox/templates/circuits/provider.html     |   4 ++--
 netbox/templates/extras/report_result.html  |   2 +-
 netbox/templates/extras/script_result.html  |   2 +-
 netbox/templates/inc/panels/comments.html   |   2 +-
 netbox/utilities/templatetags/helpers.py    |   4 ++++
 9 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 25017505e04a3c541e8e65211b4287e20f1af581..e711685bf40042d2b0918218882f0acba69a0d49 100644
GIT binary patch
delta 179
zcmbO;*<j&RgN7Ey7N!>F7M2#)7Pc1l7LFFq7OocVEj%e~5_(0cc`2zysVTa-iAC8d
z`Q>>EC5cHnsnZjaSoN*3NM=+g<re{U=qBZtl;r1H85LA06zAt;rYI<<q@-9EB&MWf
h=A~O%Oitue6~ktFO7(QbS8QUu7^=6Yu<=+h0{{pzK0yEg

delta 39
ucmZ2D)nLwKgN7Ey7N!>F7M2#)7Pc1l7LFFq7OocVEj%e~+cVjDESLca(hJN0

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 07ad0dba297c4e12560fd426b5479997128fef43..10c15397d1e4569f878cdc5a43c32ba37163dc76 100644
GIT binary patch
delta 177
zcmcaGLGJxTxrP?T7N!>F7M2#)7Pc+yY;E;=MX7lysYR(Ny19u(*(v$uc?u<oNja(2
z<(VlZ8CHe{2CB8#)MQjA<re`p>L%rvl;r1H85LA06zAt;rYI<<q@-9EB&MWf=A~O%
a6jWf<o&wcAU2Fr3ARnrR?W}F=-b?_(+d!@W

delta 29
lcmaDqQSQP7xrP?T7N!>F7M2#)7Pc+yY;D_@wy}FL0RXDv3Pu0`

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index a09f4922203efc024056c4451260fe9ca2fd7bd7..4562597d87cbb286d15773b5aaa93fe207d7989f 100644
GIT binary patch
delta 356
zcmZ3~n|yg<azhJa3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IHDi%^Sji%5%T
zi&%^J774rk!g@uic`2zysVTa-iAC8d`Q>>E(=Yz!SDM_=%pr(XN=pJ$OG#o<PHOe^
zk4?f7lM~801kg23zj#4hT@XVbNLXR=fpShObPWn68P!SoML?J7Cgqou<mXx$6;vn`
z=jUXmC@80-q*xaurle%%rCV7{7Zm3e$71w^`#__Cp1^bqP)1!8i@!@!rr+likl;Zv
P{i3Uc_;&mK63OfUAP0o+

delta 63
zcmcaSF?msMazhJa3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IHDi%^Sji%5%T
Ti&%^J774rk+w%`fq_6`3u;CQ_

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index acbfa0646..d78429bf9 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -965,6 +965,19 @@ div.card-overlay {
   max-width: unset;
 }
 
+/* Rendered Markdown */
+.rendered-markdown table {
+  width: 100%;
+}
+.rendered-markdown th {
+  border-bottom: 2px solid #dddddd;
+  padding: 8px;
+}
+.rendered-markdown td {
+  border-top: 1px solid #dddddd;
+  padding: 8px;
+}
+
 // Preformatted text blocks
 td pre {
   margin-bottom: 0
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index b04e7be7a..14fd00863 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -41,11 +41,11 @@
                     </tr>
                     <tr>
                         <th scope="row">NOC Contact</th>
-                        <td class="rendered-markdown">{{ object.noc_contact|render_markdown|placeholder }}</td>
+                        <td>{{ object.noc_contact|render_markdown|placeholder }}</td>
                     </tr>
                     <tr>
                         <th scope="row">Admin Contact</th>
-                        <td class="rendered-markdown">{{ object.admin_contact|render_markdown|placeholder }}</td>
+                        <td>{{ object.admin_contact|render_markdown|placeholder }}</td>
                     </tr>
                     <tr>
                         <th scope="row">Circuits</th>
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index 90726d287..e2f89a180 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -78,7 +78,7 @@
                                                 <span class="muted">&mdash;</span>
                                             {% endif %}
                                         </td>
-                                        <td class="rendered-markdown">{{ message|render_markdown }}</td>
+                                        <td>{{ message|render_markdown }}</td>
                                     </tr>
                                 {% endfor %}
                             {% endfor %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 3cbd0c611..15c446492 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -74,7 +74,7 @@
                                       <tr>
                                           <td>{{ forloop.counter }}</td>
                                           <td>{% log_level log.status %}</td>
-                                          <td class="rendered-markdown">{{ log.message|render_markdown }}</td>
+                                          <td>{{ log.message|render_markdown }}</td>
                                       </tr>
                                   {% empty %}
                                       <tr>
diff --git a/netbox/templates/inc/panels/comments.html b/netbox/templates/inc/panels/comments.html
index bfacb25bf..3219a25a5 100644
--- a/netbox/templates/inc/panels/comments.html
+++ b/netbox/templates/inc/panels/comments.html
@@ -4,7 +4,7 @@
   <h5 class="card-header">
     Comments
   </h5>
-  <div class="card-body rendered-markdown">
+  <div class="card-body">
     {% if object.comments %}
       {{ object.comments|render_markdown }}
     {% else %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index db9c40fc5..47e341400 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -59,6 +59,10 @@ def render_markdown(value):
     # Render Markdown
     html = markdown(value, extensions=['fenced_code', 'tables', StrikethroughExtension()])
 
+    # If the string is not empty wrap it in rendered-markdown to style tables
+    if html:
+        html = f'<div class="rendered-markdown">{html}</div>'
+
     return mark_safe(html)