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

Web stuff is once again working with the development server. This is mostly useful for the admin interface.

Browse source
This commit is contained in:
Greg Taylor 2008-12-15 04:43:48 +00:00
parent 5249f27074
commit 714804e253
7 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
game/web/apps/news/models.py
View file

@ -8,7 +8,9 @@ class NewsTopic(models.Model):
""" """
name = models.CharField(max_length=75, unique=True) name = models.CharField(max_length=75, unique=True)
description = models.TextField(blank=True) description = models.TextField(blank=True)
icon = models.ImageField(upload_to='newstopic_icons', default='newstopic_icons/default.png', blank=True, help_text="Image for the news topic.") icon = models.ImageField(upload_to='newstopic_icons',
default='newstopic_icons/default.png',
blank=True, help_text="Image for the news topic.")
def __str__(self): def __str__(self):
try: try:

2
game/web/apps/news/urls.py
View file

@ -1,6 +1,6 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
urlpatterns = patterns('webapps.news.views', urlpatterns = patterns('game.web.apps.news.views',
(r'^show/(?P<entry_id>\d+)/$', 'show_news'), (r'^show/(?P<entry_id>\d+)/$', 'show_news'),
(r'^archive/$', 'news_archive'), (r'^archive/$', 'news_archive'),
(r'^search/$', 'search_form'), (r'^search/$', 'search_form'),

2
game/web/apps/news/views.py
View file

@ -13,7 +13,7 @@ from django.contrib.auth.models import User
from django import forms from django import forms
from django.db.models import Q from django.db.models import Q
from webapps.news.models import NewsTopic, NewsEntry from game.web.apps.news.models import NewsTopic, NewsEntry
# The sidebar text to be included as a variable on each page. There's got to # The sidebar text to be included as a variable on each page. There's got to
# be a better, cleaner way to include this on every page. # be a better, cleaner way to include this on every page.

2
game/web/apps/website/urls.py
View file

@ -1,5 +1,5 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
urlpatterns = patterns('webapps.website.views', urlpatterns = patterns('game.web.apps.website.views',
(r'^$', 'page_index'), (r'^$', 'page_index'),
) )

4
game/web/apps/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.template import RequestContext
from django.contrib.auth.models import User from django.contrib.auth.models import User
from apps.objects.models import Object from src.objects.models import Object
from webapps.news.models import NewsEntry from game.web.apps.news.models import NewsEntry
""" """
This file contains the generic, assorted views that don't fall under one of This file contains the generic, assorted views that don't fall under one of

2
game/web/apps/website/webcontext.py
View file

@ -1,4 +1,4 @@
from apps.config.models import ConfigValue from src.config.models import ConfigValue
def general_context(request): def general_context(request):
""" """

6
game/web/urls.py
View file

@ -16,13 +16,13 @@ urlpatterns = patterns('',
url(r'^accounts/logout', 'django.contrib.auth.views.logout'), url(r'^accounts/logout', 'django.contrib.auth.views.logout'),
# Front page # Front page
url(r'^', include('webapps.website.urls')), url(r'^', include('game.web.apps.website.urls')),
# News stuff # News stuff
url(r'^news/', include('webapps.news.urls')), url(r'^news/', include('game.web.apps.news.urls')),
# Page place-holder for things that aren't implemented yet. # Page place-holder for things that aren't implemented yet.
url(r'^tbi/', 'webapps.website.views.to_be_implemented'), url(r'^tbi/', 'game.web.apps.website.views.to_be_implemented'),
# Admin interface # Admin interface
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/doc/', include('django.contrib.admindocs.urls')),