From 39900f052c6b669f300efb7800cc40eb90b47e33 Mon Sep 17 00:00:00 2001 From: Aura Milena Alba <36944773+amalbas@users.noreply.github.com> Date: Tue, 11 Aug 2020 08:57:12 -0500 Subject: [PATCH] [BD-10] Remove uses of variable uses_pattern_library (#24628) --- cms/templates/widgets/user_dropdown.html | 80 +++++++----------------- lms/djangoapps/courseware/views/views.py | 1 - lms/templates/header/header.html | 9 --- lms/templates/main.html | 2 +- lms/templates/navigation/navigation.html | 9 --- lms/templates/user_dropdown.html | 21 ------- 6 files changed, 24 insertions(+), 98 deletions(-) diff --git a/cms/templates/widgets/user_dropdown.html b/cms/templates/widgets/user_dropdown.html index 82c146eb75..5129cd19cf 100644 --- a/cms/templates/widgets/user_dropdown.html +++ b/cms/templates/widgets/user_dropdown.html @@ -8,61 +8,27 @@ from student.roles import GlobalStaff %> -% if uses_pattern_library: - <%! - ## TODO: Use metric to see if CMS ever uses pattern library or if this case can be deleted. - ## NOTE: When removing, remove all references to `set_custom_metric`. - set_custom_metric('uses_pattern_library', True) - %> -
-

- ${_("Currently signed in as:")} - -

- - +

+ + ${_("Currently signed in as:")} + + + +

+
+
+
- -% else: - <%! - set_custom_metric('uses_pattern_library', False) - %> -

- - ${_("Currently signed in as:")} - - - -

-
-
- -
-
-% endif +
diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index 67d187cea8..60562278f1 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -584,7 +584,6 @@ class StaticCourseTabView(EdxFragmentView): 'active_page': 'static_tab_{0}'.format(tab['url_slug']), 'tab': tab, 'fragment': fragment, - 'uses_pattern_library': False, 'disable_courseware_js': True, }) diff --git a/lms/templates/header/header.html b/lms/templates/header/header.html index 14123480ce..0ebf1e1b09 100644 --- a/lms/templates/header/header.html +++ b/lms/templates/header/header.html @@ -22,15 +22,6 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_ ## Provide a hook for themes to inject branding on top. <%block name="navigation_top" /> -## Add UI Toolkit components if using the Pattern Library -% if uses_pattern_library: - <%block name="js_extra"> - <%static:require_module module_name="js/header_factory" class_name="HeaderFactory"> - HeaderFactory(); - - -% endif - <% unsupported_browser_alert_versions = configuration_helpers.get_value('UNSUPPORTED_BROWSER_ALERT_VERSIONS', settings.FEATURES.get('UNSUPPORTED_BROWSER_ALERT_VERSIONS')) %> diff --git a/lms/templates/main.html b/lms/templates/main.html index 48edc767a1..140910df9d 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -99,7 +99,7 @@ from pipeline_mako import render_require_js_path_overrides <%static:css group='${self.attr.main_css}'/> % endif - % if disable_courseware_js or uses_pattern_library: + % if disable_courseware_js: <%static:js group='base_vendor'/> <%static:js group='base_application'/> % else: diff --git a/lms/templates/navigation/navigation.html b/lms/templates/navigation/navigation.html index 22d7ac0965..a68c1efa98 100644 --- a/lms/templates/navigation/navigation.html +++ b/lms/templates/navigation/navigation.html @@ -25,15 +25,6 @@ from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_en ## Provide a hook for themes to inject branding on top. <%block name="navigation_top" /> -## Add UI Toolkit components if using the Pattern Library -% if uses_pattern_library: - <%block name="js_extra"> - <%static:require_module module_name="js/header_factory" class_name="HeaderFactory"> - HeaderFactory(); - - -% endif - % if uses_bootstrap: