From 3af52aaf13b824a0f8e5513aa7486fe841f15864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?aron=20bergur=20j=C3=B3hannsson?= <aronbj20@ru.is>
Date: Thu, 2 Mar 2023 22:39:30 +0000
Subject: [PATCH] widget style fix and unique ids based on name

---
 netbox/project-static/dist/netbox-dark.css    | Bin 375167 -> 375160 bytes
 netbox/project-static/dist/netbox-light.css   | Bin 232612 -> 232605 bytes
 netbox/project-static/dist/netbox-print.css   | Bin 726951 -> 726930 bytes
 netbox/project-static/dist/netbox.js          | Bin 381450 -> 381450 bytes
 netbox/project-static/dist/netbox.js.map      | Bin 354185 -> 354185 bytes
 netbox/project-static/styles/netbox.scss      |   8 ++++----
 .../templates/widgets/markdown_input.html     |  14 +++++++-------
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index f64c24233e36071880de68c1c96b830103d10f62..74ab785a5794f756ce265e7c39fb9175b729c616 100644
GIT binary patch
delta 56
zcmV-80LTCT@)r2=7J!5SgaU*Egaot&y|tGD!~!LkEwu#{mm#nP7MHNB1qudma%C-I
OXOl6MB)3Pl1vmqgkrf*N

delta 50
zcmV-20L}mS@)rN{7J!5SgaU*Egaot&y|tGyRs%1WEwu$0m-Rsc8U;9EGGb+uK?x+c
IK(+-q0}iGVApigX

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 26e9c74768af4b8e7a2e0372622f6f9b03dd5152..f12291e44d1dc368699f6c51307d5d63d40dd267 100644
GIT binary patch
delta 47
zcmZ27lW*=!zJ?aY7N#xCB3;wZbux=Hmn0@lf2heMJnb<P7kfcbs%}!c=Jv=gW^X0{
Do?s9}

delta 45
zcmbO`lW)mPzJ?aY7N#xCB3)dHnYjh|MJ0)OCDYG!GMlg~TO=AKr5bGy>SFe00swa2
B4{rbf

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index ecff7b50cfc996041bd80b5d9a74a93ff695cead..5d7f7342be9c1ee67fd170bc98a19cebc26f3aec 100644
GIT binary patch
delta 96
zcmZ3!UT4yJorV_17N!>F7M2#)7Pc1l7LFFq7OpMa75uEV86~+n(**>$#iuhFvuI3z
y&&MqaVku5HSj);ey@rolgta6wsknN&U=61<TR~B(Zc_SmMFmFD?ePNK9_#>>WgDje

delta 81
zcmV-X0IvU%uPmppEP#XogaU*Egam{Iga(8Mgb0KQgbK6^cn=F9X>D+Ca&%#CbbXil
n4GSNaO%DqPm(WfLB$w|F3wH-2IAJnkWipfTC=|C!5DQ2LW@#FF

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 50cc484dc9e8379e4baf67a02cfd79c2c26c85fe..029e4f4a98251807ff394a4b247f0e3c7f71dc05 100644
GIT binary patch
delta 31
lcmeBLBHpz`yrG4$g=q`3ye?x^yMit=5VLGo&}DtK1OTJc3EBVv

delta 31
lcmeBLBHpz`yrG4$g=q`3ye?ySyMit=5VLGo&}DtK1OTDN3AX?M

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index f40a507e3e5be5d8776e8be57e0269eecf9c8c06..a03e8eb3438bce6ddd1accb647eda1c7471530c5 100644
GIT binary patch
delta 34
pcmeA?FWPxtw4sHug{g&k3rl(*qwn^NJ{A#1rYz^}b^R>dHvrv@3<v-K

delta 34
pcmeA?FWPxtw4sHug{g&k3rl(*qx<%ZJ{A#1CQGO7b^R>dHvrq73(x=n

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 7f9e1a4bf..37f6c21c4 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -1004,12 +1004,12 @@ div.card-overlay {
     border-bottom: 0;
 
     &.active {
-      background-color: var(--nbx-body-bg) !important;
+      background-color: var(--nbx-body-bg);
     }
   }
-  .nav-link.active {
-    // background-color: var(--nbx-body-bg) !important;
-    background-color: blueviolet;
+
+  .nav-tabs {
+    background-color: var(--nbx-pre-bg);
   }
 }
 
diff --git a/netbox/utilities/templates/widgets/markdown_input.html b/netbox/utilities/templates/widgets/markdown_input.html
index c4e918c21..f3bbc0609 100644
--- a/netbox/utilities/templates/widgets/markdown_input.html
+++ b/netbox/utilities/templates/widgets/markdown_input.html
@@ -1,22 +1,22 @@
-<div class="border rounded markdown-preview"> 
-    <ul class="nav nav-tabs px-3 pt-2 rounded-top bg-transparent border-0">
+<div class="border rounded markdown-widget"> 
+    <ul class="nav nav-tabs px-3 pt-2 rounded-top border-0">
         <li class="nav-item" role="presentation">
-          <button class="nav-link active " id="comment-input-tab" data-bs-toggle="tab" data-bs-target="#comment-input" type="button" role="tab" aria-controls="comment-input" aria-selected="true">
+          <button class="nav-link active " id="{{ widget.name }}-input-tab" data-bs-toggle="tab" data-bs-target="#{{ widget.name }}-input" type="button" role="tab" aria-controls="{{ widget.name }}-input" aria-selected="true">
             Write
           </button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link " id="markdown-preview-tab" data-bs-toggle="tab" data-bs-target="#markdown-preview" type="button" role="tab" aria-controls="markdown-preview" aria-selected="false">
+            <button hx-target="#{{ widget.name }}-preview" hx-swap="innerHTML" hx-post="{% url 'extras:markdown_render' %}" class="nav-link preview-button" id="{{ widget.name }}-markdown-preview-tab" data-bs-toggle="tab" data-bs-target="#{{ widget.name }}-markdown-preview" type="button" role="tab" aria-controls="{{ widget.name }}-markdown-preview" aria-selected="false">
               Preview   
             </button>
           </li>
       </ul>
       <div class="tab-content bg-body rounded-bottom border-top">
-        <div class="tab-pane show active" id="comment-input" role="tabpanel" aria-labelledby="comment-input-tab">
+        <div class="tab-pane show active" id="{{ widget.name }}-input" role="tabpanel" aria-labelledby="{{ widget.name }}-input-tab">
         {% include "django/forms/widgets/textarea.html" %}
         </div>
-        <div class="tab-pane show" id="markdown-preview" role="tabpanel" aria-labelledby="markdown-preview-tab">
-            <div class="test">This is rendered markdown</div>
+        <div class="tab-pane show" id="{{ widget.name }}-markdown-preview" role="tabpanel" aria-labelledby="{{ widget.name }}-markdown-preview-tab">
+            <div id="{{ widget.name }}-preview" class="preview px-3 py-2">Testing</div>
         </div>
     </div>
 </div>
\ No newline at end of file