Rename admin to hamnadmin, so we don't conflict with django admin module

diff --git a/admin/register/urls.py b/admin/register/urls.py
deleted file mode 100644 (file)
index 7f01800..0000000
--- a/admin/register/urls.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.conf.urls.defaults import *
-from django.contrib.auth.views import login, logout, logout_then_login
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    (r'^$', 'admin.register.views.root'),
-    (r'^new/$', 'admin.register.views.new'),
-    (r'^approve/(\d+)/$', 'admin.register.views.approve'),
-    (r'^unapprove/(\d+)/$', 'admin.register.views.unapprove'),
-    (r'^discover/(\d+)/$', 'admin.register.views.discover'),
-    (r'^undiscover/(\d+)/$', 'admin.register.views.undiscover'),
-    (r'^detach/(\d+)/$', 'admin.register.views.detach'),
-    (r'^delete/(\d+)/$', 'admin.register.views.delete'),
-    (r'^modify/(\d+)/$', 'admin.register.views.modify'),
-    (r'^modifyauthorfilter/(\d+)/$', 'admin.register.views.modifyauthorfilter'),
-
-    (r'^log/(\d+)/$','admin.register.views.logview'),
-    (r'^blogposts/(\d+)/$', 'admin.register.views.blogposts'),
-    (r'^blogposts/(\d+)/hide/(\d+)/$', 'admin.register.views.blogpost_hide'),
-    (r'^blogposts/(\d+)/unhide/(\d+)/$', 'admin.register.views.blogpost_unhide'),
-    (r'^blogposts/(\d+)/delete/(\d+)/$', 'admin.register.views.blogpost_delete'),
-
-    (r'^login/$', login),
-    (r'^logout/$', logout_then_login, {'login_url':'/'}),
-)

diff --git a/admin/.gitignore b/hamnadmin/.gitignore
similarity index 100%
rename from admin/.gitignore
rename to hamnadmin/.gitignore

diff --git a/admin/__init__.py b/hamnadmin/__init__.py
similarity index 100%
rename from admin/__init__.py
rename to hamnadmin/__init__.py

diff --git a/admin/admin.wsgi b/hamnadmin/admin.wsgi
similarity index 100%
rename from admin/admin.wsgi
rename to hamnadmin/admin.wsgi

diff --git a/admin/auth.py b/hamnadmin/auth.py
similarity index 100%
rename from admin/auth.py
rename to hamnadmin/auth.py

diff --git a/admin/exceptions.py b/hamnadmin/exceptions.py
similarity index 100%
rename from admin/exceptions.py
rename to hamnadmin/exceptions.py

diff --git a/admin/local_settings.py.sample b/hamnadmin/local_settings.py.sample
similarity index 100%
rename from admin/local_settings.py.sample
rename to hamnadmin/local_settings.py.sample

diff --git a/admin/manage.py b/hamnadmin/manage.py
similarity index 100%
rename from admin/manage.py
rename to hamnadmin/manage.py

diff --git a/admin/register/__init__.py b/hamnadmin/register/__init__.py
similarity index 100%
rename from admin/register/__init__.py
rename to hamnadmin/register/__init__.py

diff --git a/admin/register/models.py b/hamnadmin/register/models.py
similarity index 100%
rename from admin/register/models.py
rename to hamnadmin/register/models.py

diff --git a/admin/register/templates/404.html b/hamnadmin/register/templates/404.html
similarity index 100%
rename from admin/register/templates/404.html
rename to hamnadmin/register/templates/404.html

diff --git a/admin/register/templates/500.html b/hamnadmin/register/templates/500.html
similarity index 100%
rename from admin/register/templates/500.html
rename to hamnadmin/register/templates/500.html

diff --git a/admin/register/templates/aggregatorlog.html b/hamnadmin/register/templates/aggregatorlog.html
similarity index 100%
rename from admin/register/templates/aggregatorlog.html
rename to hamnadmin/register/templates/aggregatorlog.html

diff --git a/admin/register/templates/blogposts.html b/hamnadmin/register/templates/blogposts.html
similarity index 100%
rename from admin/register/templates/blogposts.html
rename to hamnadmin/register/templates/blogposts.html

diff --git a/admin/register/templates/index.html b/hamnadmin/register/templates/index.html
similarity index 100%
rename from admin/register/templates/index.html
rename to hamnadmin/register/templates/index.html

diff --git a/admin/register/templates/internal_error.html b/hamnadmin/register/templates/internal_error.html
similarity index 100%
rename from admin/register/templates/internal_error.html
rename to hamnadmin/register/templates/internal_error.html

diff --git a/admin/register/templates/regbase.html b/hamnadmin/register/templates/regbase.html
similarity index 100%
rename from admin/register/templates/regbase.html
rename to hamnadmin/register/templates/regbase.html

