diff options
Diffstat (limited to 'src/meetingtools')
| -rw-r--r-- | src/meetingtools/settings.py | 8 | ||||
| -rw-r--r-- | src/meetingtools/urls.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/meetingtools/settings.py b/src/meetingtools/settings.py index 34c5d5f..30c905a 100644 --- a/src/meetingtools/settings.py +++ b/src/meetingtools/settings.py @@ -10,7 +10,8 @@ ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) -BASE_DIR = '.' +SRC_DIR = os.path.dirname(os.path.abspath(__file__)) +BASE_DIR = os.path.abspath(os.path.join(SRC_DIR, '..')) PREFIX_URL = "" BASE_URL = "http://localhost:8000%s" % PREFIX_URL @@ -61,7 +62,8 @@ MEDIA_ROOT = "%s/site-media" % BASE_DIR ADMIN_MEDIA_ROOT = "%s/admin-media" % BASE_DIR MEDIA_URL = '%s/site-media/' % PREFIX_URL ADMIN_MEDIA_PREFIX = '%s/admin-media/' % PREFIX_URL - +STATIC_ROOT = "%s/static" % BASE_DIR +STATIC_URL = "%s/static/" % PREFIX_URL LOGIN_URL = "%s/accounts/login" % PREFIX_URL LOGOUT_URL = "%s/accounts/logout" % PREFIX_URL @@ -140,4 +142,4 @@ import djcelery djcelery.setup_loader() NOREPLY = "no-reply@sunet.se" -AUTH_PROFILE_MODULE = "userprofile.UserProfile"
\ No newline at end of file +AUTH_PROFILE_MODULE = "userprofile.UserProfile" diff --git a/src/meetingtools/urls.py b/src/meetingtools/urls.py index c5401b3..24f58e7 100644 --- a/src/meetingtools/urls.py +++ b/src/meetingtools/urls.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import patterns,include # Uncomment the next two lines to enable the admin: from django.contrib import admin -from meetingtools.settings import ADMIN_MEDIA_ROOT, MEDIA_ROOT +from meetingtools.settings import ADMIN_MEDIA_ROOT, MEDIA_ROOT, STATIC_ROOT from meetingtools.multiresponse import redirect_to from meetingtools.apps.room.feeds import RoomAtomTagFeed,RoomRSSTagField,\ AtomRecordingFeed, RSSRecordingField @@ -13,8 +13,8 @@ def welcome(request): urlpatterns = patterns('', (r'^$',welcome), - (r'^admin-media/(?P<path>.*)$','django.views.static.serve',{'document_root': ADMIN_MEDIA_ROOT}), - (r'^site-media/(?P<path>.*)$','django.views.static.serve',{'document_root': MEDIA_ROOT}), + (r'^admin/', include(admin.site.urls)), + (r'^static/(?P<path>.*)$','django.views.static.serve',{'document_root': STATIC_ROOT}), # Login/Logout (r'^accounts/login?$','meetingtools.apps.auth.views.login'), (r'^accounts/login-federated$','meetingtools.apps.auth.views.accounts_login_federated'), @@ -50,6 +50,4 @@ urlpatterns = patterns('', (r'^stats/user/(.+)$','meetingtools.apps.stats.views.user'), (r'^stats/domain/(.+)$','meetingtools.apps.stats.views.domain'), (r'^stats/room/(\d+)$','meetingtools.apps.stats.views.room'), - # Uncomment the next line to enable the admin: - (r'^admin/', include(admin.site.urls)) ) |