From 7c8bdb9d6d9134a4bd48931872c8fbaf2a08b49b Mon Sep 17 00:00:00 2001 From: Ahsan Ulhaq Date: Wed, 25 Feb 2015 19:29:35 +0500 Subject: [PATCH 1/2] CSS issue of the change on the stage --- lms/static/sass/shared/_header.scss | 32 ++++++++++++++++++++++------- lms/templates/navigation-edx.html | 7 +++++-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index cc02f5bf6e..8c0b848be2 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -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 { diff --git a/lms/templates/navigation-edx.html b/lms/templates/navigation-edx.html index 2714920b77..bc586f7664 100644 --- a/lms/templates/navigation-edx.html +++ b/lms/templates/navigation-edx.html @@ -68,8 +68,11 @@ site_status_msg = get_site_status_msg(course_id)
  1. - - ${_("Dashboard for:")} ${user.username} + + ${_("Dashboard for:")} +
    + ${user.username} +
  2. From c07badecdd75c48870236287c83604b7a2bd2891 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Mon, 2 Mar 2015 12:54:45 -0500 Subject: [PATCH 2/2] Show the payment section if no contribution amount is selected --- .../make_payment_step.underscore | 121 +++++++++--------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/lms/templates/verify_student/make_payment_step.underscore b/lms/templates/verify_student/make_payment_step.underscore index 505429aa71..545900ea4d 100644 --- a/lms/templates/verify_student/make_payment_step.underscore +++ b/lms/templates/verify_student/make_payment_step.underscore @@ -19,7 +19,66 @@ <% } %> - <% if ( isActive && ( !hasVisibleReqs || upgrade ) ) { %> +
    + <% if ( _.some( requirements, function( isVisible ) { return isVisible; } ) ) { %> +

    + <% 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." ) %> + <% } %> +

    + <% } %> +
    + +
    +
      + <% if ( requirements['account-activation-required'] ) { %> +
    • +

      <%- gettext( "Activate Your Account" ) %>

      +
      + +
      + +
      +

      + <%- gettext( "Check Your Email" ) %> +

      +
      +
      • + <% } else {%> + <% if ( requirements['photo-id-required'] ) { %> +
    • +

      <%- gettext( "Government-Issued Photo ID" ) %>

      +
      + + +
      + +
      +
      • + <% } %> + + <% if ( requirements['webcam-required'] ) { %> +
    • +

      <%- gettext( "Webcam" ) %>

      +
      + +
      + +
      +
      • + <% } %> + <% } %> +
    +
    + + <% if ( isActive && ( !hasVisibleReqs || upgrade || !contributionAmount) ) { %> <% } %> -
    - <% if ( _.some( requirements, function( isVisible ) { return isVisible; } ) ) { %> -

    - <% 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." ) %> - <% } %> -

    - <% } %> -
    - -
    -
      - <% if ( requirements['account-activation-required'] ) { %> -
    • -

      <%- gettext( "Activate Your Account" ) %>

      -
      - -
      - -
      -

      - <%- gettext( "Check Your Email" ) %> -

      -
      -
      • - <% } else {%> - <% if ( requirements['photo-id-required'] ) { %> -
    • -

      <%- gettext( "Government-Issued Photo ID" ) %>

      -
      - - -
      - -
      -
      • - <% } %> - - <% if ( requirements['webcam-required'] ) { %> -
    • -

      <%- gettext( "Webcam" ) %>

      -
      - -
      - -
      -
      • - <% } %> - <% } %> -
    -
    - - <% if ( isActive ) { %>