diff --git a/pandora/backend/views.py b/pandora/backend/views.py index 7221da43..9ef5fa7a 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 62b12c8e..041a053d 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 6d2b2b3c..ce5c8e77 100644 --- a/pandora/urls.py +++ b/pandora/urls.py @@ -24,7 +24,7 @@ urlpatterns = patterns('', (r'^timeline$', 'app.views.timeline'), (r'^file/(?P.*)$', 'archive.views.lookup_file'), - (r'^r/(?P.*)$', 'oxuser.views.recover'), + (r'^r/(?P.*)$', '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 0882d9ab..131f1401 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