Commit c2bce25e by Giulio Gratta Committed by stv

Add theming to dashboard, about, register pages

Conflicts:
	lms/djangoapps/courseware/views.py
parent b121a152
...@@ -408,6 +408,11 @@ def register_user(request, extra_context=None): ...@@ -408,6 +408,11 @@ def register_user(request, extra_context=None):
overrides['selected_provider'] = current_provider.NAME overrides['selected_provider'] = current_provider.NAME
context.update(overrides) context.update(overrides)
try:
if settings.FEATURES["USE_CUSTOM_THEME"]:
return render_to_response("theme-register.html", context)
except TopLevelLookupException:
pass
return render_to_response('register.html', context) return render_to_response('register.html', context)
...@@ -559,6 +564,11 @@ def dashboard(request): ...@@ -559,6 +564,11 @@ def dashboard(request):
context['duplicate_provider'] = pipeline.get_duplicate_provider(messages.get_messages(request)) context['duplicate_provider'] = pipeline.get_duplicate_provider(messages.get_messages(request))
context['provider_user_states'] = pipeline.get_provider_user_states(user) context['provider_user_states'] = pipeline.get_provider_user_states(user)
try:
if settings.FEATURES["USE_CUSTOM_THEME"]:
return render_to_response("theme-dashboard.html", context)
except TopLevelLookupException:
pass
return render_to_response('dashboard.html', context) return render_to_response('dashboard.html', context)
......
...@@ -46,6 +46,8 @@ from xmodule.tabs import CourseTabList, StaffGradingTab, PeerGradingTab, OpenEnd ...@@ -46,6 +46,8 @@ from xmodule.tabs import CourseTabList, StaffGradingTab, PeerGradingTab, OpenEnd
import shoppingcart import shoppingcart
from opaque_keys import InvalidKeyError from opaque_keys import InvalidKeyError
from mako.exceptions import TopLevelLookupException
from microsite_configuration import microsite from microsite_configuration import microsite
from xmodule.modulestore.locations import SlashSeparatedCourseKey from xmodule.modulestore.locations import SlashSeparatedCourseKey
...@@ -485,6 +487,11 @@ def course_info(request, course_id): ...@@ -485,6 +487,11 @@ def course_info(request, course_id):
'reverifications': reverifications, 'reverifications': reverifications,
} }
try:
if settings.FEATURES["USE_CUSTOM_THEME"]:
return render_to_response("courseware/theme-info.html", context)
except TopLevelLookupException:
pass
return render_to_response('courseware/info.html', context) return render_to_response('courseware/info.html', context)
...@@ -603,8 +610,7 @@ def course_about(request, course_id): ...@@ -603,8 +610,7 @@ def course_about(request, course_id):
# see if we have already filled up all allowed enrollments # see if we have already filled up all allowed enrollments
is_course_full = CourseEnrollment.is_course_full(course) is_course_full = CourseEnrollment.is_course_full(course)
# python -m coverage run --rcfile=lms/.coveragerc hich ./manage.pyu context = {
return render_to_response('courseware/course_about.html', {
'course': course, 'course': course,
'regularly_registered': regularly_registered, 'regularly_registered': regularly_registered,
'sneakpeek_allowed': sneakpeek_allowed, 'sneakpeek_allowed': sneakpeek_allowed,
...@@ -616,7 +622,14 @@ def course_about(request, course_id): ...@@ -616,7 +622,14 @@ def course_about(request, course_id):
'reg_then_add_to_cart_link': reg_then_add_to_cart_link, 'reg_then_add_to_cart_link': reg_then_add_to_cart_link,
'show_courseware_link': show_courseware_link, 'show_courseware_link': show_courseware_link,
'is_course_full': is_course_full 'is_course_full': is_course_full
}) }
try:
if settings.FEATURES["USE_CUSTOM_THEME"]:
return render_to_response("courseware/theme-course_about.html", context)
except TopLevelLookupException:
pass
return render_to_response('courseware/course_about.html', context)
@ensure_csrf_cookie @ensure_csrf_cookie
......
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