Merge pull request #1 from chainsol/friarzen_webclient
Fixed 500 Error in Webclient
This commit is contained in:
Brenden Tuck
GitHub
commit
41db89f0bf
1 changed files with 37 additions and 63 deletions
|
|
@ -13,76 +13,15 @@ JQuery available.
|
||||||
<meta http-equiv="content-type", content="application/xhtml+xml; charset=UTF-8" />
|
<meta http-equiv="content-type", content="application/xhtml+xml; charset=UTF-8" />
|
||||||
<meta name="author" content="Evennia" />
|
<meta name="author" content="Evennia" />
|
||||||
<meta name="generator" content="Evennia" />
|
<meta name="generator" content="Evennia" />
|
||||||
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||||
|
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- 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" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
|
||||||
|
|
||||||
<!-- 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>
|
|
||||||
{% 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. Check so Javascript is not blocked in your browser.</div>");
|
|
||||||
}
|
|
||||||
</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>
|
|
||||||
|
|
||||||
<link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
|
<link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
|
<link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div id="connecting">
|
|
||||||
{% block connecting %}
|
|
||||||
{% endblock %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="noscript" class="err">
|
|
||||||
<h3>Javascript Error: The Evennia MUD client requires that you
|
|
||||||
have Javascript activated.</h3>
|
|
||||||
<p>Turn off eventual script blockers and/or switch to a
|
|
||||||
web browser supporting javascript. <p>
|
|
||||||
This error could also be due to not being able to access
|
|
||||||
the online jQuery javascript library.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- main client -->
|
|
||||||
<div id=clientwrapper class="d-none">
|
|
||||||
{% block client %}
|
|
||||||
{% endblock %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Import JQuery and warn if there is a problem -->
|
<!-- Import JQuery and warn if there is a problem -->
|
||||||
{% block jquery_import %}
|
{% block jquery_import %}
|
||||||
<script src="https://code.jquery.com/jquery-3.2.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>
|
||||||
|
|
@ -90,7 +29,7 @@ JQuery available.
|
||||||
|
|
||||||
<script type="text/javascript" charset="utf-8">
|
<script type="text/javascript" charset="utf-8">
|
||||||
if(!window.jQuery) {
|
if(!window.jQuery) {
|
||||||
document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
|
document.write("<div class='err'>jQuery library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
@ -109,20 +48,22 @@ JQuery available.
|
||||||
{% else %}
|
{% else %}
|
||||||
var wsactive = false;
|
var wsactive = false;
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if browser_sessid %}
|
{% if browser_sessid %}
|
||||||
var csessid = "{{browser_sessid}}";
|
var csessid = "{{browser_sessid}}";
|
||||||
{% else %}
|
{% else %}
|
||||||
var csessid = false;
|
var csessid = false;
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if websocket_url %}
|
{% if websocket_url %}
|
||||||
var wsurl = "{{websocket_url}}";
|
var wsurl = "{{websocket_url}}";
|
||||||
{% else %}
|
{% else %}
|
||||||
var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
|
var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
|
<script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
|
||||||
|
|
||||||
|
|
||||||
<!-- set up splits before loading the GUI -->
|
<!-- set up splits before loading the GUI -->
|
||||||
<script src="https://unpkg.com/split.js/split.min.js"></script>
|
<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="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
|
||||||
|
|
@ -133,10 +74,43 @@ JQuery available.
|
||||||
<script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
|
<script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
|
||||||
{% endblock %}
|
{% 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>
|
||||||
|
|
||||||
<!-- jQuery first, then Tether, then Bootstrap JS. -->
|
<!-- 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://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>
|
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<div id="connecting">
|
||||||
|
{% block connecting %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="noscript" class="err">
|
||||||
|
<h3>Javascript Error: The Evennia MUD client requires that you
|
||||||
|
have Javascript activated.</h3>
|
||||||
|
<p>Turn off eventual script blockers and/or switch to a
|
||||||
|
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 -->
|
||||||
|
<div id=clientwrapper class="d-none">
|
||||||
|
{% block client %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue