From 6f3a954d7b2146f9a68eccbd86a57fd443c7cbde Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Wed, 13 Feb 2013 09:30:54 -0500 Subject: [PATCH] howitworks is default home page if not logged in. Otherwise course index. NOTE: didn't fix old wrong behavior of going to index if not logged in and tried to navigate to a specific page. Will work on that next. --- cms/djangoapps/contentstore/views.py | 5 ++++- cms/templates/login.html | 2 +- cms/urls.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 32e7b2d685..c1ba0f5f9a 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -95,7 +95,10 @@ def login_page(request): }) def howitworks(request): - return render_to_response('howitworks.html', {}) + if request.user.is_authenticated(): + return index(request) + else: + return render_to_response('howitworks.html', {}) # ==== Views for any logged-in user ================================== diff --git a/cms/templates/login.html b/cms/templates/login.html index 920ea57758..5b66c303f7 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -77,7 +77,7 @@ submit_data, function(json) { if(json.success) { - location.href = "${reverse('index')}"; + location.href = "${reverse('homepage')}"; } else if($('#login_error').length == 0) { $('#login_form').prepend('
' + json.value + '
'); $('#login_error').addClass('is-shown'); diff --git a/cms/urls.py b/cms/urls.py index fd80d81423..a41094c780 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -6,7 +6,8 @@ from django.conf.urls import patterns, include, url # admin.autodiscover() urlpatterns = ('', - url(r'^$', 'contentstore.views.index', name='index'), + url(r'^$', 'contentstore.views.howitworks', name='homepage'), + url(r'^listing', 'contentstore.views.index', name='index'), url(r'^edit/(?P.*?)$', 'contentstore.views.edit_unit', name='edit_unit'), url(r'^subsection/(?P.*?)$', 'contentstore.views.edit_subsection', name='edit_subsection'), url(r'^preview_component/(?P.*?)$', 'contentstore.views.preview_component', name='preview_component'),