From 859afccd276162055117eb1f6d186181ed37c36e Mon Sep 17 00:00:00 2001
From: fischerl <none@none>
Date: Sun, 29 Jan 2012 17:14:43 -0500
Subject: [PATCH 1/2] added handi book indexing url and view

---
 settings_new_askbot.py | 5 ++++-
 staticbook/views.py    | 3 +++
 urls.py                | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index aa79e08ea8..b81832f037 100644
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -8,7 +8,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
@@ -86,6 +88,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
     'djangomako.middleware.MakoMiddleware',
+    'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
diff --git a/staticbook/views.py b/staticbook/views.py
index bb6e2ada19..23ca0756c3 100644
--- a/staticbook/views.py
+++ b/staticbook/views.py
@@ -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)
diff --git a/urls.py b/urls.py
index 54c910dccf..68d789b5ff 100644
--- a/urls.py
+++ b/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'),

From a1a37f700dedcaa28d2aeecce2feea4733e32f1e Mon Sep 17 00:00:00 2001
From: fischerl <none@none>
Date: Sun, 29 Jan 2012 17:19:07 -0500
Subject: [PATCH 2/2] fixed previous merge

---
 settings_new_askbot.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index d4bcde0aee..702a0c4b2c 100644
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -90,12 +90,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
-<<<<<<< local
-    'djangomako.middleware.MakoMiddleware',
-    'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
-=======
     'mitxmako.middleware.MakoMiddleware',
->>>>>>> other
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )