Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-23 16:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Evennia once again runs on the latest trunk. Admin interface is still broken pending transition to newforms-admins stuff.

Browse source
This commit is contained in:
Greg Taylor 2008-11-05 18:08:51 +00:00
parent 72df223b3a
commit 75c38ada19
5 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
settings_common.py
View file

@ -13,10 +13,11 @@ TEMPLATE_LOADERS = (
# Context processors define context variables, generally for the template
# system to use.
TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.request',
'django.core.context_processors.auth',
'django.core.context_processors.media',
'django.core.context_processors.debug',
'webapps.website.webcontext.general_context',
)

6
urls.py
View file

@ -18,13 +18,13 @@ urlpatterns = patterns('',
(r'^admin/', include('django.contrib.admin.urls')),
# Front page
(r'^', include('apps.website.urls')),
(r'^', include('webapps.website.urls')),
# News stuff
(r'^news/', include('apps.news.urls')),
(r'^news/', include('webapps.news.urls')),
# Page place-holder for things that aren't implemented yet.
(r'^tbi/', 'apps.website.views.to_be_implemented'),
(r'^tbi/', 'webapps.website.views.to_be_implemented'),
)
# If you'd like to serve media files via Django (strongly not recommended!),

14
webapps/website/views.py
View file

@ -2,8 +2,8 @@ from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.contrib.auth.models import User
from apps.objects.models import Object
from webapps.news.models import NewsEntry
import functions_db
"""
This file contains the generic, assorted views that don't fall under one of
@ -22,18 +22,18 @@ def page_index(request):
# A QuerySet of recent news entries.
news_entries = NewsEntry.objects.all().order_by('-date_posted')[:fpage_news_entries]
# Dictionary containing database statistics.
objstats = functions_db.object_totals()
objstats = Object.objects.object_totals()
# A QuerySet of the most recently connected players.
recent_players = functions_db.get_recently_connected_players()[:fpage_player_limit]
recent_players = Object.objects.get_recently_connected_users()[:fpage_player_limit]
pagevars = {
"page_title": "Front Page",
"news_entries": news_entries,
"players_connected_recent": recent_players,
"num_players_connected": functions_db.get_connected_players().count(),
"num_players_registered": functions_db.num_total_players(),
"num_players_connected_recent": functions_db.get_recently_connected_players().count(),
"num_players_registered_recent": functions_db.get_recently_created_players().count(),
"num_players_connected": Object.objects.get_connected_players().count(),
"num_players_registered": Object.objects.num_total_players(),
"num_players_connected_recent": Object.objects.get_recently_connected_users().count(),
"num_players_registered_recent": Object.objects.get_recently_created_users().count(),
"num_players": objstats["players"],
"num_rooms": objstats["rooms"],
"num_things": objstats["things"],

4
webapps/website/webcontext.py
View file

@ -1,9 +1,9 @@
import gameconf
from apps.config.models import ConfigValue
def general_context(request):
"""
Returns common Evennia-related context stuff.
"""
return {
'game_name': gameconf.get_configvalue('site_name'),
'game_name': ConfigValue.objects.get_configvalue('site_name'),
}

8
webtemplates/prosimii/base.html
View file

@ -8,12 +8,12 @@
<meta name="generator" content="haran" />
{% if sidebar %}
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
{% else %}
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen.css" media="screen" title="Prosimii" />
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-screen.css" media="screen" title="Prosimii" />
{% endif %}
<link rel="stylesheet alternative" type="text/css" href="{{media_url}}css/prosimii-print.css" media="screen" title="Print Preview" />
<link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-print.css" media="print" />
<link rel="stylesheet alternative" type="text/css" href="{{MEDIA_URL}}css/prosimii-print.css" media="screen" title="Print Preview" />
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-print.css" media="print" />
{% block header_ext %}
{% endblock %}