From b6431b70a421f67fc0a5dcc7ba6ddeaade92ccc4 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 16 Oct 2010 13:58:57 +0200
Subject: [PATCH] move oxuser to user

---
 pandora/backend/views.py                             | 4 ++--
 pandora/settings.py                                  | 6 ++++--
 pandora/urls.py                                      | 2 +-
 pandora/{oxuser => user}/__init__.py                 | 0
 pandora/{oxuser => user}/migrations/0001_init.py     | 0
 pandora/{oxuser => user}/migrations/0002_files.py    | 0
 pandora/{oxuser => user}/migrations/__init__.py      | 0
 pandora/{oxuser => user}/models.py                   | 0
 pandora/{oxuser => user}/templates/contact_email.txt | 0
 pandora/{oxuser => user}/templates/recover_email.txt | 0
 pandora/{oxuser => user}/tests.py                    | 0
 pandora/{oxuser => user}/urls.py                     | 2 +-
 pandora/{oxuser => user}/views.py                    | 0
 13 files changed, 8 insertions(+), 6 deletions(-)
 rename pandora/{oxuser => user}/__init__.py (100%)
 rename pandora/{oxuser => user}/migrations/0001_init.py (100%)
 rename pandora/{oxuser => user}/migrations/0002_files.py (100%)
 rename pandora/{oxuser => user}/migrations/__init__.py (100%)
 rename pandora/{oxuser => user}/models.py (100%)
 rename pandora/{oxuser => user}/templates/contact_email.txt (100%)
 rename pandora/{oxuser => user}/templates/recover_email.txt (100%)
 rename pandora/{oxuser => user}/tests.py (100%)
 rename pandora/{oxuser => user}/urls.py (87%)
 rename pandora/{oxuser => user}/views.py (100%)

diff --git a/pandora/backend/views.py b/pandora/backend/views.py
index 7221da439..9ef5fa7a2 100644
--- a/pandora/backend/views.py
+++ b/pandora/backend/views.py
@@ -31,8 +31,8 @@ import models
 import utils
 import tasks
 
-from oxuser.models import getUserJSON
-from oxuser.views import api_login, api_logout, api_register, api_contact, api_recover, api_preferences, api_findUser
+from user.models import getUserJSON
+from user.views import api_login, api_logout, api_register, api_contact, api_recover, api_preferences, api_findUser
 
 from archive.views import api_update, api_upload, api_editFile
 
diff --git a/pandora/settings.py b/pandora/settings.py
index 62b12c8e0..041a053dd 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -119,11 +119,11 @@ INSTALLED_APPS = (
     'app',
     'backend',
     'archive',
-    'oxuser',
+    'user',
     'torrent',
 )
 
-AUTH_PROFILE_MODULE = 'oxuser.UserProfile'
+AUTH_PROFILE_MODULE = 'user.UserProfile'
 
 #Video encoding settings
 #available profiles: 96p, 270p, 360p, 480p, 720p, 1080p
@@ -151,7 +151,9 @@ POSTER_PRECEDENCE=('local', 'criterion.com', 'wikipedia.org', 'impawards.com', '
 #0xdb.org
 #POSTER_SERVICES=['http://data.0xdb.org/poster/']
 
+#copy scripts and adjust to customize
 ITEM_POSTER = join('scripts', 'oxdb_poster')
+#ITEM_POSTER = join('scripts', 'padma_poster')
 ITEM_ICON   = join('scripts', 'item_icon')
 LIST_ICON   = join('scripts', 'list_icon')
 
diff --git a/pandora/urls.py b/pandora/urls.py
index 6d2b2b3cf..ce5c8e778 100644
--- a/pandora/urls.py
+++ b/pandora/urls.py
@@ -24,7 +24,7 @@ urlpatterns = patterns('',
     (r'^timeline$', 'app.views.timeline'),
     (r'^file/(?P<oshash>.*)$', 'archive.views.lookup_file'),
 
-    (r'^r/(?P<key>.*)$', 'oxuser.views.recover'),
+    (r'^r/(?P<key>.*)$', 'user.views.recover'),
     (r'', include('backend.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
diff --git a/pandora/oxuser/__init__.py b/pandora/user/__init__.py
similarity index 100%
rename from pandora/oxuser/__init__.py
rename to pandora/user/__init__.py
diff --git a/pandora/oxuser/migrations/0001_init.py b/pandora/user/migrations/0001_init.py
similarity index 100%
rename from pandora/oxuser/migrations/0001_init.py
rename to pandora/user/migrations/0001_init.py
diff --git a/pandora/oxuser/migrations/0002_files.py b/pandora/user/migrations/0002_files.py
similarity index 100%
rename from pandora/oxuser/migrations/0002_files.py
rename to pandora/user/migrations/0002_files.py
diff --git a/pandora/oxuser/migrations/__init__.py b/pandora/user/migrations/__init__.py
similarity index 100%
rename from pandora/oxuser/migrations/__init__.py
rename to pandora/user/migrations/__init__.py
diff --git a/pandora/oxuser/models.py b/pandora/user/models.py
similarity index 100%
rename from pandora/oxuser/models.py
rename to pandora/user/models.py
diff --git a/pandora/oxuser/templates/contact_email.txt b/pandora/user/templates/contact_email.txt
similarity index 100%
rename from pandora/oxuser/templates/contact_email.txt
rename to pandora/user/templates/contact_email.txt
diff --git a/pandora/oxuser/templates/recover_email.txt b/pandora/user/templates/recover_email.txt
similarity index 100%
rename from pandora/oxuser/templates/recover_email.txt
rename to pandora/user/templates/recover_email.txt
diff --git a/pandora/oxuser/tests.py b/pandora/user/tests.py
similarity index 100%
rename from pandora/oxuser/tests.py
rename to pandora/user/tests.py
diff --git a/pandora/oxuser/urls.py b/pandora/user/urls.py
similarity index 87%
rename from pandora/oxuser/urls.py
rename to pandora/user/urls.py
index 0882d9ab5..131f14013 100644
--- a/pandora/oxuser/urls.py
+++ b/pandora/user/urls.py
@@ -4,7 +4,7 @@
 from django.conf.urls.defaults import *
 
 
-urlpatterns = patterns("oxuser.views",
+urlpatterns = patterns("user.views",
     (r'^preferences', 'api_preferences'),
     (r'^login', 'api_login'),
     (r'^logout', 'api_logout'),
diff --git a/pandora/oxuser/views.py b/pandora/user/views.py
similarity index 100%
rename from pandora/oxuser/views.py
rename to pandora/user/views.py