diff --git a/game/web/apps/news/models.py b/game/web/apps/news/models.py index a347588281..b90e469118 100755 --- a/game/web/apps/news/models.py +++ b/game/web/apps/news/models.py @@ -8,7 +8,9 @@ class NewsTopic(models.Model): """ name = models.CharField(max_length=75, unique=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): try: diff --git a/game/web/apps/news/urls.py b/game/web/apps/news/urls.py index 535c744661..21b7cf3882 100755 --- a/game/web/apps/news/urls.py +++ b/game/web/apps/news/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import * -urlpatterns = patterns('webapps.news.views', +urlpatterns = patterns('game.web.apps.news.views', (r'^show/(?P\d+)/$', 'show_news'), (r'^archive/$', 'news_archive'), (r'^search/$', 'search_form'), diff --git a/game/web/apps/news/views.py b/game/web/apps/news/views.py index eefd45ea8a..eaf73ad745 100755 --- a/game/web/apps/news/views.py +++ b/game/web/apps/news/views.py @@ -13,7 +13,7 @@ from django.contrib.auth.models import User from django import forms 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 # be a better, cleaner way to include this on every page. diff --git a/game/web/apps/website/urls.py b/game/web/apps/website/urls.py index 1868098887..83e0d0ad39 100644 --- a/game/web/apps/website/urls.py +++ b/game/web/apps/website/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * -urlpatterns = patterns('webapps.website.views', +urlpatterns = patterns('game.web.apps.website.views', (r'^$', 'page_index'), ) diff --git a/game/web/apps/website/views.py b/game/web/apps/website/views.py index cc3a52b7a2..2920cf3ecf 100644 --- a/game/web/apps/website/views.py +++ b/game/web/apps/website/views.py @@ -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 +from src.objects.models import Object +from game.web.apps.news.models import NewsEntry """ This file contains the generic, assorted views that don't fall under one of diff --git a/game/web/apps/website/webcontext.py b/game/web/apps/website/webcontext.py index b26fe9470a..c123ddbeaa 100644 --- a/game/web/apps/website/webcontext.py +++ b/game/web/apps/website/webcontext.py @@ -1,4 +1,4 @@ -from apps.config.models import ConfigValue +from src.config.models import ConfigValue def general_context(request): """ diff --git a/game/web/urls.py b/game/web/urls.py index c9845197ee..230929f80d 100755 --- a/game/web/urls.py +++ b/game/web/urls.py @@ -16,13 +16,13 @@ urlpatterns = patterns('', url(r'^accounts/logout', 'django.contrib.auth.views.logout'), # Front page - url(r'^', include('webapps.website.urls')), + url(r'^', include('game.web.apps.website.urls')), # 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. - url(r'^tbi/', 'webapps.website.views.to_be_implemented'), + url(r'^tbi/', 'game.web.apps.website.views.to_be_implemented'), # Admin interface url(r'^admin/doc/', include('django.contrib.admindocs.urls')),