From: Matthijs Kooijman Date: Mon, 11 Feb 2008 14:05:47 +0000 (+0100) Subject: * Rename project from ee to xerxes. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=e0a6b803cd22cdf9b2b5a1e70cfaf4d377c7efa3;p=matthijs%2Fprojects%2Fxerxes.git * Rename project from ee to xerxes. --- diff --git a/import.py b/import.py index df1a1ac..58205ac 100644 --- a/import.py +++ b/import.py @@ -2,11 +2,11 @@ import sys import os sys.path = sys.path + [os.path.dirname(os.path.dirname(os.path.abspath(__file__)))] -os.environ['DJANGO_SETTINGS_MODULE']='ee.settings' +os.environ['DJANGO_SETTINGS_MODULE']='xerxes.settings' import MySQLdb from django.contrib.auth.models import User -from ee.base.models import UserProfile +from xerxes.base.models import UserProfile from datetime import datetime conn = MySQLdb.connect( diff --git a/influences/notify.py b/influences/notify.py index 6ce979c..34de0b9 100644 --- a/influences/notify.py +++ b/influences/notify.py @@ -1,8 +1,8 @@ from django.db.models import signals from django.dispatch import dispatcher from django.conf import settings -from ee.influences.models import Character,Influence -from ee.tools.notify import notify +from xerxes.influences.models import Character,Influence +from xerxes.tools.notify import notify from django.contrib.auth.models import Group def character_saved(instance, created): diff --git a/influences/views.py b/influences/views.py index 1ab2d22..e539112 100644 --- a/influences/views.py +++ b/influences/views.py @@ -7,9 +7,9 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, HttpResponseForbidden from django.views.generic.list_detail import object_detail, object_list -from ee.influences.models import Character -from ee.influences.models import Influence -from ee.tools.forms import ContextModelForm +from xerxes.influences.models import Character +from xerxes.influences.models import Influence +from xerxes.tools.forms import ContextModelForm diff --git a/settings.py b/settings.py index 9393d94..15de0b1 100644 --- a/settings.py +++ b/settings.py @@ -1,4 +1,4 @@ -# Django settings for ee project. +# Django settings for xerxes project. import os @@ -50,7 +50,7 @@ MEDIA_ROOT = '' MEDIA_URL = '' # URL prefix for static files. Will be made available by -# ee.tools.context_processors.static +# xerxes.tools.context_processors.static STATIC_URL_PREFIX = '/static/' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a @@ -78,7 +78,7 @@ MIDDLEWARE_CLASSES = ( #'django.middleware.locale.LocaleMiddleware', ) -ROOT_URLCONF = 'ee.urls' +ROOT_URLCONF = 'xerxes.urls' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". @@ -93,10 +93,10 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', - 'ee.events', - 'ee.influences', - 'ee.base', - 'ee.tools', + 'xerxes.events', + 'xerxes.influences', + 'xerxes.base', + 'xerxes.tools', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -104,7 +104,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.debug", "django.core.context_processors.i18n", # Add STATIC_URL_PREFIX to the context - "ee.tools.context_processors.static", + "xerxes.tools.context_processors.static", ) LOGIN_URL = "/accounts/login/" @@ -113,7 +113,7 @@ LOGIN_REDIRECT_URL = "/influences/" # Allow authentication against the phpb user accounts AUTHENTICATION_BACKENDS = ( - 'ee.auth.PhpBBBackend', + 'xerxes.auth.PhpBBBackend', 'django.contrib.auth.backends.ModelBackend', ) diff --git a/tools/notify.py b/tools/notify.py index 74f1083..bc0b4d8 100644 --- a/tools/notify.py +++ b/tools/notify.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User,Group from django.core.mail import EmailMessage from django.template import loader -from ee.tools.misc import make_iter +from xerxes.tools.misc import make_iter """ Notify someone about something. diff --git a/urls.py b/urls.py index fe0438f..9fed21d 100644 --- a/urls.py +++ b/urls.py @@ -1,22 +1,22 @@ from django.conf import settings from django.conf.urls.defaults import * -from ee.influences.models import Character -from ee.influences.models import Influence +from xerxes.influences.models import Character +from xerxes.influences.models import Influence import os urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}), url(r'^admin/', include('django.contrib.admin.urls')), - url(r'^influences/$', 'ee.influences.views.index', name='influences_index'), - url(r'^influences/influence/$', 'ee.influences.views.influence_list', name='influences_influence_list'), - url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_detail'), - url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add_influence', name='influences_add_influence_for_character'), - url(r'^influences/influence/add/$', 'ee.influences.views.add_influence', name='influences_add_influence'), + url(r'^influences/$', 'xerxes.influences.views.index', name='influences_index'), + url(r'^influences/influence/$', 'xerxes.influences.views.influence_list', name='influences_influence_list'), + url(r'^influences/influence/(?P\d+)/$', 'xerxes.influences.views.influence_detail', name='influences_influence_detail'), + url(r'^influences/influence/add/(\d+)/$', 'xerxes.influences.views.add_influence', name='influences_add_influence_for_character'), + url(r'^influences/influence/add/$', 'xerxes.influences.views.add_influence', name='influences_add_influence'), - url(r'^influences/character/$', 'ee.influences.views.character_list', name='influences_character_list'), - url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', name='influences_character_detail'), - url(r'^influences/character/add/$', 'ee.influences.views.add_character', name='influences_add_character'), + url(r'^influences/character/$', 'xerxes.influences.views.character_list', name='influences_character_list'), + url(r'^influences/character/(?P\d+)/$', 'xerxes.influences.views.character_detail', name='influences_character_detail'), + url(r'^influences/character/add/$', 'xerxes.influences.views.add_character', name='influences_add_character'), url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),