move oxuser to user

This commit is contained in:
j 2010-10-16 13:58:57 +02:00
parent 925e4d8f18
commit b6431b70a4
13 changed files with 8 additions and 6 deletions

View file

@ -31,8 +31,8 @@ import models
import utils import utils
import tasks import tasks
from oxuser.models import getUserJSON from user.models import getUserJSON
from oxuser.views import api_login, api_logout, api_register, api_contact, api_recover, api_preferences, api_findUser 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 from archive.views import api_update, api_upload, api_editFile

View file

@ -119,11 +119,11 @@ INSTALLED_APPS = (
'app', 'app',
'backend', 'backend',
'archive', 'archive',
'oxuser', 'user',
'torrent', 'torrent',
) )
AUTH_PROFILE_MODULE = 'oxuser.UserProfile' AUTH_PROFILE_MODULE = 'user.UserProfile'
#Video encoding settings #Video encoding settings
#available profiles: 96p, 270p, 360p, 480p, 720p, 1080p #available profiles: 96p, 270p, 360p, 480p, 720p, 1080p
@ -151,7 +151,9 @@ POSTER_PRECEDENCE=('local', 'criterion.com', 'wikipedia.org', 'impawards.com', '
#0xdb.org #0xdb.org
#POSTER_SERVICES=['http://data.0xdb.org/poster/'] #POSTER_SERVICES=['http://data.0xdb.org/poster/']
#copy scripts and adjust to customize
ITEM_POSTER = join('scripts', 'oxdb_poster') ITEM_POSTER = join('scripts', 'oxdb_poster')
#ITEM_POSTER = join('scripts', 'padma_poster')
ITEM_ICON = join('scripts', 'item_icon') ITEM_ICON = join('scripts', 'item_icon')
LIST_ICON = join('scripts', 'list_icon') LIST_ICON = join('scripts', 'list_icon')

View file

@ -24,7 +24,7 @@ urlpatterns = patterns('',
(r'^timeline$', 'app.views.timeline'), (r'^timeline$', 'app.views.timeline'),
(r'^file/(?P<oshash>.*)$', 'archive.views.lookup_file'), (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')), (r'', include('backend.urls')),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs' # Uncomment the admin/doc line below and add 'django.contrib.admindocs'

View file

@ -4,7 +4,7 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
urlpatterns = patterns("oxuser.views", urlpatterns = patterns("user.views",
(r'^preferences', 'api_preferences'), (r'^preferences', 'api_preferences'),
(r'^login', 'api_login'), (r'^login', 'api_login'),
(r'^logout', 'api_logout'), (r'^logout', 'api_logout'),