mirror of
https://github.com/evennia/evennia.git
synced 2026-04-01 13:37:17 +02:00
Fixed placement of websocket javascript and template.
Fixed wrong readme in static. Moved backends.py into web/util
This commit is contained in:
parent
a1b596a847
commit
a34ddea236
6 changed files with 8 additions and 9 deletions
|
|
@ -1,7 +1,3 @@
|
|||
If you want to override one of the static files (such as a CSS or JS file) used by Evennia or a Django app installed in your Evennia project, copy it into this folder, and it will be placed in the static folder when you run:
|
||||
DO NOT EDIT FILES IN THIS DIRECTORY! THEY WILL BE OVERWRITTEN.
|
||||
|
||||
python manage.py collectstatic
|
||||
|
||||
or reload the server via the command line.
|
||||
|
||||
Do note you may have to reproduce any preceeding directory structures for the file to end up in the right place.
|
||||
If you need to edit static files, see the static_overrides directory.
|
||||
|
|
|
|||
|
|
@ -2,4 +2,6 @@ If you want to override one of the static files (such as a CSS or JS file) used
|
|||
|
||||
python manage.py collectstatic
|
||||
|
||||
...or when you reload the server via the command line.
|
||||
|
||||
Do note you may have to reproduce any preceeding directory structures for the file to end up in the right place.
|
||||
|
|
|
|||
|
|
@ -113,7 +113,8 @@ CYCLE_LOGFILES = True
|
|||
# http://www.postgresql.org/docs/8.0/interactive/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
|
||||
TIME_ZONE = 'UTC'
|
||||
# Authentication backends. This is the code used to authenticate a user.
|
||||
AUTHENTICATION_BACKENDS = ('src.web.backends.CaseInsensitiveModelBackend',)
|
||||
AUTHENTICATION_BACKENDS = (
|
||||
'src.web.utils.backends.CaseInsensitiveModelBackend',)
|
||||
# Language code for this installation. All choices can be found here:
|
||||
# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
|
||||
LANGUAGE_CODE = 'en-us'
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
if ("WebSocket" in window) {
|
||||
<!-- Importing the Evennia websocket webclient component (requires jQuery) -->
|
||||
var wsurl = "{{websocket_url}}";
|
||||
document.write("\<script src=\"/media/javascript/evennia_websocket_webclient.js\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
|
||||
document.write("\<script src=\"{% static "webclient/js/evennia_websocket_webclient.js" %}\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
|
||||
else {
|
||||
<!-- No websocket support in browser. Importing the Evennia ajax webclient component (requires jQuery) -->
|
||||
document.write("\<script src=\"{% static "webclient/js/evennia_ajax_webclient.js" %}\" type=\"text/javascript\" charset=\"utf-8\"\>\</script\>")}
|
||||
</script>
|
||||
{% else %}
|
||||
<!-- websocket not enabled; use ajax -->
|
||||
<script src="/media/javascript/evennia_ajax_webclient.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script src="{% static "webclient/js/evennia_ajax_webclient.js" %}" type="text/javascript" charset="utf-8"></script>
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue