From 9870afdb47049e91e6e807a35ca682070f481cbc Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sun, 7 Jul 2024 11:53:10 +0100
Subject: [PATCH] Fix forum unpainted nav on Firefox

Firefox was showing the navbar unpainted which was a result of waiting
for the inline script to load so move it separate file and load in footer.
---
 .../template/deluge_nav.js                    |   8 ++
 .../template/deluge_nav_phpbb.html            |  15 +--
 .../template/overall_footer.html              | 121 ++++++++++++++++++
 3 files changed, 131 insertions(+), 13 deletions(-)
 create mode 100644 forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav.js
 create mode 100644 forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/overall_footer.html

diff --git a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav.js b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav.js
new file mode 100644
index 000000000..30bf2be05
--- /dev/null
+++ b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav.js
@@ -0,0 +1,8 @@
+const navList = document.getElementById("deluge-nav-lists");
+function show_nav_menu() {
+  navList.classList.add("menus-show");
+}
+
+function hide_nav_menu() {
+  navList.classList.remove("menus-show");
+}
diff --git a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
index 0abd0648b..4d6b9d318 100644
--- a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
+++ b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/deluge_nav_phpbb.html
@@ -6,14 +6,14 @@
     </div>
 
     <div class="deluge-navbar">
-        <div class="icon-bar" onclick="show()">
+        <div class="icon-bar" onclick="show_nav_menu()">
             <i></i>
             <i></i>
             <i></i>
         </div>
 
         <ul id="deluge-nav-lists">
-            <li class="close"><span onclick="hide()">×</span></li>
+            <li class="close"><span onclick="hide_nav_menu()">×</span></li>
             <li><a href="https://dev.deluge-torrent.org/wiki/Download">Download</a></li>
             <li><a href="https://dev.deluge-torrent.org/wiki/Plugins">Plugins</a></li>
             <li><a href="https://forum.deluge-torrent.org/">Forum</a></li>
@@ -23,14 +23,3 @@
         </ul>
     </div>
 </div>
-
-<script>
-    const navList = document.getElementById("deluge-nav-lists");
-    function show() {
-        navList.classList.add("menus-show");
-    }
-
-    function hide(){
-        navList.classList.remove("menus-show");
-    }
-</script>
diff --git a/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/overall_footer.html b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/overall_footer.html
new file mode 100644
index 000000000..a24786bba
--- /dev/null
+++ b/forum.deluge-torrent.org/htdocs/styles/deluge_stormyday_3.3/template/overall_footer.html
@@ -0,0 +1,121 @@
+		<!-- EVENT overall_footer_content_after -->
+	</div>
+
+<!-- EVENT overall_footer_page_body_after -->
+
+<div id="page-footer" class="page-footer" role="contentinfo">
+	<!-- INCLUDE navbar_footer.html -->
+
+	<div class="copyright">
+		<!-- EVENT overall_footer_copyright_prepend -->
+		<p class="footer-row">
+			<span class="footer-copyright">{{ CREDIT_LINE }}</span>
+		</p>
+		<!-- IF TRANSLATION_INFO -->
+		<p class="footer-row">
+			<span class="footer-copyright">{{ TRANSLATION_INFO }}</span>
+		</p>
+		<!-- ENDIF -->
+		<!-- EVENT overall_footer_copyright_append -->
+		<p class="footer-row" role="menu">
+			<a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem">
+				<span class="footer-link-text">{{ lang('PRIVACY_LINK') }}</span>
+			</a>
+			|
+			<a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem">
+				<span class="footer-link-text">{{ lang('TERMS_LINK') }}</span>
+			</a>
+		</p>
+		<!-- IF DEBUG_OUTPUT -->
+		<p class="footer-row">
+			<span class="footer-info">{{ DEBUG_OUTPUT }}</span>
+		</p>
+		<!-- ENDIF -->
+		<!-- IF U_ACP -->
+		<p class="footer-row">
+			<a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a>
+		</p>
+		<!-- ENDIF -->
+	</div>
+
+	<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
+		<div id="darken" class="darken">&nbsp;</div>
+	</div>
+
+	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
+		<a href="#" class="alert_close">
+			<i class="icon fa-times-circle fa-fw" aria-hidden="true"></i>
+		</a>
+		<h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
+	</div>
+	<div id="phpbb_confirm" class="phpbb_alert">
+		<a href="#" class="alert_close">
+			<i class="icon fa-times-circle fa-fw" aria-hidden="true"></i>
+		</a>
+		<div class="alert_text"></div>
+	</div>
+</div>
+
+</div>
+
+<div>
+	<a id="bottom" class="anchor" accesskey="z"></a>
+	{% if not S_IS_BOT %}{{ RUN_CRON_TASK }}{% endif %}
+</div>
+
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.7.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS forum_fn.js -->
+<!-- INCLUDEJS ajax.js -->
+<!-- INCLUDEJS deluge_nav.js -->
+<!-- IF S_ALLOW_CDN -->
+	<script>
+		(function($){
+			var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
+				$span = $('<span class="fa" style="display:none"></span>').appendTo('body');
+			if ($span.css('fontFamily') !== 'FontAwesome' ) {
+				$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">');
+				$fa_cdn.remove();
+			}
+			$span.remove();
+		})(jQuery);
+	</script>
+<!-- ENDIF -->
+
+<!-- IF S_COOKIE_NOTICE -->
+	<script src="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.js?assets_version={T_ASSETS_VERSION}"></script>
+	<script>
+		if (typeof window.cookieconsent === "object") {
+			window.addEventListener("load", function(){
+				window.cookieconsent.initialise({
+					"palette": {
+						"popup": {
+							"background": "#0F538A"
+						},
+						"button": {
+							"background": "#E5E5E5"
+						}
+					},
+					"theme": "classic",
+					"content": {
+						"message": "{LA_COOKIE_CONSENT_MSG}",
+						"dismiss": "{LA_COOKIE_CONSENT_OK}",
+						"link": "{LA_COOKIE_CONSENT_INFO}",
+						"href": "{UA_PRIVACY}"
+					}
+				});
+			});
+		}
+	</script>
+<!-- ENDIF -->
+
+<!-- EVENT overall_footer_after -->
+
+<!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF -->
+{$SCRIPTS}
+
+<!-- EVENT overall_footer_body_after -->
+
+</body>
+</html>