From fab0aaf77ce636519238cc0c7ee1f5111a67d61d Mon Sep 17 00:00:00 2001 From: bullmoose20 <12549033+bullmoose20@users.noreply.github.com.> Date: Sun, 19 Jan 2025 15:18:41 -0500 Subject: [PATCH 1/2] prepping for PR --- static/local-js/090-webhooks.js | 8 +- templates/025-libraries.html | 1687 +++++++++++++++++++++++-------- 2 files changed, 1250 insertions(+), 445 deletions(-) diff --git a/static/local-js/090-webhooks.js b/static/local-js/090-webhooks.js index 3509327..432a615 100644 --- a/static/local-js/090-webhooks.js +++ b/static/local-js/090-webhooks.js @@ -81,7 +81,7 @@ function validateWebhook (webhookType) { const validateButton = inputGroup.find('.validate-button') const webhookTypeFormatted = webhookType.replace(/_/g, ' ').replace(/\b\w/g, function (l) { return l.toUpperCase() }) - showSpinner2(webhookType) + showSpinner(webhookType) validationMessage.html('') validationMessage.show() @@ -98,19 +98,19 @@ function validateWebhook (webhookType) { .then(response => response.json()) .then(data => { if (data.success) { - hideSpinner2(webhookType) + hideSpinner(webhookType) validationMessage.html('') validateButton.prop('disabled', true) validatedWebhooks['webhooks_' + webhookType] = true } else { - hideSpinner2(webhookType) + hideSpinner(webhookType) validationMessage.html('') validatedWebhooks['webhooks_' + webhookType] = false } updateValidationState() }) .catch((error) => { - hideSpinner2(webhookType) + hideSpinner(webhookType) console.error('Error:', error) validationMessage.html('') validatedWebhooks['webhooks_' + webhookType] = false diff --git a/templates/025-libraries.html b/templates/025-libraries.html index f473bf7..da92956 100644 --- a/templates/025-libraries.html +++ b/templates/025-libraries.html @@ -89,6 +89,7 @@

+

Select which Collection Files you would like to run against your libraries. You can hover over the magnifying glass to see some of the collections that the file will create, or click on the name of the file to be taken to it's wiki page.

@@ -107,120 +108,256 @@

name="mov-collection_separator_award" value="true" {% if data['libraries']['mov-collection_separator_award']|string|lower=='true' %}checked{% endif %}> - +
+ + + +

+ +
- +
+ + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- + - +
+ + + +
+ +
- + - +
+ + + +
+ +
- +
+ + + +
+ +
- + - +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ + +
@@ -238,76 +375,150 @@

data-bs-parent="#mov-chartCollectionsAccordion">
+
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + +
+ +
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + +
+ +
- +
+ + +
+ +
- +
+ + +
+ +
@@ -328,39 +539,66 @@

+ name="mov-collection_genre" value="true" {% if data['libraries']['mov-collection_genre']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_franchise" value="true" {% if data['libraries']['mov-collection_franchise']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="mov-collection_universe" value="true" {% if data['libraries']['mov-collection_universe']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_based" value="true" {% if data['libraries']['mov-collection_based']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_collectionless" value="true" {% if data['libraries']['mov-collection_collectionless']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+ @@ -379,57 +617,91 @@

data-bs-parent="#mov-contentRatingCollectionsAccordion">
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
+
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ + +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+
@@ -450,25 +722,40 @@

+ name="mov-collection_country" value="true" {% if data['libraries']['mov-collection_country']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_region" value="true" {% if data['libraries']['mov-collection_region']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_continent" value="true" {% if data['libraries']['mov-collection_continent']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -488,32 +775,52 @@

+ name="mov-collection_aspect" value="true" {% if data['libraries']['mov-collection_aspect']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_resolution" value="true" {% if data['libraries']['mov-collection_resolution']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_audio_language" value="true" {% if data['libraries']['mov-collection_audio_language']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_subtitle_language" value="true" {% if data['libraries']['mov-collection_subtitle_language']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -534,18 +841,29 @@

+ name="mov-collection_streaming" value="true" {% if data['libraries']['mov-collection_streaming']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="mov-collection_studio" value="true" {% if data['libraries']['mov-collection_studio']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -565,32 +883,56 @@

+ name="mov-collection_actor" value="true" {% if data['libraries']['mov-collection_actor']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="mov-collection_director" value="true" {% if data['libraries']['mov-collection_director']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="mov-collection_producer" value="true" {% if data['libraries']['mov-collection_producer']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="mov-collection_writer" value="true" {% if data['libraries']['mov-collection_writer']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+ @@ -610,24 +952,38 @@

+ name="mov-collection_seasonal" value="true" {% if data['libraries']['mov-collection_seasonal']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_year" value="true" {% if data['libraries']['mov-collection_year']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-collection_decade" value="true" {% if data['libraries']['mov-collection_decade']|string|lower=='true' %}checked{% endif %}> - +
+ + +
@@ -660,12 +1016,17 @@

- + - +
+ + +
+
@@ -685,25 +1046,16 @@

+ name="mov-overlay_mediastinger" value="true" {% if data['libraries']['mov-overlay_mediastinger']|string|lower=='true' %}checked{% endif %}> - -
- -
- - - +
+ + +
+ @@ -724,48 +1076,76 @@

+ name="mov-overlay_content_rating_us_movie" value="true" {% if data['libraries']['mov-overlay_content_rating_us_movie']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-overlay_content_rating_uk" value="true" {% if data['libraries']['mov-overlay_content_rating_uk']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
- - - + + +
+ + +
+
+ name="mov-overlay_content_rating_au" value="true" {% if data['libraries']['mov-overlay_content_rating_au']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
- - - + + +
+ + +
+
+ name="mov-overlay_commonsense" value="true" {% if data['libraries']['mov-overlay_commonsense']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -784,61 +1164,117 @@

- + - +
+ + + + + +
+
+ name="mov-overlay_audio_codec" value="true" {% if data['libraries']['mov-overlay_audio_codec']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
+ name="mov-overlay_language_count" value="true" {% if data['libraries']['mov-overlay_language_count']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-overlay_languages" value="true" {% if data['libraries']['mov-overlay_languages']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-overlay_resolution" value="true" {% if data['libraries']['mov-overlay_resolution']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
+ name="mov-overlay_runtimes" value="true" {% if data['libraries']['mov-overlay_runtimes']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-overlay_versions" value="true" {% if data['libraries']['mov-overlay_versions']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="mov-overlay_video_format" value="true" {% if data['libraries']['mov-overlay_video_format']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
@@ -859,18 +1295,29 @@

+ name="mov-overlay_streaming" value="true" {% if data['libraries']['mov-overlay_streaming']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
- + - +
+ + +
+ @@ -890,11 +1337,16 @@

+ name="mov-overlay_direct_play" value="true" {% if data['libraries']['mov-overlay_direct_play']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -935,7 +1387,9 @@

name="mov-attribute_remove_overlays" value="true" {% if data['libraries']['mov-attribute_remove_overlays']|string|lower=='true' %}checked{% endif %}> - + @@ -969,6 +1423,7 @@

+

Select which Collection Files you would like to run against your libraries. You can hover over the magnifying glass to see some of the collections that the file will create, or click on the name of the file to be taken to it's wiki page.

@@ -987,44 +1442,89 @@

name="sho-collection_separator_award" value="true" {% if data['libraries']['sho-collection_separator_award']|string|lower=='true' %}checked{% endif %}> - +
+ + + +

+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- +
+ + + +
+ +
- + - +
+ + + +
+
- + - +
+ + + +
+
@@ -1042,70 +1542,135 @@

data-bs-parent="#sho-chartCollectionsAccordion">
+
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + +
+ +
- +
+ + + +
+ +
- +
+ + +
+ +
- +
+ + +
+
- +
+ + +
+ +
@@ -1126,39 +1691,66 @@

+ name="sho-collection_genre" value="true" {% if data['libraries']['sho-collection_genre']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_franchise" value="true" {% if data['libraries']['sho-collection_franchise']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="sho-collection_universe" value="true" {% if data['libraries']['sho-collection_universe']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_based" value="true" {% if data['libraries']['sho-collection_based']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_collectionless" value="true" {% if data['libraries']['sho-collection_collectionless']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+ @@ -1177,57 +1769,90 @@

data-bs-parent="#sho-contentRatingCollectionsAccordion">
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
+
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + +
+
+
@@ -1248,25 +1873,40 @@

+ name="sho-collection_country" value="true" {% if data['libraries']['sho-collection_country']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_region" value="true" {% if data['libraries']['sho-collection_region']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_continent" value="true" {% if data['libraries']['sho-collection_continent']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -1286,34 +1926,52 @@

+ name="sho-collection_aspect" value="true" {% if data['libraries']['sho-collection_aspect']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_resolution" value="true" {% if data['libraries']['sho-collection_resolution']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_audio_language" value="true" {% if data['libraries']['sho-collection_audio_language']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_subtitle_language" value="true" {% if data['libraries']['sho-collection_subtitle_language']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -1332,27 +1990,44 @@

data-bs-parent="#sho-productionCollectionsAccordion">
+
+ name="sho-collection_network" value="true" {% if data['libraries']['sho-collection_network']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_streaming" value="true" {% if data['libraries']['sho-collection_streaming']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
+ name="sho-collection_studio" value="true" {% if data['libraries']['sho-collection_studio']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
@@ -1372,11 +2047,16 @@

+ name="sho-collection_actor" value="true" {% if data['libraries']['sho-collection_actor']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -1394,19 +2074,29 @@

data-bs-parent="#sho-timeCollectionsAccordion">
+
+ name="sho-collection_year" value="true" {% if data['libraries']['sho-collection_year']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-collection_decade" value="true" {% if data['libraries']['sho-collection_decade']|string|lower=='true' %}checked{% endif %}> - +
+ + +
@@ -1439,12 +2129,17 @@

- + - +
+ + +
+
@@ -1464,25 +2159,28 @@

+ name="sho-overlay_mediastinger" value="true" {% if data['libraries']['sho-overlay_mediastinger']|string|lower=='true' %}checked{% endif %}> - -
- +
- + - +
+ + +
+ @@ -1503,47 +2201,76 @@

+ name="sho-overlay_content_rating_us_show" value="true" {% if data['libraries']['sho-overlay_content_rating_us_show']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-overlay_content_rating_uk" value="true" {% if data['libraries']['sho-overlay_content_rating_uk']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
- - - + + +
+ + +
+
+ name="sho-overlay_content_rating_au" value="true" {% if data['libraries']['sho-overlay_content_rating_au']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
- - - + + +
+ + +
+
+ name="sho-overlay_commonsense" value="true" {% if data['libraries']['sho-overlay_commonsense']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -1562,61 +2289,117 @@

- + - +
+ + + + + +
+
+ name="sho-overlay_audio_codec" value="true" {% if data['libraries']['sho-overlay_audio_codec']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
+ name="sho-overlay_language_count" value="true" {% if data['libraries']['sho-overlay_language_count']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-overlay_languages" value="true" {% if data['libraries']['sho-overlay_languages']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-overlay_resolution" value="true" {% if data['libraries']['sho-overlay_resolution']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
+ name="sho-overlay_runtimes" value="true" {% if data['libraries']['sho-overlay_runtimes']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-overlay_versions" value="true" {% if data['libraries']['sho-overlay_versions']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+
+ name="sho-overlay_video_format" value="true" {% if data['libraries']['sho-overlay_video_format']|string|lower=='true' %}checked{% endif %}> - +
+ + + + + +
+
@@ -1637,25 +2420,40 @@

+ name="sho-overlay_network" value="true" {% if data['libraries']['sho-overlay_network']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ name="sho-overlay_streaming" value="true" {% if data['libraries']['sho-overlay_streaming']|string|lower=='true' %}checked{% endif %}> - +
+ + + +
+
- + - +
+ + +
+ @@ -1675,11 +2473,16 @@

+ name="sho-overlay_direct_play" value="true" {% if data['libraries']['sho-overlay_direct_play']|string|lower=='true' %}checked{% endif %}> - +
+ + +
+ @@ -1720,7 +2523,9 @@

name="sho-attribute_remove_overlays" value="true" {% if data['libraries']['sho-attribute_remove_overlays']|string|lower=='true' %}checked{% endif %}> - + From 62d2735af32ca3228b9bb1f760ddac2e2e44c311 Mon Sep 17 00:00:00 2001 From: bullmoose20 <12549033+bullmoose20@users.noreply.github.com.> Date: Sun, 19 Jan 2025 15:39:03 -0500 Subject: [PATCH 2/2] incorporate some css and base html changes from Yozora --- static/css/styles.css | 27 +++++++++++++++++++++++++++ templates/000-base.html | 12 ++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index 3858fad..7a54fef 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -219,3 +219,30 @@ div#loading { .tooltip.show { opacity: 1.0 !important; } + +.mt-4 { + margin-top: 0 !important; + + +.nav-button { + background-color: #00bc8c !important; + color: white !important; + border-color: #00bc8c !important; +} +.nav-button:hover { + background-color: #019c75 !important; + border-color: #019c75 !important; +}} + +.form-check-input:checked { + background-color: #00bc8c; + border-color: #0f5132; +} + +.accordion-button:not(.collapsed) { + background-color: transparent; +} + +a { + color: rgb(255 255 255 / 70%); +} diff --git a/templates/000-base.html b/templates/000-base.html index e31dc08..e21c479 100644 --- a/templates/000-base.html +++ b/templates/000-base.html @@ -16,13 +16,13 @@