Skip to content

E
edx-platform
Commit e0122c05 by David Ormsbee
Options

Merge pull request #7624 from mcgachey/mcgachey-courseware-flags 

[LTI Provider] Adding options to suppress chrome for embedding courseware
parents 53c12d51 bc293b05
Showing with 105 additions and 96 deletions
lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
% if reverifications["must_reverify"]:
% if len(reverifications["must_reverify"]) > 1:
<div class="wrapper-msg urgency-high"> % if reverifications:
<div class="msg msg-reverify has-actions"> % if reverifications["must_reverify"]:
<div class="msg-content"> % if len(reverifications["must_reverify"]) > 1:
<h2 class="title">${_("You need to re-verify to continue")}</h2>
<div class="copy"> <div class="wrapper-msg urgency-high">
<p class="activation-message"> <div class="msg msg-reverify has-actions">
${_("People change, and each year we ask you to re-verify your identity for our verified certificates. Take a minute now to help us renew your identity.")} <div class="msg-content">
</p> <h2 class="title">${_("You need to re-verify to continue")}</h2>
<ul class="reverify-list"> <div class="copy">
% for item in reverifications["must_reverify"]: <p class="activation-message">
<li class="item"> ${_("People change, and each year we ask you to re-verify your identity for our verified certificates. Take a minute now to help us renew your identity.")}
${_('{course_name}: Re-verify by {date}').format( </p>
course_name=u"<strong>{0}</strong>".format(item.course_name), <ul class="reverify-list">
date=item.date % for item in reverifications["must_reverify"]:
)} <li class="item">
</li> ${_('{course_name}: Re-verify by {date}').format(
% endfor course_name=u"<strong>{0}</strong>".format(item.course_name),
</ul> date=item.date
)}
</li>
% endfor
</ul>
</div>
</div>
<nav class="nav-actions" aria-label="${_('Notification Actions')}">
<h3 class="sr">${_('Notification Actions')}</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div> </div>
</div> </div>
<nav class="nav-actions" aria-label="${_('Notification Actions')}">
<h3 class="sr">${_('Notification Actions')}</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div>
</div>
% elif reverifications["must_reverify"]: % elif reverifications["must_reverify"]:
<div class="wrapper-msg urgency-high"> <div class="wrapper-msg urgency-high">
<div class="msg msg-reverify has-actions"> <div class="msg msg-reverify has-actions">
<div class="msg-content"> <div class="msg-content">
<h2 class="title">${_("You need to re-verify to continue")}</h2> <h2 class="title">${_("You need to re-verify to continue")}</h2>
% for item in reverifications["must_reverify"]: % for item in reverifications["must_reverify"]:
<div class="copy"> <div class="copy">
<p class='activation-message'> <p class='activation-message'>
${_('To continue in the ID Verified track in {course_name}, you need to re-verify your identity by {date}.').format( ${_('To continue in the ID Verified track in {course_name}, you need to re-verify your identity by {date}.').format(
course_name=u"<strong>{}</strong>".format(item.course_name), course_name=u"<strong>{}</strong>".format(item.course_name),
date=item.date date=item.date
)} )}
</p> </p>
</div>
</div>
<nav class="nav-actions" aria-label="${_('Notification Actions')}">
<h3 class="sr">${_('Notification Actions')}</h3>
<ul>
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div> </div>
</div> </div>
<nav class="nav-actions" aria-label="${_('Notification Actions')}"> % endfor
<h3 class="sr">${_('Notification Actions')}</h3> %endif
<ul> %endif
<li class="nav-item"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify_dash')}">Re-verify</a></li>
</ul>
</nav>
</div>
</div>
% endfor
%endif
%endif
%if reverifications["denied"] and denied_banner: %if reverifications["denied"] and denied_banner:
<div class="wrapper-msg urgency-high" id="failed-verification-banner"> <div class="wrapper-msg urgency-high" id="failed-verification-banner">
<div class="msg msg-reverify is-dismissable"> <div class="msg msg-reverify is-dismissable">
<div class="msg-content"> <div class="msg-content">
<h2 class="title">${_("Your re-verification failed")}</h2> <h2 class="title">${_("Your re-verification failed")}</h2>
% for item in reverifications["denied"]: % for item in reverifications["denied"]:
% if item.display: % if item.display:
<div class="copy"> <div class="copy">
<p class='activation-message'> <p class='activation-message'>
${_('Your re-verification for {course_name} failed and you are no longer eligible for a Verified Certificate. If you think this is in error, please contact us at {email}.').format( ${_('Your re-verification for {course_name} failed and you are no longer eligible for a Verified Certificate. If you think this is in error, please contact us at {email}.').format(
course_name=u"<strong>{}</strong>".format(item.course_name), course_name=u"<strong>{}</strong>".format(item.course_name),
email=u'<a class="contact-link" href="mailto:{email}">{email}</a>'.format( email=u'<a class="contact-link" href="mailto:{email}">{email}</a>'.format(
email=billing_email email=billing_email
) )
)} )}
</p> </p>
</div>
% endif
% endfor
</div>
<div class="action-dismiss">
<button class="button-dismiss" id="failed-verification-button-dismiss"><i class="icon fa fa-times-circle"></i> <span class="sr">${_('Dismiss')}</span></button>
</div>
</div> </div>
% endif
% endfor
</div>
<div class="action-dismiss">
<button class="button-dismiss" id="failed-verification-button-dismiss"><i class="icon fa fa-times-circle"></i> <span class="sr">${_('Dismiss')}</span></button>
</div> </div>
</div> %endif
</div>
%endif %endif
lms/templates/main.html
...@@ -49,14 +49,16 @@ ...@@ -49,14 +49,16 @@
</title> </title>
</%block> </%block>
<script type="text/javascript"> % if not allow_iframing:
/* immediately break out of an iframe if coming from the marketing website */ <script type="text/javascript">
(function(window) { /* immediately break out of an iframe if coming from the marketing website */
if (window.location !== window.top.location) { (function(window) {
window.top.location = window.location; if (window.location !== window.top.location) {
} window.top.location = window.location;
})(this); }
</script> })(this);
</script>
% endif
<script type="text/javascript" src="/jsi18n/"></script> <script type="text/javascript" src="/jsi18n/"></script>
...@@ -141,25 +143,29 @@ ...@@ -141,25 +143,29 @@
<%include file="mathjax_accessible.html" /> <%include file="mathjax_accessible.html" />
<%include file="${header_file}" /> % if not disable_header:
<%include file="${header_file}" />
% endif
<div class="content-wrapper" id="content"> <div class="content-wrapper" id="content">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
</div> </div>
<%block name="footer"> % if not disable_footer:
## Can be overridden by child templates wanting to hide the footer. <%block name="footer">
<% ## Can be overridden by child templates wanting to hide the footer.
if theme_enabled() and not is_microsite(): <%
footer_file = 'theme-footer.html' if theme_enabled() and not is_microsite():
elif settings.FEATURES.get('IS_EDX_DOMAIN', False) and not is_microsite(): footer_file = 'theme-footer.html'
footer_file = microsite.get_template_path('footer-edx-new.html') elif settings.FEATURES.get('IS_EDX_DOMAIN', False) and not is_microsite():
else: footer_file = microsite.get_template_path('footer-edx-new.html')
footer_file = microsite.get_template_path('footer.html') else:
%> footer_file = microsite.get_template_path('footer.html')
<%include file="${footer_file}" /> %>
</%block> <%include file="${footer_file}" />
</%block>
% endif
</div> </div>
......
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