From ceefd1eef134c2ebda78591e0ffcbbef8c45c81d Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Mon, 19 Mar 2018 11:20:08 -0400
Subject: [PATCH] fix webclient/base.html (500 error)

---
 .../webclient/templates/webclient/base.html   | 100 +++++++-----------
 1 file changed, 37 insertions(+), 63 deletions(-)

diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index 3852b45273..a5c65fad2c 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -13,16 +13,18 @@ JQuery available.
     <meta http-equiv="content-type", content="application/xhtml+xml; charset=UTF-8" />
     <meta name="author" content="Evennia" />
     <meta name="generator" content="Evennia" />
-
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
 
+    <link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
+
+    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
+
     <!-- Import JQuery and warn if there is a problem -->
     {% block jquery_import %}
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js" type="text/javascript" charset="utf-8"></script>
+      <script src="https://code.jquery.com/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
     {% endblock %}
 
     <script type="text/javascript" charset="utf-8">
@@ -31,6 +33,14 @@ JQuery available.
         }
     </script>
 
+    <!-- This is will only fire if javascript is actually active -->
+    <script language="javascript" type="text/javascript">
+      $(document).ready(function() {
+        $('#noscript').remove();
+        $('#clientwrapper').removeClass('d-none');
+      })
+    </script>
+
     <!-- Set up Websocket url and load the evennia.js library-->
     <script language="javascript" type="text/javascript">
         {% if websocket_enabled %}
@@ -53,12 +63,29 @@ JQuery available.
     </script>
     <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
 
-    <link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
+
+    <!-- set up splits before loading the GUI -->
+    <script src="https://unpkg.com/split.js/split.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
+    <script src={% static "webclient/js/splithandler.js" %} language="javascript"></script>
+
+    <!-- Load gui library -->
+    {% block guilib_import %}
+        <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
+    {% endblock %}
 
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" charset="utf-8">
+        if(!window.Favico) {
+            document.write("<div class='err'>Favico.js library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
+        }
+    </script>
 
-    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
-
+    <!-- jQuery first, then Tether, then Bootstrap JS. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
+    {% block scripts %}
+    {% endblock %}
   </head>
   <body>
 
@@ -74,6 +101,10 @@ JQuery available.
             web browser supporting javascript. <p>
             This error could also be due to not being able to access
             the online jQuery javascript library.</p>
+        <!-- This is will only fire if javascript is actually active -->
+        <script language="javascript" type="text/javascript">
+            $('#noscript').remove();
+        </script>
     </div>
 
     <!-- main client -->
@@ -81,62 +112,5 @@ JQuery available.
         {% block client %}
         {% endblock %}
     </div>
-
-
-    <!-- Import JQuery and warn if there is a problem -->
-    {% block jquery_import %}
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
-    <script type="text/javascript" charset="utf-8">
-      if(!window.jQuery) {
-        document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
-      }
-    </script>
-
-    <!-- This is will only fire if javascript is actually active -->
-    <script language="javascript" type="text/javascript">
-      $(document).ready(function() {
-        $('#noscript').remove();
-        $('#clientwrapper').removeClass('d-none');
-      })
-    </script>
-
-    <!-- Set up Websocket url and load the evennia.js library-->
-    <script language="javascript" type="text/javascript">
-      {% if websocket_enabled %}
-        var wsactive = true;
-      {% else %}
-        var wsactive = false;
-      {% endif %}
-      {% if browser_sessid %}
-        var csessid = "{{browser_sessid}}";
-      {% else %}
-        var csessid = false;
-      {% endif %}
-      {% if websocket_url %}
-        var wsurl = "{{websocket_url}}";
-      {% else %}
-        var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
-      {% endif %}
-    </script>
-
-    <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
-
-    <!-- set up splits before loading the GUI -->
-    <script src="https://unpkg.com/split.js/split.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
-    <script src={% static "webclient/js/splithandler.js" %} language="javascript"></script>
-
-    <!-- Load gui library -->
-    {% block guilib_import %}
-    <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
-    <!-- jQuery first, then Tether, then Bootstrap JS. -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
-    {% block scripts %}
-    {% endblock %}
   </body>
 </html>