revert learner portal links blocking juniper release

appsembler · May 4, 2020 · 6d942bc · 6d942bc
1 parent bc8aa8b
commit 6d942bc
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 414 deletions.
diff --git a/lms/static/js/apiClient/.eslintrc.js b/lms/static/js/apiClient/.eslintrc.js
diff --git a/lms/static/js/apiClient/index.js b/lms/static/js/apiClient/index.js
diff --git a/lms/static/js/custom_user_menu_links/.eslintrc.js b/lms/static/js/custom_user_menu_links/.eslintrc.js
diff --git a/lms/static/js/custom_user_menu_links/CustomUserMenuLinks.js b/lms/static/js/custom_user_menu_links/CustomUserMenuLinks.js
diff --git a/lms/static/js/learner_dashboard/EnterpriseLearnerPortalBanner.jsx b/lms/static/js/learner_dashboard/EnterpriseLearnerPortalBanner.jsx
diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss
@@ -73,7 +73,6 @@
 @import 'features/_unsupported-browser-alert';
 @import 'features/content-type-gating';
 @import 'features/course-duration-limits';
-@import 'features/enterprise-learner-portal-banner';
 @import 'features/first-purchase-banner';
 @import 'features/next-up-banner';
 

diff --git a/lms/static/sass/_build-lms-v2.scss b/lms/static/sass/_build-lms-v2.scss
@@ -33,7 +33,6 @@
 @import 'features/course-sock';
 @import 'features/course-upgrade-message';
 @import 'features/content-type-gating';
-@import 'features/enterprise-learner-portal-banner';
 
 
 // Responsive Design

diff --git a/lms/static/sass/bootstrap/lms-main.scss b/lms/static/sass/bootstrap/lms-main.scss
@@ -28,7 +28,6 @@ $static-path: '../..';
 @import 'features/course-sock';
 @import 'features/course-upgrade-message';
 @import 'features/course-duration-limits';
-@import 'features/enterprise-learner-portal-banner';
 @import 'features/first-purchase-banner';
 @import 'features/next-up-banner';
 

diff --git a/lms/static/sass/features/_enterprise-learner-portal-banner.scss b/lms/static/sass/features/_enterprise-learner-portal-banner.scss
diff --git a/lms/templates/header/user_dropdown.html b/lms/templates/header/user_dropdown.html
@@ -1,6 +1,6 @@
 ## mako
 <%page expression_filter="h"/>
-<%namespace name='static' file='../static_content.html'/>
+<%namespace name='static' file='static_content.html'/>
 
 <%!
 from django.conf import settings
@@ -22,12 +22,6 @@
 displayname = get_enterprise_learner_generic_name(request) or username
 %>
 
-<%static:webpack entry="CustomUserMenuLinks">
-    $(document).ready(function() {
-        CustomUserMenuLinks();
-    });
-</%static:webpack>
-
 <div class="nav-item hidden-mobile">
     <a href="${reverse('dashboard')}" class="menu-title">
         <img class="user-image-frame" src="${profile_image_url}" alt="">
@@ -43,7 +37,7 @@
         % if resume_block:
             <div class="mobile-nav-item dropdown-item dropdown-nav-item"><a href="${resume_block}" role="menuitem">${_("Resume your last course")}</a></div>
         % endif
-        <div class="mobile-nav-item dropdown-item dropdown-nav-item dashboard"><a href="${reverse('dashboard')}" role="menuitem">${_("Dashboard")}</a></div>
+        <div class="mobile-nav-item dropdown-item dropdown-nav-item"><a href="${reverse('dashboard')}" role="menuitem">${_("Dashboard")}</a></div>
         <div class="mobile-nav-item dropdown-item dropdown-nav-item"><a href="${reverse('learner_profile', kwargs={'username': username})}" role="menuitem">${_("Profile")}</a></div>
         <div class="mobile-nav-item dropdown-item dropdown-nav-item"><a href="${reverse('account_settings')}" role="menuitem">${_("Account")}</a></div>
         % if should_redirect_to_order_history_microfrontend():