Use the Font Awesome 6.0.0 hosted version instead of 5.whatever ... note to self...

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index b9c9f3b3f3b3170d9f503fff6543591b41472625..f87f5f7bfcd4d1d7cc51432555e3cbbdc2cca6d6 100644 (file)
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -10,7 +10,7 @@
 <title>Citadel</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.6/css/all.css">
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.0.0/css/all.css">
 <link rel="stylesheet" href="css/w3.css">
 <link rel="stylesheet" href="css/webcit.css">
 
@@ -75,7 +75,6 @@ Loading...
 <!-- End page content -->
 </div>
 
-<script type="text/javascript" src="js/vars.js"></script>
 <script type="text/javascript" src="js/defs.js"></script>
 <script type="text/javascript" src="js/util.js"></script>
 <script type="text/javascript" src="js/login.js"></script>

diff --git a/webcit-ng/static/js/defs.js b/webcit-ng/static/js/defs.js
index 8eaa7b6f765b46dd5bbdd602cff969bb33dbd254..5d6d87aeb5c69a760d79649384be6e7502ecaab4 100644 (file)
--- a/webcit-ng/static/js/defs.js
+++ b/webcit-ng/static/js/defs.js
@@ -12,6 +12,25 @@
 // GNU General Public License for more details.
 
 
+// Placeholder for when we add i18n later
+function _(x) {
+       return x;
+}
+
+
+var current_room = "_BASEROOM_";
+var new_messages = 0;
+var total_messages = 0;
+var default_view = 0;
+var current_view = 0;
+var logged_in = 0;
+var current_user = _("Not logged in.");
+var serv_info;
+var last_seen = 0;
+var messages_per_page = 20;
+var march_list = [] ;
+
+
 // List of defined views shamelessly swiped from libcitadel headers
 //
 var views = {

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index dd9db01f1c7315661da07551b1646cdb45785705..9c8767572a6ce449350830cf1a04d84ad99d5914 100644 (file)
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -11,12 +11,6 @@
 // GNU General Public License for more details.
 
 
-// Placeholder for when we add i18n later
-function _(x) {
-       return x;
-}
-
-
 // This is called at the very beginning of the main page load.
 ctdl_startup = async() => {
        response = await fetch("/ctdl/c/info");
@@ -55,6 +49,9 @@ function update_banner() {
        if (current_room) {
                document.getElementById("ctdl_banner_title").innerHTML = current_room;
                document.title = current_room;
+
+
+
        }
        else {
                document.getElementById("ctdl_banner_title").innerHTML = serv_info.serv_humannode;
@@ -103,13 +100,11 @@ function gotonext(which_oper) {
 
        if ((which_oper == 1) || (which_oper == 2)) {           // Skip or Goto both take us to the "next" room
                if (march_list.length == 0) {
-                       console.log("Loading march list");
                        load_new_march_list(which_oper);        // we will recurse back here
                }
                else {
                        next_room = march_list[0].name;
                        march_list.splice(0, 1);
-                       console.log("going to " + next_room + " , " + march_list.length + " rooms remaining");
                        gotoroom(next_room);
                }
        }

diff --git a/webcit-ng/static/js/vars.js b/webcit-ng/static/js/vars.js
deleted file mode 100644 (file)
index 943aab3..0000000
--- a/webcit-ng/static/js/vars.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2016-2022 by the citadel.org team
-//
-// This program is open source software.  It runs great on the
-// Linux operating system (and probably elsewhere).  You can use,
-// copy, and run it under the terms of the GNU General Public
-// License version 3.  Richard Stallman is an asshole communist.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-
-var current_room = "_BASEROOM_";
-var new_messages = 0;
-var total_messages = 0;
-var default_view = 0;
-var current_view = 0;
-var logged_in = 0;
-var current_user = _("Not logged in.");
-var serv_info;
-var last_seen = 0;
-var messages_per_page = 20;
-var march_list = [] ;