merge
This commit is contained in:
@@ -13,7 +13,9 @@ BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
|
||||
|
||||
COURSEWARE_ENABLED = True
|
||||
ASKBOT_ENABLED = True
|
||||
|
||||
ASKBOT_FILE_UPLOAD_DIR = ""
|
||||
ASKBOT_FILE_UPLOAD_DIR = ""
|
||||
ASKBOT_UPLOADED_FILES_URL = ""
|
||||
CSRF_COOKIE_DOMAIN = '127.0.0.1'
|
||||
|
||||
# Defaults to be overridden
|
||||
|
||||
@@ -10,3 +10,6 @@ def index(request, page=0):
|
||||
if not request.user.is_authenticated():
|
||||
return redirect('/')
|
||||
return render_to_response('staticbook.html',{'page':int(page)})
|
||||
|
||||
def index_shifted(request, page):
|
||||
return index(request, int(page)+24)
|
||||
|
||||
1
urls.py
1
urls.py
@@ -44,6 +44,7 @@ if settings.COURSEWARE_ENABLED:
|
||||
url(r'^change_setting$', 'auth.views.change_setting'),
|
||||
url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
|
||||
url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.index'),
|
||||
url(r'^book-shifted/(?P<page>[^/]*)$', 'staticbook.views.index_shifted'),
|
||||
url(r'^book*$', 'staticbook.views.index'),
|
||||
# url(r'^course_info/$', 'auth.views.courseinfo'),
|
||||
# url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
|
||||
|
||||
Reference in New Issue
Block a user