Commit 59c56c26 by John Jarvis

fixing old about view, iframe updates

parent 7705941a
...@@ -204,5 +204,4 @@ ...@@ -204,5 +204,4 @@
</div> </div>
%endif %endif
<%include file="../video_modal.html" /> <%include file="../video_modal.html" />
...@@ -17,13 +17,18 @@ ...@@ -17,13 +17,18 @@
</%block> </%block>
<%block name="js_extra"> <%block name="js_extra">
</%block>
<%block name="content">
% if not registered: % if not registered:
%if user.is_authenticated(): %if user.is_authenticated():
## If the user is authenticated, clicking the enroll button just submits a form ## If the user is authenticated, clicking the enroll button just submits a form
<script type="text/javascript"> <script type="text/javascript">
(function() { (function() {
$(".register").click(function() { $(".register").click(function(e) {
alert("herp derp");
e.preventDefault();
$("#class_enroll_form").submit(); $("#class_enroll_form").submit();
}); });
...@@ -56,9 +61,8 @@ ...@@ -56,9 +61,8 @@
%endif %endif
<script src="${static.url('js/course_info.js')}"></script> <script src="${static.url('js/course_info.js')}"></script>
</%block>
<%block name="content">
<ul class="list-actions register"> <ul class="list-actions register">
<li class="item"> <li class="item">
%if user.is_authenticated(): %if user.is_authenticated():
...@@ -67,12 +71,27 @@ ...@@ -67,12 +71,27 @@
<a class="action action-register is-registered" href="${course_target}">Registered for <strong>${course.number}</strong></a> <a class="action action-register is-registered" href="${course_target}">Registered for <strong>${course.number}</strong></a>
%else: %else:
<!-- signed in, not registered --> <!-- 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 %endif
%else: %else:
<!-- not signed in --> <!-- 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 %endif
</li> </li>
</ul> </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> </%block>
...@@ -239,7 +239,7 @@ if settings.COURSEWARE_ENABLED: ...@@ -239,7 +239,7 @@ if settings.COURSEWARE_ENABLED:
#About the course #About the course
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$', 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 #View for mktg site
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/mktg-about$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/mktg-about$',
'courseware.views.mktg_course_about', name="mktg_about_course"), 'courseware.views.mktg_course_about', name="mktg_about_course"),
......
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