Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7198 from edx/release

Browse Source 
Merge Release back to Master
This commit is contained in:
chrisndodge
2015-03-03 08:49:10 -05:00
parent 26d1669f2a c8ad51977a
commit 006b06dd21
3 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lms/static/sass/shared/_header.scss
View File

@@ -472,28 +472,46 @@ header.global-new {
}
}
}
a.user-link {
@include padding(6px, 12px, 8px, 35px);
a.user-link {
@include padding(3px, 12px, 8px, 8px);
position: relative;
text-transform: none;
font-size: 14px;
font-weight: bold;
letter-spacing: 0;
.icon {
display: inline-block;
@include float(left);
margin: 3px 0 -3px 0;
font-size: 1.2em;
color: $m-gray;
}
.avatar {
@include background-image(url('../images/small-header-home-icon.png'));
background-repeat: no-repeat;
height: 26px;
// CASE: right to left layout
display: inline-block;
@include left(8px);
opacity: 0.5;
overflow: hidden;
position: absolute;
top: 4px;
margin-top: 1px;
margin-right: 2px;
@include transition(all 0.15s linear 0s);
width: 19px;
}
div {
margin-top: 3px;
float: right;
margin-left: 4px;
}
div {
margin-top: 3px;
float: right;
margin-left: 4px;
}
&:hover, &:focus {
.avatar {

7
lms/templates/navigation-edx.html
View File

@@ -68,8 +68,11 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="user">
<li class="primary">
<a href="${reverse('dashboard')}" class="user-link">
<span class="avatar"></span>
<span class="sr">${_("Dashboard for:")} </span> ${user.username}
<i class="icon fa fa-home" aria-hidden="true"></i>
<span class="sr">${_("Dashboard for:")}</span>
<div>
${user.username}
</div>
</a>
</li>
<li class="primary">

121
lms/templates/verify_student/make_payment_step.underscore
View File

@@ -19,7 +19,66 @@
</div>
<% } %>
<% if ( isActive && ( !hasVisibleReqs || upgrade ) ) { %>
<div class="instruction <% if ( !upgrade ) { %>center-col<% } %>">
<% if ( _.some( requirements, function( isVisible ) { return isVisible; } ) ) { %>
<p>
<% if ( verificationDeadline ) { %>
<%- _.sprintf(
gettext( "You can pay now even if you don't have the following items available, but you will need to have these by %(date)s to qualify to earn a Verified Certificate." ),
{ date: verificationDeadline }
) %>
<% } else if ( !isActive ) { %>
<%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %>
<% } else { %>
<%- gettext( "You can pay now even if you don't have the following items available, but you will need to have these to qualify to earn a Verified Certificate." ) %>
<% } %>
</p>
<% } %>
</div>
<div class="requirements-container">
<ul class="list-reqs <% if ( requirements['account-activation-required'] ) { %>account-not-activated<% } %>">
<% if ( requirements['account-activation-required'] ) { %>
<li class="req req-0 req-activate">
<h4 class="title"><%- gettext( "Activate Your Account" ) %></h4>
<div class="placeholder-art">
<i class="icon fa fa-envelope-o" aria-hidden="true"></i>
</div>
<div class="copy">
<p>
<span class="copy-super"><%- gettext( "Check Your Email" ) %></span>
</p>
</div>
</li>
<% } else {%>
<% if ( requirements['photo-id-required'] ) { %>
<li class="req req-1 req-id">
<h4 class="title"><%- gettext( "Government-Issued Photo ID" ) %></h4>
<div class="placeholder-art fa-lg">
<i class="icon fa fa-list-alt fa-stack-2x" aria-hidden="true"></i>
<i class="icon fa fa-user id-photo fa-stack-1x" aria-hidden="true"></i>
</div>
<div class="copy"></div>
</li>
<% } %>
<% if ( requirements['webcam-required'] ) { %>
<li class="req req-2 req-webcam">
<h4 class="title"><%- gettext( "Webcam" ) %></h4>
<div class="placeholder-art">
<i class="icon fa fa-video-camera" aria-hidden="true"></i>
</div>
<div class="copy"></div>
</li>
<% } %>
<% } %>
</ul>
</div>
<% if ( isActive && ( !hasVisibleReqs || upgrade || !contributionAmount) ) { %>
<div class="wrapper-task hidden" aria-hidden="true">
<ol class="review-tasks">
<% if ( suggestedPrices.length > 0 ) { %>
@@ -97,66 +156,6 @@
</div>
<% } %>
<div class="instruction <% if ( !upgrade ) { %>center-col<% } %>">
<% if ( _.some( requirements, function( isVisible ) { return isVisible; } ) ) { %>
<p>
<% if ( verificationDeadline ) { %>
<%- _.sprintf(
gettext( "You can pay now even if you don't have the following items available, but you will need to have these by %(date)s to qualify to earn a Verified Certificate." ),
{ date: verificationDeadline }
) %>
<% } else if ( !isActive ) { %>
<%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %>
<% } else { %>
<%- gettext( "You can pay now even if you don't have the following items available, but you will need to have these to qualify to earn a Verified Certificate." ) %>
<% } %>
</p>
<% } %>
</div>
<div class="requirements-container">
<ul class="list-reqs <% if ( requirements['account-activation-required'] ) { %>account-not-activated<% } %>">
<% if ( requirements['account-activation-required'] ) { %>
<li class="req req-0 req-activate">
<h4 class="title"><%- gettext( "Activate Your Account" ) %></h4>
<div class="placeholder-art">
<i class="icon fa fa-envelope-o" aria-hidden="true"></i>
</div>
<div class="copy">
<p>
<span class="copy-super"><%- gettext( "Check Your Email" ) %></span>
</p>
</div>
</li>
<% } else {%>
<% if ( requirements['photo-id-required'] ) { %>
<li class="req req-1 req-id">
<h4 class="title"><%- gettext( "Government-Issued Photo ID" ) %></h4>
<div class="placeholder-art fa-lg">
<i class="icon fa fa-list-alt fa-stack-2x" aria-hidden="true"></i>
<i class="icon fa fa-user id-photo fa-stack-1x" aria-hidden="true"></i>
</div>
<div class="copy"></div>
</li>
<% } %>
<% if ( requirements['webcam-required'] ) { %>
<li class="req req-2 req-webcam">
<h4 class="title"><%- gettext( "Webcam" ) %></h4>
<div class="placeholder-art">
<i class="icon fa fa-video-camera" aria-hidden="true"></i>
</div>
<div class="copy"></div>
</li>
<% } %>
<% } %>
</ul>
</div>
<% if ( isActive ) { %>
<nav class="nav-wizard is-ready <% if ( isActive && !upgrade ) { %>center<% } %>">
<% if ( upgrade ) { %>