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

Fixed the login/out links on the default website. Cleaned up some template lookups.

Browse source
This commit is contained in:
Griatch 2016-01-23 22:15:08 +01:00
parent 4fd06b8976
commit 9ddd0ecf33
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/web/website/urls.py
View file

@ -15,9 +15,8 @@ urlpatterns = [
url(r'^$', 'evennia.web.website.views.page_index', name="index"), url(r'^$', 'evennia.web.website.views.page_index', name="index"),
url(r'^tbi/', 'evennia.web.website.views.to_be_implemented', name='to_be_implemented'), url(r'^tbi/', 'evennia.web.website.views.to_be_implemented', name='to_be_implemented'),
# User Authentication # User Authentication (makes login/logout url names available)
url(r'^accounts/login', 'django.contrib.auth.views.login', name="login"), url(r'^authenticate', include('django.contrib.auth.urls')),
url(r'^accounts/logout', 'django.contrib.auth.views.logout', name="logout"),
# Django original admin page. Make this URL is always available, whether # Django original admin page. Make this URL is always available, whether
# we've chosen to use Evennia's custom admin or not. # we've chosen to use Evennia's custom admin or not.

6
evennia/web/website/views.py
View file

@ -53,7 +53,7 @@ def page_index(request):
"num_others": nothers or "no" "num_others": nothers or "no"
} }
return render(request, 'website/index.html', pagevars) return render(request, 'index.html', pagevars)
def to_be_implemented(request): def to_be_implemented(request):
@ -66,7 +66,7 @@ def to_be_implemented(request):
"page_title": "To Be Implemented...", "page_title": "To Be Implemented...",
} }
return render(request, 'website/tbi.html', pagevars) return render(request, 'tbi.html', pagevars)
@staff_member_required @staff_member_required
@ -75,7 +75,7 @@ def evennia_admin(request):
Helpful Evennia-specific admin page. Helpful Evennia-specific admin page.
""" """
return render( return render(
request, 'website/evennia_admin.html', { request, 'evennia_admin.html', {
'playerdb': PlayerDB}) 'playerdb': PlayerDB})