From 4f9626703345ced77935e6bbb06de0b4522d53b7 Mon Sep 17 00:00:00 2001
From: Sj-Si <sjw.jetty@gmail.com>
Date: Tue, 16 Jan 2024 13:35:01 -0500
Subject: Finish cleanup.

---
 html/extra-networks-card-minimal.html     |  4 ----
 html/extra-networks-card.html             | 10 +++++-----
 html/extra-networks-edit-item-button.html |  2 +-
 html/extra-networks-metadata-button.html  |  2 +-
 html/extra-networks-pane.html             |  6 +++---
 html/extra-networks-tree-button.html      |  3 +--
 html/extra-networks-tree.html             | 14 +++++++-------
 7 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 html/extra-networks-card-minimal.html

(limited to 'html')

diff --git a/html/extra-networks-card-minimal.html b/html/extra-networks-card-minimal.html
deleted file mode 100644
index d66df7df..00000000
--- a/html/extra-networks-card-minimal.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="card-minimal" onclick={card_clicked} data-name="{name}">
-    <span class="name">{name}</span>
-    <span class="button-row">{copy_path_button}{metadata_button}{edit_button}</span>
-</div>
diff --git a/html/extra-networks-card.html b/html/extra-networks-card.html
index ca683dc4..f1d959a6 100644
--- a/html/extra-networks-card.html
+++ b/html/extra-networks-card.html
@@ -1,9 +1,9 @@
-<div class="card" style={style} onclick="{card_clicked}" data-name="{name}" {sort_keys}>
+<div class="card" style="{style}" onclick="{card_clicked}" data-name="{name}" {sort_keys}>
 	{background_image}
 	<div class="button-row">{copy_path_button}{metadata_button}{edit_button}</div>
-	<div class='actions'>
-		<div class='additional'>{search_terms}</div>
-		<span class='name'>{name}</span>
-		<span class='description'>{description}</span>
+	<div class="actions">
+		<div class="additional">{search_terms}</div>
+		<span class="name">{name}</span>
+		<span class="description">{description}</span>
 	</div>
 </div>
diff --git a/html/extra-networks-edit-item-button.html b/html/extra-networks-edit-item-button.html
index 7d2677d9..0fe43082 100644
--- a/html/extra-networks-edit-item-button.html
+++ b/html/extra-networks-edit-item-button.html
@@ -1,4 +1,4 @@
 <div class="edit-button card-button"
     title="Edit metadata"
-    onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{page_id}', '{name}')">
+    onclick="extraNetworksEditUserMetadata(event, '{tabname}', '{extra_networks_tabname}', '{name}')">
 </div>
\ No newline at end of file
diff --git a/html/extra-networks-metadata-button.html b/html/extra-networks-metadata-button.html
index ad6d6f41..285b5b3b 100644
--- a/html/extra-networks-metadata-button.html
+++ b/html/extra-networks-metadata-button.html
@@ -1,4 +1,4 @@
 <div class="metadata-button card-button"
     title="Show internal metadata"
-    onclick="extraNetworksRequestMetadata(event, '{page_id}', '{name}')">
+    onclick="extraNetworksRequestMetadata(event, '{extra_networks_tabname}', '{name}')">
 </div>
\ No newline at end of file
diff --git a/html/extra-networks-pane.html b/html/extra-networks-pane.html
index 20cf6686..bf46ca16 100644
--- a/html/extra-networks-pane.html
+++ b/html/extra-networks-pane.html
@@ -1,8 +1,8 @@
-<div id='{tabname}_{network_type_id}_pane' class='extra-network-pane'>
-    <div id='{tabname}_{network_type_id}_tree' class='extra-network-tree'>
+<div id='{tabname}_{extra_networks_tabname}_pane' class='extra-network-pane'>
+    <div id='{tabname}_{extra_networks_tabname}_tree' class='extra-network-tree'>
         {tree_html}
     </div>
-    <div id='{tabname}_{network_type_id}_cards' class='extra-network-cards'>
+    <div id='{tabname}_{extra_networks_tabname}_cards' class='extra-network-cards'>
         {items_html}
     </div>
 </div>
\ No newline at end of file
diff --git a/html/extra-networks-tree-button.html b/html/extra-networks-tree-button.html
index 20a9b0b8..9dc2e2a4 100644
--- a/html/extra-networks-tree-button.html
+++ b/html/extra-networks-tree-button.html
@@ -1,8 +1,7 @@
 <span data-filterable-item-text hidden>{search_terms}</span>
 <div class="tree-list-content {subclass}"
-    expanded="false"
     type="button"
-    onclick="extraNetworksTreeOnClick(event, '{tabname}', '{tab_id}');{onclick_extra}"
+    onclick="extraNetworksTreeOnClick(event, '{tabname}', '{extra_networks_tabname}');{onclick_extra}"
     data-path="{data_path}"
     data-hash="{data_hash}"
 >
diff --git a/html/extra-networks-tree.html b/html/extra-networks-tree.html
index 4d29b1be..23f6af10 100644
--- a/html/extra-networks-tree.html
+++ b/html/extra-networks-tree.html
@@ -2,36 +2,36 @@
     <div class="tree-list-controls">
         <div class="tree-list-search">
             <input
-                id="{tabname}_{tab_id}_extra_search"
+                id="{tabname}_{extra_networks_tabname}_extra_search"
                 class="tree-list-search-text"
                 type="search"
                 placeholder="Filter files"
             >
         </div>
         <div 
-            id="{tabname}_{tab_id}_extra_sort"
+            id="{tabname}_{extra_networks_tabname}_extra_sort"
             class="tree-list-sort"
             data-sortmode="path"
             data-sortkey="sortPath-Ascending-640"
             title="Sort by path"
-            onclick="extraNetworksTreeSortOnClick(event, '{tabname}', '{tab_id}');"
+            onclick="extraNetworksTreeSortOnClick(event, '{tabname}', '{extra_networks_tabname}');"
         >
             <i class="tree-list-sort-icon"></i>
         </div>
         <div
-            id="{tabname}_{tab_id}_extra_sort_dir"
+            id="{tabname}_{extra_networks_tabname}_extra_sort_dir"
             class="tree-list-sort-dir"
             data-sortdir="Ascending"
             title="Sort ascending"
-            onclick="extraNetworksTreeSortDirOnClick(event, '{tabname}', '{tab_id}');"
+            onclick="extraNetworksTreeSortDirOnClick(event, '{tabname}', '{extra_networks_tabname}');"
         >
             <i class="tree-list-sort-dir-icon"></i>
         </div>
         <div
-            id="{tabname}_{tab_id}_extra_refresh"
+            id="{tabname}_{extra_networks_tabname}_extra_refresh"
             class="tree-list-refresh"
             title="Refresh page"
-            onclick="extraNetworksTreeRefreshOnClick(event, '{tabname}', '{tab_id}');"
+            onclick="extraNetworksTreeRefreshOnClick(event, '{tabname}', '{extra_networks_tabname}');"
         >
             <i class="tree-list-refresh-icon"></i>
         </div>
-- 
cgit v1.2.1