* Rename project from ee to xerxes.

diff --git a/import.py b/import.py
index df1a1acb87e4f47bad9da600fa589239e04e2055..58205ac59deba2d7d07fbcf24784736ca807a463 100644 (file)
--- 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 6ce979c582f183af1a9142fd05624b8f4a022829..34de0b9f0ac04868169b9cbf15844b7e9a3c5cbf 100644 (file)
--- 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 1ab2d221a32d357b253db5e773afdd16be770f7f..e5391128abf1a37f57dbfa4925e257ced66c9aa9 100644 (file)
--- 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 9393d9494882b9fae7dd0883e9edfca9f03b3c3b..15de0b1e83fafd310d4bb4f3a68c2bd7c7e53535 100644 (file)
--- 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 74f10837bbb3eaee3e61955c7028a6093f03c29d..bc0b4d84336d95f835f31b6dc1a8a6cb34b22914 100644 (file)
--- 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 fe0438f41b8ff9d01b76e84a280c640820c3f7f0..9fed21d348fdd11448115409dc626cbf01d746a6 100644 (file)
--- 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<object_id>\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<object_id>\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<object_id>\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<object_id>\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'),