diff --git a/admin/register/templates/registration/login.html b/hamnadmin/register/templates/registration/login.html
similarity index 100%
rename from admin/register/templates/registration/login.html
rename to hamnadmin/register/templates/registration/login.html

diff --git a/hamnadmin/register/urls.py b/hamnadmin/register/urls.py
new file mode 100644 (file)
index 0000000..3608a7d
--- /dev/null
+++ b/hamnadmin/register/urls.py
@@ -0,0 +1,28 @@
+from django.conf.urls.defaults import *
+from django.contrib.auth.views import login, logout, logout_then_login
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# hamnadmin.autodiscover()
+
+urlpatterns = patterns('',
+    (r'^$', 'hamnadmin.register.views.root'),
+    (r'^new/$', 'hamnadmin.register.views.new'),
+    (r'^approve/(\d+)/$', 'hamnadmin.register.views.approve'),
+    (r'^unapprove/(\d+)/$', 'hamnadmin.register.views.unapprove'),
+    (r'^discover/(\d+)/$', 'hamnadmin.register.views.discover'),
+    (r'^undiscover/(\d+)/$', 'hamnadmin.register.views.undiscover'),
+    (r'^detach/(\d+)/$', 'hamnadmin.register.views.detach'),
+    (r'^delete/(\d+)/$', 'hamnadmin.register.views.delete'),
+    (r'^modify/(\d+)/$', 'hamnadmin.register.views.modify'),
+    (r'^modifyauthorfilter/(\d+)/$', 'hamnadmin.register.views.modifyauthorfilter'),
+
+    (r'^log/(\d+)/$','hamnadmin.register.views.logview'),
+    (r'^blogposts/(\d+)/$', 'hamnadmin.register.views.blogposts'),
+    (r'^blogposts/(\d+)/hide/(\d+)/$', 'hamnadmin.register.views.blogpost_hide'),
+    (r'^blogposts/(\d+)/unhide/(\d+)/$', 'hamnadmin.register.views.blogpost_unhide'),
+    (r'^blogposts/(\d+)/delete/(\d+)/$', 'hamnadmin.register.views.blogpost_delete'),
+
+    (r'^login/$', login),
+    (r'^logout/$', logout_then_login, {'login_url':'/'}),
+)

diff --git a/admin/register/views.py b/hamnadmin/register/views.py
similarity index 99%
rename from admin/register/views.py
rename to hamnadmin/register/views.py
index 3efd77fa71a4e276ca79e5a12f996371c5c659b5..e5f5ff7f1ff7d74765bc75b366944eda5ccf203d 100644 (file)
--- a/admin/register/views.py
+++ b/hamnadmin/register/views.py
@@ -6,8 +6,8 @@ from django.conf import settings
 from django.core.mail import send_mail
 from django.db import transaction
 
-from admin.register.models import *
-from admin.exceptions import pExcept
+from hamnadmin.register.models import *
+from hamnadmin.exceptions import pExcept
 
 import socket
 import feedparser

diff --git a/admin/settings.py b/hamnadmin/settings.py
similarity index 92%
rename from admin/settings.py
rename to hamnadmin/settings.py
index 1a9a8b529141fbb9f575a0a42aaf72ed0ff0f938..26c93fb951fddc0279cedf09b0f57b2ce7de6218 100644 (file)
--- a/admin/settings.py
+++ b/hamnadmin/settings.py
@@ -38,10 +38,10 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'admin.exceptions.PlanetExceptionMiddleware',
+    'hamnadmin.exceptions.PlanetExceptionMiddleware',
 )
 
-ROOT_URLCONF = 'admin.urls'
+ROOT_URLCONF = 'hamnadmin.urls'
 
 TEMPLATE_DIRS = (
     # Refer back to main planet templates
@@ -53,11 +53,11 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'admin.register',
+    'hamnadmin.register',
 )
 
 AUTHENTICATION_BACKENDS = (
-    'admin.auth.AuthBackend',
+    'hamnadmin.auth.AuthBackend',
 )
 
 LOGIN_URL = '/register/login'

diff --git a/admin/urls.py b/hamnadmin/urls.py
similarity index 77%
rename from admin/urls.py
rename to hamnadmin/urls.py
index 1576e13011f225bc6334395a0f61e5a8ee9970b0..a512bd720a5ad443b083010995380400f732fb52 100644 (file)
--- a/admin/urls.py
+++ b/hamnadmin/urls.py
@@ -6,5 +6,5 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
     # Example:
-    (r'^register/', include('admin.register.urls')),
+    (r'^register/', include('hamnadmin.register.urls')),
 )