Commit f30b9d91 by Greg Price

Merge pull request #2057 from edx/fix/gprice/disable-courseware-links

Disable courseware links on marketing site and dashboard if courseware is not accessible
parents 3ee0ed9e b8d2276d
...@@ -79,14 +79,15 @@ ...@@ -79,14 +79,15 @@
.action { .action {
// not registered (default) // register or access courseware
&.action-register { &.action-register, &.access-courseware {
@extend .btn-primary; @extend .btn-primary;
} }
// already registered // already registered but course not started
&.is-registered { &.is-registered {
@extend .btn-secondary; @extend .btn-secondary;
pointer-events: none !important;
} }
// coming soon // coming soon
......
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
color: $lighter-base-font-color; color: $lighter-base-font-color;
} }
h3 a { h3 a, h3 span {
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
font-family: $sans-serif; font-family: $sans-serif;
......
...@@ -45,7 +45,11 @@ ...@@ -45,7 +45,11 @@
<ul class="list-actions"> <ul class="list-actions">
<li class="item"> <li class="item">
%if user.is_authenticated() and registered: %if user.is_authenticated() and registered:
<a class="action action-register is-registered" href="${course_target}">Access Courseware</strong></a> %if show_courseware_link:
<a class="action access-courseware" href="${course_target}">Access Courseware</a>
%else:
<div class="action is-registered">You Are Registered</div>
%endif
%else: %else:
<a class="action action-register register" href="#">Register for <strong>${course.number}</strong></a> <a class="action action-register register" href="#">Register for <strong>${course.number}</strong></a>
%endif %endif
......
...@@ -194,17 +194,20 @@ ...@@ -194,17 +194,20 @@
<article class="my-course"> <article class="my-course">
<% <%
if has_access(user, course, 'load'):
course_target = reverse('info', args=[course.id]) course_target = reverse('info', args=[course.id])
else:
course_target = reverse('about_course', args=[course.id])
%> %>
<a href="${course_target}" class="cover"> % if course.id in show_courseware_links_for:
<img src="${course_image_url(course)}" /> <a href="${course_target}" class="cover">
</a> <img src="${course_image_url(course)}" />
</a>
% else:
<div class="cover">
<img src="${course_image_url(course)}" />
</div>
% endif
<section class="info"> <section class="info">
<hgroup> <hgroup>
...@@ -218,7 +221,13 @@ ...@@ -218,7 +221,13 @@
% endif % endif
</p> </p>
<h2 class="university">${get_course_about_section(course, 'university')}</h2> <h2 class="university">${get_course_about_section(course, 'university')}</h2>
<h3><a href="${course_target}">${course.number} ${course.display_name_with_default}</a></h3> <h3>
% if course.id in show_courseware_links_for:
<a href="${course_target}">${course.number} ${course.display_name_with_default}</a>
% else:
<span>${course.number} ${course.display_name_with_default}</span>
% endif
</h3>
</hgroup> </hgroup>
<% <%
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- repeated button styles needed for IE (copied from _shame.scss) --> <!-- repeated button styles needed for IE (copied from _shame.scss) -->
<style type="text/css" media="screen"> <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 .btn-secondary,.view-partial-mktgregister .btn-tertiary,.view-partial-mktgregister .action.isnot-open{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 .btn-secondary 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{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(top, #4697ec 5%,#4880bb 95%);background-image:-moz-linear-gradient(top, #4697ec 5%,#4880bb 95%);background-image:-ms-linear-gradient(top, #4697ec 5%,#4880bb 95%);background-image:-o-linear-gradient(top, #4697ec 5%,#4880bb 95%);background-image:linear-gradient(top, #4697ec 5%,#4880bb 95%)}.view-partial-mktgregister .btn-secondary{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(top, #999 5%,#666 95%);background-image:-moz-linear-gradient(top, #999 5%,#666 95%);background-image:-ms-linear-gradient(top, #999 5%,#666 95%);background-image:-o-linear-gradient(top, #999 5%,#666 95%);background-image:linear-gradient(top, #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.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 .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}
......
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