Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored the webclient layout to correctly identify the template.

Browse source
This commit is contained in:
Griatch 2016-02-08 20:57:19 +01:00
parent 0219c726dc
commit f42d27a459
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/settings_default.py
View file

@ -594,13 +594,18 @@ STATICFILES_DIRS = (
STATICFILES_IGNORE_PATTERNS = ('README.md',) STATICFILES_IGNORE_PATTERNS = ('README.md',)
# The name of the currently selected web template. This corresponds to the # The name of the currently selected web template. This corresponds to the
# directory names shown in the templates directory. # directory names shown in the templates directory.
ACTIVE_TEMPLATE = 'website' WEBSITE_TEMPLATE = 'website'
WEBCLIENT_TEMPLATE = 'webclient'
# We setup the location of the website template as well as the admin site. # We setup the location of the website template as well as the admin site.
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
os.path.join(GAME_DIR, "web", "template_overrides", ACTIVE_TEMPLATE), os.path.join(GAME_DIR, "web", "template_overrides", WEBSITE_TEMPLATE),
os.path.join(GAME_DIR, "web", "template_overrides", WEBCLIENT_TEMPLATE),
os.path.join(GAME_DIR, "web", "template_overrides"), os.path.join(GAME_DIR, "web", "template_overrides"),
os.path.join(EVENNIA_DIR, "web", "website", "templates", ACTIVE_TEMPLATE), os.path.join(EVENNIA_DIR, "web", "website", "templates", WEBSITE_TEMPLATE),
os.path.join(EVENNIA_DIR, "web", "website", "templates"),) os.path.join(EVENNIA_DIR, "web", "website", "templates"),
os.path.join(EVENNIA_DIR, "web", "webclient", "templates", WEBCLIENT_TEMPLATE),
os.path.join(EVENNIA_DIR, "web", "webclient", "templates"),)
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = ( TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader', 'django.template.loaders.filesystem.Loader',

0
evennia/web/webclient/templates/base.html → evennia/web/webclient/templates/webclient/base.html
View file

4
evennia/web/webclient/templates/webclient.html → evennia/web/webclient/templates/webclient/webclient.html
View file

@ -1,8 +1,10 @@
{% extends base.html %} {% extends "webclient/base.html" %}
{% block connecting %} {% block connecting %}
{% endblock %} {% endblock %}
{% block client %} {% block client %}
<h1>Webclient!</h1>
{% endblock %} {% endblock %}