Commit 29c7f529 by Piotr Mitros

merge

parents 768c0853 a1a37f70
...@@ -13,7 +13,9 @@ BASE_DIR = os.path.abspath(os.path.join(__file__, "..", "..")) ...@@ -13,7 +13,9 @@ BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
COURSEWARE_ENABLED = True COURSEWARE_ENABLED = True
ASKBOT_ENABLED = True ASKBOT_ENABLED = True
ASKBOT_FILE_UPLOAD_DIR = ""
ASKBOT_FILE_UPLOAD_DIR = ""
ASKBOT_UPLOADED_FILES_URL = ""
CSRF_COOKIE_DOMAIN = '127.0.0.1' CSRF_COOKIE_DOMAIN = '127.0.0.1'
# Defaults to be overridden # Defaults to be overridden
......
...@@ -10,3 +10,6 @@ def index(request, page=0): ...@@ -10,3 +10,6 @@ def index(request, page=0):
if not request.user.is_authenticated(): if not request.user.is_authenticated():
return redirect('/') return redirect('/')
return render_to_response('staticbook.html',{'page':int(page)}) return render_to_response('staticbook.html',{'page':int(page)})
def index_shifted(request, page):
return index(request, int(page)+24)
...@@ -44,6 +44,7 @@ if settings.COURSEWARE_ENABLED: ...@@ -44,6 +44,7 @@ if settings.COURSEWARE_ENABLED:
url(r'^change_setting$', 'auth.views.change_setting'), url(r'^change_setting$', 'auth.views.change_setting'),
url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'), url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.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'^book*$', 'staticbook.views.index'),
# url(r'^course_info/$', 'auth.views.courseinfo'), # url(r'^course_info/$', 'auth.views.courseinfo'),
# url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'), # url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment