Merge pull request #232 from appsembler/juniper/main

Update from `juniper/main` (production)
appsembler · Feb 6, 2023 · 22894a5 · 22894a5
2 parents 4067713 + 5b8cc2e
commit 22894a5
Show file tree

Hide file tree

Showing 11 changed files with 8,744 additions and 13 deletions.
diff --git a/config.codekit3 b/config.codekit3
diff --git a/lms/static/sass/courseware/_course-content-01.scss b/lms/static/sass/courseware/_course-content-01.scss
@@ -1015,4 +1015,13 @@ body.view-in-course {
   right: 0;
   opacity: 0.7;
   font-size: calcRem(12);
+}
+
+// fix display of partially correct answers
+.xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicegroup input+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:focus+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicegroup input:focus+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:focus+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:focus+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:focus+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input:focus+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:focus+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input:focus+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:focus+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicegroup input:hover+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicegroup input:hover+label.choicegroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:hover+label.choicegroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup .choicegroup input:hover+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ProblemBlock div.problem .choicetextgroup input:hover+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input:hover+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:hover+label.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .choicetextgroup .xmodule_display.xmodule_ProblemBlock .choicegroup input:hover+section.choicetextgroup_partially-correct, .xmodule_display.xmodule_ConditionalModule div.problem .xmodule_display.xmodule_ProblemBlock .choicetextgroup input:hover+section.choicetextgroup_partially-correct {
+  border: 2px solid #f39c12;
+}
+
+.xmodule_display.xmodule_ProblemBlock div.problem .indicator-container .status.partially-correct .status-icon::after {
+  color: #f39c12;
 }
diff --git a/lms/static/sass/courseware/_progress.scss b/lms/static/sass/courseware/_progress.scss
@@ -44,4 +44,18 @@
       }
     }
   }
+}
+
+// fix centering of cert message and actions
+.profile-wrapper .course-info {
+
+  .wrapper-msg.wrapper-auto-cert .auto-cert-message .has-actions .msg-content {
+    width: 100%;
+  }
+
+  .wrapper-msg.wrapper-auto-cert .auto-cert-message .has-actions .msg-actions {
+    width: 100%;
+    text-align: center;
+    margin-top: 10px;
+  }
 }
diff --git a/lms/static/sass/pages/_learner-profile.scss b/lms/static/sass/pages/_learner-profile.scss
@@ -129,6 +129,17 @@
                 }
             }
         }
+
+        .learner-achievements .learner-message .message-actions .btn-brand {
+            color: $brand-primary-color;
+            background: none;
+            border: 2px solid $brand-primary-color;
+
+            &:hover, &:focus {
+                color: #fff;
+                background: $brand-primary-color;
+            }
+        }
     }
 }
 

diff --git a/lms/templates/design-templates/footer/_footer-appsembler-01.html b/lms/templates/design-templates/footer/_footer-appsembler-01.html
@@ -9,7 +9,7 @@
     <div class="a--footer__main-wrapper">
       <div class="a--footer__main">
         <div class="a--footer__logo">
-          <img src="${footer_logo}" role="presentation" />
+          <img src="${footer_logo}" alt="" />
         </div>
         <div class="a--footer__nav">
           <p class="a--footer__copyright-text">
@@ -47,10 +47,10 @@
             Powered by:
           </p>
           <a href="https://www.appsembler.com" target="_blank" id="footer-appsembler-logo">
-            <img src="${static.url('images/appsembler-logo-positive.svg')}" role="presentation" />
+            <img src="${static.url('images/appsembler-logo-positive.svg')}" alt="" />
           </a>
           <a href="http://open.edx.org" target="_blank" id="footer-openedx-logo">
-            <img src="${static.url('images/Open-edX-horz_COLOR.svg')}" role="presentation" />
+            <img src="${static.url('images/Open-edX-horz_COLOR.svg')}" alt="" />
           </a>
         </div>
       % endif

diff --git a/lms/templates/design-templates/pages/course-about/_course-about-01.html b/lms/templates/design-templates/pages/course-about/_course-about-01.html
@@ -26,7 +26,7 @@
       % if course_vars['course_video']:
         <a href="#" data-toggle="modal" data-target="#videoModal" class="a--course-about-01__header__video-trigger"><i class="fa fa-play-circle"></i></a>
       % endif
-      <img src="${course_image}" role="presentation" />
+      <img src="${course_image}" alt="" />
     </div>
     <div class="a--course-about-01__header__info">
       <h1 class="a--course-about-01__header__title">${course_vars['course_name']}</h1>

diff --git a/lms/templates/header/navbar-authenticated.html b/lms/templates/header/navbar-authenticated.html
@@ -16,10 +16,10 @@
   <div class="main">
 
     % if get_global_settings().get('course-catalogue_enabled', True):
-      <div class="mobile-nav-item hidden-mobile nav-item nav-tab">
+      <div class="mobile-nav-item hidden-mobile nav-item nav-tab" id="header-course-catalogue-cta">
         <a class="tab-nav-link discover-new-link" href="${marketing_link('COURSES')}"
           aria-current="${'page' if '/courses' in request.path else 'false'}">
-          ${_('Discover New Courses')}
+          ${_('Explore courses')}
         </a>
       </div>
     % endif

diff --git a/lms/templates/header/navbar-logo-header.html b/lms/templates/header/navbar-logo-header.html
@@ -16,8 +16,8 @@
 <div class="header-logo-section">
   % if course:
     <a href="${get_global_settings().get('header_logo_target','/')}">
-      <img class="logo logo-positive" src="${get_brand_logos()['icon_color']}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}"/>
-      <img class="logo logo-negative" src="${get_brand_logos()['icon_white']}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}"/>
+      <img class="logo logo-positive" src="${get_brand_logos()['icon_color']}" alt="${_("{platform_name} logo").format(platform_name=static.get_platform_name())}"/>
+      <img class="logo logo-negative" src="${get_brand_logos()['icon_white']}" alt="${_("{platform_name} logo for dark backgrounds").format(platform_name=static.get_platform_name())}"/>
     </a>
     <div class="course-header">
       <span class="provider">${course.display_org_with_default}:</span>
@@ -33,8 +33,8 @@
     </div>
   % else:
     <a href="${get_global_settings().get('header_logo_target','/')}">
-      <img  class="logo logo-positive" src="${get_brand_logos()['logo_positive']}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}"/>
-      <img  class="logo logo-negative" src="${get_brand_logos()['logo_negative']}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}"/>
+      <img  class="logo logo-positive" src="${get_brand_logos()['logo_positive']}" alt="${_("{platform_name} logo").format(platform_name=static.get_platform_name())}"/>
+      <img  class="logo logo-negative" src="${get_brand_logos()['logo_negative']}" alt="${_("{platform_name} logo for dark backgrounds").format(platform_name=static.get_platform_name())}"/>
     </a>
   % endif
 </div>
diff --git a/lms/templates/header/navbar-not-authenticated.html b/lms/templates/header/navbar-not-authenticated.html
@@ -27,7 +27,7 @@
   <div class="main">
 
     % if get_global_settings().get('course-catalogue_enabled', True) and get_global_settings().get('enable_course_catalogue_for_non-auth_users', True):
-      <div class="mobile-nav-item hidden-mobile nav-item">
+      <div class="mobile-nav-item hidden-mobile nav-item" id="header-course-catalogue-cta">
         <a href="/courses">${_('Explore courses')}</a>
       </div>
     % endif

diff --git a/lms/templates/page-builder/elements/_image-graphic.html b/lms/templates/page-builder/elements/_image-graphic.html
@@ -5,7 +5,7 @@
 % if options['link-url']:
   <a class="amc--element--image-graphic__link-wrapper" href="${options['link-url']}">
 % endif
-  <img src="${options['image-file']}" role="presentation" alt="${translate(options['image-alt-text'])}" class="amc--element--image-graphic amc--style-classes ${options['image-width']} ${options['margin-top']} ${options['margin-right']} ${options['margin-bottom']} ${options['margin-left']}" />
+  <img src="${options['image-file']}" alt="${translate(options['image-alt-text'])}" class="amc--element--image-graphic amc--style-classes ${options['image-width']} ${options['margin-top']} ${options['margin-right']} ${options['margin-bottom']} ${options['margin-left']}" />
 % if options['link-url']:
   </a>
 % endif
diff --git a/lms/templates/widgets/cookie-consent.html b/lms/templates/widgets/cookie-consent.html
@@ -41,7 +41,7 @@
     },
     theme: "classic",
     "elements": {
-        "dismiss": '<a aria-label="dismiss cookie message" id="dismiss" role=button tabindex="2" class="cc-btn cc-dismiss:focus">{{dismiss}}</a>',
+        "dismiss": '<a aria-label="${cookie_notification_dismiss_button_text} Dismiss the Cookie Message." id="dismiss" role=button tabindex="2" class="cc-btn cc-dismiss:focus">{{dismiss}}</a>',
     },
     "position": "bottom",
     "static": "true"