From 59c56c26109e00ce25dc73056848dfd5657bf933 Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@edx.org>
Date: Thu, 2 May 2013 15:05:12 -0400
Subject: [PATCH] fixing old about view, iframe updates

---
 lms/templates/courseware/course_about.html    |  1 -
 .../courseware/mktg_course_about.html         | 31 +++++++++++++++----
 lms/urls.py                                   |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html
index dc1dc17532..cc22e37848 100644
--- a/lms/templates/courseware/course_about.html
+++ b/lms/templates/courseware/course_about.html
@@ -204,5 +204,4 @@
   </div>
 %endif
 
-
 <%include file="../video_modal.html" />
diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html
index b366cc7d9d..6eb86df274 100644
--- a/lms/templates/courseware/mktg_course_about.html
+++ b/lms/templates/courseware/mktg_course_about.html
@@ -17,13 +17,18 @@
 </%block>
 
 <%block name="js_extra">
+</%block>
+
+<%block name="content">
 
   % if not registered:
     %if user.is_authenticated():
       ## If the user is authenticated, clicking the enroll button just submits a form
       <script type="text/javascript">
       (function() {
-        $(".register").click(function() {
+        $(".register").click(function(e) {
+          alert("herp derp");
+          e.preventDefault();
           $("#class_enroll_form").submit();
         });
 
@@ -42,7 +47,7 @@
       ## the user is automatically registered after logging in / registering
       <script type="text/javascript">
       (function() {
-        $(".register").click(function() {
+       $(".register").click(function() {
           if ($(".login_form .enroll_fieldset").length === 0) {
             $(".login_form").append( $(".enroll_fieldset").first().clone() );
           }
@@ -56,9 +61,8 @@
   %endif
 
   <script src="${static.url('js/course_info.js')}"></script>
-</%block>
 
-<%block name="content">
+
   <ul class="list-actions register">
     <li class="item">
       %if user.is_authenticated():
@@ -67,12 +71,27 @@
           <a class="action action-register is-registered" href="${course_target}">Registered for <strong>${course.number}</strong></a>
         %else:
         <!-- signed in, not registered -->
-           <a class="action action-register" href="[register path next view]">Register for <strong>${course.number}</strong></a>
+          <a href="#" class="action action-register register">Register for ${course.number}</a> <div id="register_message"></div>
         %endif
       %else:
       <!-- not signed in -->
-        <a class="action action-register is-not-signedin" href="[signin view]">Register for <strong>${course.number}</strong></a>
+          <a class="action action-register is-not-signedin" href="${reverse('register_user')}">Register for <strong>${course.number}</strong></a>
       %endif
     </li>
   </ul>
+
+
+%if not registered:
+  <div style="display: none;">
+    <form id="class_enroll_form" method="post" data-remote="true" action="${reverse('change_enrollment')}">
+      <fieldset class="enroll_fieldset">
+        <input name="course_id" type="hidden" value="${course.id}">
+        <input name="enrollment_action" type="hidden" value="enroll">
+      </fieldset>
+      <div class="submit">
+        <input name="submit" type="submit" value="enroll">
+      </div>
+    </form>
+  </div>
+%endif
 </%block>
diff --git a/lms/urls.py b/lms/urls.py
index a866747917..67ed90fe31 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -239,7 +239,7 @@ if settings.COURSEWARE_ENABLED:
 
         #About the course
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$',
-            'courseware.views.mktg_course_about', name="about_course"),
+            'courseware.views.course_about', name="about_course"),
         #View for mktg site
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/mktg-about$',
             'courseware.views.mktg_course_about', name="mktg_about_course"),