From 01f8c4c81629707edd590b1264dd1a9f78aaea90 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 30 Apr 2013 09:44:21 -0400 Subject: [PATCH 1/9] Adding iframe view example: http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about --- lms/djangoapps/courseware/views.py | 20 ++++ .../courseware/mktg_course_about.html | 98 +++++++++++++++++++ lms/urls.py | 6 +- 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 lms/templates/courseware/mktg_course_about.html diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index 714e45842f..acbd4183cc 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -518,6 +518,26 @@ def course_about(request, course_id): 'registered': registered, 'course_target': course_target, 'show_courseware_link': show_courseware_link}) +@ensure_csrf_cookie +@cache_if_anonymous +def mktg_course_about(request, course_id): + course = get_course_with_access(request.user, course_id, 'see_exists') + registered = registered_for_course(course, request.user) + + if has_access(request.user, course, 'load'): + course_target = reverse('info', args=[course.id]) + else: + course_target = reverse('about_course', args=[course.id]) + + show_courseware_link = (has_access(request.user, course, 'load') or + settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION')) + + return render_to_response('courseware/mktg_course_about.html', + {'course': course, + 'registered': registered, + 'course_target': course_target, + 'show_courseware_link': show_courseware_link}) + @ensure_csrf_cookie diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html new file mode 100644 index 0000000000..147eb5dd64 --- /dev/null +++ b/lms/templates/courseware/mktg_course_about.html @@ -0,0 +1,98 @@ +<%! + from django.core.urlresolvers import reverse + from courseware.courses import course_image_url, get_course_about_section + from courseware.access import has_access +%> +<%namespace name='static' file='../static_content.html'/> + +<%inherit file="../mktg_iframe.html" /> + +<%block name="headextra"> + <%include file="../google_analytics.html" /> + + +<%block name="js_extra"> + + % if not registered: + %if user.is_authenticated(): + ## If the user is authenticated, clicking the enroll button just submits a form + + %else: + ## If the user is not authenticated, clicking the enroll button pops up the register + ## field. We also slip in the registration fields into the login/register fields so + ## the user is automatically registered after logging in / registering + + %endif + %endif + + + + + +<%block name="title">About ${course.number} + +
+
+
+
+ %if user.is_authenticated(): + %if registered: + %if show_courseware_link: + + %endif + You are registered for this course (${course.number}) + %if show_courseware_link: + View Courseware + + %endif + %else: + Register for ${course.number} +
+ %endif + %else: + Register for ${course.number} + %endif +
+ +
+
+ +%if not registered: +
+
+
+ + +
+
+ +
+
+
+%endif + diff --git a/lms/urls.py b/lms/urls.py index 3bcfc25d3d..a866747917 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -239,7 +239,11 @@ if settings.COURSEWARE_ENABLED: #About the course url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/about$', - 'courseware.views.course_about', name="about_course"), + 'courseware.views.mktg_course_about', name="about_course"), + #View for mktg site + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/mktg-about$', + 'courseware.views.mktg_course_about', name="mktg_about_course"), + #Inside the course url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/$', From aa895cbc6b669ae6a5072c00610c9fd4eb62dc93 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 30 Apr 2013 13:13:31 -0400 Subject: [PATCH 2/9] Adding mktg_iframe.html --- lms/templates/mktg_iframe.html | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 lms/templates/mktg_iframe.html diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html new file mode 100644 index 0000000000..9b4d298937 --- /dev/null +++ b/lms/templates/mktg_iframe.html @@ -0,0 +1,37 @@ +<%namespace name='static' file='static_content.html'/> + + + + <%block name="title">edX + + + + <%static:css group='application'/> + + <%static:js group='main_vendor'/> + <%block name="headextra"/> + + + + + + + + % if not course: + <%include file="google_analytics.html" /> + % endif + + + + + + ${self.body()} + <%static:js group='application'/> + <%static:js group='module-js'/> + <%block name="js_extra"/> + + From 7705941a653050e5b5c7a5a4d056a1ff3a4ad6fc Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 2 May 2013 11:54:16 -0400 Subject: [PATCH 3/9] edx.org - added in isolated register button styling/states for