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

Merge pull request #1434 from DamnedScholar/sekizai

Browse source 
Sekizai adapted to devel version of website.
This commit is contained in:
Griatch 2017-09-20 18:44:06 +02:00 • committed by GitHub
commit ab7cd3c101
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/settings_default.py
View file

@ -729,6 +729,7 @@ TEMPLATES = [{
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',
'django.template.context_processors.media', 'django.template.context_processors.media',
'django.template.context_processors.debug', 'django.template.context_processors.debug',
'sekizai.context_processors.sekizai',
'evennia.web.utils.general_context.general_context'] 'evennia.web.utils.general_context.general_context']
} }
}] }]

2
evennia/web/website/templates/website/base.html
View file

@ -1,4 +1,4 @@
{% load staticfiles %} {% load staticfiles sekizai_tags %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>

1
requirements.txt
View file

@ -6,3 +6,4 @@ mock >= 1.0.1
pillow == 2.9.0 pillow == 2.9.0
pytz pytz
future >= 0.15.2 future >= 0.15.2
django-sekizai

1
win_requirements.txt
View file

@ -9,3 +9,4 @@ mock >= 1.0.1
pillow == 2.9.0 pillow == 2.9.0
pytz pytz
future >= 0.15.2 future >= 0.15.2
django-sekizai