Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration

Disable marketing registration button for courses that user cannot enrol...

lms/djangoapps/courseware/views.py

@@ -553,12 +553,15 @@ def mktg_course_about(request, course_id):
     else:
         course_target = reverse('about_course', args=[course.id])
 
+    allow_registration = has_access(request.user, course, 'enroll')
+
     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,
+                               'allow_registration': allow_registration,
                                'course_target': course_target,
                                'show_courseware_link': show_courseware_link})
 

lms/static/sass/_shame.scss

@@ -84,14 +84,14 @@
       @extend .btn-primary;
     }
 
-    // already registered but course not started
-    &.is-registered {
+    // already registered but course not started or registration is closed
+    &.is-registered, &.registration-closed {
       @extend .btn-secondary;
       pointer-events: none !important;
     }
 
     // coming soon
-    &.isnot-open {
+    &.coming-soon {
       @extend .btn-tertiary;
       pointer-events: none !important;
       outline: none;

lms/templates/courseware/mktg_coming_soon.html

@@ -23,7 +23,7 @@
 
   <ul class="list-actions register">
     <li class="item">
-      <a class="action action-register isnot-open" href="">Coming Soon</a>
+      <a class="action coming-soon" href="">Coming Soon</a>
     </li>
   </ul>
 

lms/templates/courseware/mktg_course_about.html

@@ -50,8 +50,10 @@
           %else:
             <div class="action is-registered">You Are Registered</div>
           %endif
-        %else:
+        %elif allow_registration:
           <a class="action action-register register" href="#">Register for <strong>${course.number}</strong></a>
+        %else:
+          <div class="action registration-closed">Registration Is Closed</div>
         %endif
     </li>
   </ul>

lms/templates/mktg_iframe.html

@@ -28,7 +28,7 @@
   <!-- repeated button styles needed for IE (copied from _shame.scss) -->
   <style type="text/css" media="screen">
 
-    .view-partial-mktgregister{background:transparent}.view-partial-mktgregister .wrapper-view{overflow:hidden}.view-partial-mktgregister .btn,.view-partial-mktgregister .btn-primary,.view-partial-mktgregister .action.action-register,.view-partial-mktgregister .action.access-courseware,.view-partial-mktgregister .btn-secondary,.view-partial-mktgregister .action.is-registered,.view-partial-mktgregister .btn-tertiary,.view-partial-mktgregister .action.isnot-open{-webkit-box-sizing:"border-box";-moz-box-sizing:"border-box";box-sizing:"border-box";display:block;padding:10px;text-transform:lowercase;color:#fff;letter-spacing:0.1rem;cursor:pointer;text-align:center;border:none !important;text-decoration:none;text-shadow:none;letter-spacing:0.1rem;font-size:17px;font-weight:300;box-shadow:0 !important}.view-partial-mktgregister .btn strong,.view-partial-mktgregister .btn-primary strong,.view-partial-mktgregister .action.action-register strong,.view-partial-mktgregister .action.access-courseware strong,.view-partial-mktgregister .btn-secondary strong,.view-partial-mktgregister .action.is-registered strong,.view-partial-mktgregister .btn-tertiary strong,.view-partial-mktgregister .action.isnot-open strong{font-weight:400;text-transform:none}.view-partial-mktgregister .btn-primary,.view-partial-mktgregister .action.action-register,.view-partial-mktgregister .action.access-courseware{background-color:#4697ec;background-image:-webkit-gradient(linear, left top, left bottom, color-stop(5%, #4697ec),color-stop(95%, #4880bb));background-image:-webkit-linear-gradient(#4697ec 5%,#4880bb 95%);background-image:linear-gradient(#4697ec 5%,#4880bb 95%)}.view-partial-mktgregister .btn-secondary,.view-partial-mktgregister .action.is-registered{background-color:#999;background-image:-webkit-gradient(linear, left top, left bottom, color-stop(5%, #999),color-stop(95%, #666));background-image:-webkit-linear-gradient(#999 5%,#666 95%);background-image:linear-gradient(#999 5%,#666 95%)}.view-partial-mktgregister .btn-tertiary,.view-partial-mktgregister .action.isnot-open{background:#e6f5fc;color:#5597dd}.view-partial-mktgregister .list-actions{list-style:none;margin:0;padding:0}.view-partial-mktgregister .list-actions .item{margin:0}.view-partial-mktgregister .action.is-registered{pointer-events:none !important}.view-partial-mktgregister .action.isnot-open{pointer-events:none !important;outline:none}
+    .view-partial-mktgregister{background:transparent}.view-partial-mktgregister .wrapper-view{overflow:hidden}.view-partial-mktgregister .btn,.view-partial-mktgregister .btn-primary,.view-partial-mktgregister .action.action-register,.view-partial-mktgregister .action.access-courseware,.view-partial-mktgregister .btn-secondary,.view-partial-mktgregister .action.is-registered,.view-partial-mktgregister .action.registration-closed,.view-partial-mktgregister .btn-tertiary,.view-partial-mktgregister .action.coming-soon{-webkit-box-sizing:"border-box";-moz-box-sizing:"border-box";box-sizing:"border-box";display:block;padding:10px;text-transform:lowercase;color:#fff;letter-spacing:0.1rem;cursor:pointer;text-align:center;border:none !important;text-decoration:none;text-shadow:none;letter-spacing:0.1rem;font-size:17px;font-weight:300;box-shadow:0 !important}.view-partial-mktgregister .btn strong,.view-partial-mktgregister .btn-primary strong,.view-partial-mktgregister .action.action-register strong,.view-partial-mktgregister .action.access-courseware strong,.view-partial-mktgregister .btn-secondary strong,.view-partial-mktgregister .action.is-registered strong,.view-partial-mktgregister .action.registration-closed strong,.view-partial-mktgregister .btn-tertiary strong,.view-partial-mktgregister .action.coming-soon strong{font-weight:400;text-transform:none}.view-partial-mktgregister .btn-primary,.view-partial-mktgregister .action.action-register,.view-partial-mktgregister .action.access-courseware{background-color:#4697ec;background-image:-webkit-gradient(linear, left top, left bottom, color-stop(5%, #4697ec),color-stop(95%, #4880bb));background-image:-webkit-linear-gradient(#4697ec 5%,#4880bb 95%);background-image:linear-gradient(#4697ec 5%,#4880bb 95%)}.view-partial-mktgregister .btn-secondary,.view-partial-mktgregister .action.is-registered,.view-partial-mktgregister .action.registration-closed{background-color:#999;background-image:-webkit-gradient(linear, left top, left bottom, color-stop(5%, #999),color-stop(95%, #666));background-image:-webkit-linear-gradient(#999 5%,#666 95%);background-image:linear-gradient(#999 5%,#666 95%)}.view-partial-mktgregister .btn-tertiary,.view-partial-mktgregister .action.coming-soon{background:#e6f5fc;color:#5597dd}.view-partial-mktgregister .list-actions{list-style:none;margin:0;padding:0}.view-partial-mktgregister .list-actions .item{margin:0}.view-partial-mktgregister .action.is-registered,.view-partial-mktgregister .action.registration-closed{pointer-events:none !important}.view-partial-mktgregister .action.coming-soon{pointer-events:none !important;outline:none}