From 68d1c7f78cf4d0e084e60e0d0f8d45ee5c1702e6 Mon Sep 17 00:00:00 2001 From: morenol Date: Mon, 27 Jul 2020 12:01:40 -0400 Subject: [PATCH] [BD-10] Remove _uses_pattern_library property from EdxFragmentViews (#24536) --- .../fragments/standalone-page-v1.html | 10 ---------- .../fragments/standalone-page-v2.html | 13 ------------ lms/djangoapps/discussion/views.py | 1 - lms/djangoapps/learner_dashboard/programs.py | 2 -- .../fragments/standalone-page-v1.html | 8 -------- .../fragments/standalone-page-v2.html | 11 ---------- openedx/core/djangoapps/plugin_api/views.py | 20 +++---------------- .../views/course_bookmarks.py | 1 - .../course_experience/views/course_dates.py | 1 - .../course_experience/views/course_home.py | 1 - .../course_experience/views/course_outline.py | 1 - .../course_experience/views/course_updates.py | 2 -- .../course_experience/views/latest_update.py | 1 - .../views/welcome_message.py | 1 - .../course_search/views/course_search.py | 1 - .../views/learner_achievements.py | 1 - 16 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 cms/templates/fragments/standalone-page-v1.html delete mode 100644 cms/templates/fragments/standalone-page-v2.html delete mode 100644 lms/templates/fragments/standalone-page-v1.html delete mode 100644 lms/templates/fragments/standalone-page-v2.html diff --git a/cms/templates/fragments/standalone-page-v1.html b/cms/templates/fragments/standalone-page-v1.html deleted file mode 100644 index 32cd026410..0000000000 --- a/cms/templates/fragments/standalone-page-v1.html +++ /dev/null @@ -1,10 +0,0 @@ -## mako - -<%page expression_filter="h"/> - -<%inherit file="../base.html" /> -<%block name="title">${page_title if page_title else ''} - -<%block name="content"> - <%include file="/fragments/standalone-page-fragment.html" args="fragment=fragment"/> - diff --git a/cms/templates/fragments/standalone-page-v2.html b/cms/templates/fragments/standalone-page-v2.html deleted file mode 100644 index 3a78db48eb..0000000000 --- a/cms/templates/fragments/standalone-page-v2.html +++ /dev/null @@ -1,13 +0,0 @@ -## mako - -<%page expression_filter="h"/> - -## Override the default styles_version to the Pattern Library version (version 2) -<%! main_css = "style-main-v2" %> - -<%inherit file="../base.html" /> -<%block name="title">${page_title if page_title else ''} - -<%block name="content"> - <%include file="/fragments/standalone-page-fragment.html" args="fragment=fragment"/> - diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py index 51870f61b3..9c67665b34 100644 --- a/lms/djangoapps/discussion/views.py +++ b/lms/djangoapps/discussion/views.py @@ -695,7 +695,6 @@ class DiscussionBoardFragmentView(EdxFragmentView): """ Component implementation of the discussion board. """ - _uses_pattern_library = False def render_to_fragment( self, diff --git a/lms/djangoapps/learner_dashboard/programs.py b/lms/djangoapps/learner_dashboard/programs.py index 4ec9df392d..40f9e8e6ad 100644 --- a/lms/djangoapps/learner_dashboard/programs.py +++ b/lms/djangoapps/learner_dashboard/programs.py @@ -31,7 +31,6 @@ class ProgramsFragmentView(EdxFragmentView): """ A fragment to program listing. """ - _uses_pattern_library = False def render_to_fragment(self, request, **kwargs): """ @@ -84,7 +83,6 @@ class ProgramDetailsFragmentView(EdxFragmentView): """ Render the program details fragment. """ - _uses_pattern_library = False def render_to_fragment(self, request, program_uuid, **kwargs): """View details about a specific program.""" diff --git a/lms/templates/fragments/standalone-page-v1.html b/lms/templates/fragments/standalone-page-v1.html deleted file mode 100644 index d9f97304af..0000000000 --- a/lms/templates/fragments/standalone-page-v1.html +++ /dev/null @@ -1,8 +0,0 @@ -## mako - -<%page expression_filter="h"/> - -<%inherit file="/main.html" /> -<%block name="pagetitle">${page_title if page_title else ''} - -<%include file="/fragments/standalone-page-fragment.html" args="fragment=fragment"/> diff --git a/lms/templates/fragments/standalone-page-v2.html b/lms/templates/fragments/standalone-page-v2.html deleted file mode 100644 index 83f533387b..0000000000 --- a/lms/templates/fragments/standalone-page-v2.html +++ /dev/null @@ -1,11 +0,0 @@ -## mako - -<%page expression_filter="h"/> - -## Override the default styles_version to the Pattern Library version (version 2) -<%! main_css = "style-main-v2" %> - -<%inherit file="/main.html" /> -<%block name="pagetitle">${page_title if page_title else ''} - -<%include file="/fragments/standalone-page-fragment.html" args="fragment=fragment"/> diff --git a/openedx/core/djangoapps/plugin_api/views.py b/openedx/core/djangoapps/plugin_api/views.py index d4ad82e2c1..965e0a1d3e 100644 --- a/openedx/core/djangoapps/plugin_api/views.py +++ b/openedx/core/djangoapps/plugin_api/views.py @@ -21,7 +21,6 @@ class EdxFragmentView(FragmentView): The base class of all Open edX fragment views. """ page_title = None - _uses_pattern_library = True @staticmethod def get_css_dependencies(group): @@ -85,8 +84,7 @@ class EdxFragmentView(FragmentView): Creates the base context for rendering a fragment as a standalone page. """ return { - 'uses_pattern_library': self.uses_pattern_library, - 'uses_bootstrap': not self.uses_pattern_library, + 'uses_bootstrap': True, 'disable_accordion': True, 'allow_iframing': True, 'disable_header': True, @@ -134,22 +132,10 @@ class EdxFragmentView(FragmentView): 'fragment': fragment, 'page_title': self.standalone_page_title(request, fragment, **kwargs), }) - if context.get('uses_pattern_library', False): - template = 'fragments/standalone-page-v2.html' - elif context.get('uses_bootstrap', False): - template = 'fragments/standalone-page-bootstrap.html' - else: - template = 'fragments/standalone-page-v1.html' + template_name = 'fragments/standalone-page-bootstrap.html' return render( request=request, - template_name=template, + template_name=template_name, context=context ) - - @property - def uses_pattern_library(self): - """ - Returns true if this fragment is rendered with edx-pattern-library. - """ - return self._uses_pattern_library diff --git a/openedx/features/course_bookmarks/views/course_bookmarks.py b/openedx/features/course_bookmarks/views/course_bookmarks.py index 7f239cb800..585b047ba3 100644 --- a/openedx/features/course_bookmarks/views/course_bookmarks.py +++ b/openedx/features/course_bookmarks/views/course_bookmarks.py @@ -65,7 +65,6 @@ class CourseBookmarksFragmentView(EdxFragmentView): """ Fragment view that shows a user's bookmarks for a course. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id=None, **kwargs): """ diff --git a/openedx/features/course_experience/views/course_dates.py b/openedx/features/course_experience/views/course_dates.py index c4a590633d..bebdb7079d 100644 --- a/openedx/features/course_experience/views/course_dates.py +++ b/openedx/features/course_experience/views/course_dates.py @@ -64,7 +64,6 @@ class CourseDatesFragmentMobileView(CourseDatesFragmentView): mechanism to automatically create/recreate session with the server for all authenticated requests if the server returns 404. """ - _uses_pattern_library = False template_name = 'course_experience/mobile/course-dates-fragment.html' def get(self, request, *args, **kwargs): diff --git a/openedx/features/course_experience/views/course_home.py b/openedx/features/course_experience/views/course_home.py index 15fa55d803..72b3a49cd5 100644 --- a/openedx/features/course_experience/views/course_home.py +++ b/openedx/features/course_experience/views/course_home.py @@ -84,7 +84,6 @@ class CourseHomeFragmentView(EdxFragmentView): """ A fragment to render the home page for a course. """ - _uses_pattern_library = False def _get_resume_course_info(self, request, course_id): """ diff --git a/openedx/features/course_experience/views/course_outline.py b/openedx/features/course_experience/views/course_outline.py index f6baf4d021..1b4f7b1f8c 100644 --- a/openedx/features/course_experience/views/course_outline.py +++ b/openedx/features/course_experience/views/course_outline.py @@ -47,7 +47,6 @@ class CourseOutlineFragmentView(EdxFragmentView): """ Course outline fragment to be shown in the unified course view. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id, user_is_enrolled=True, **kwargs): # pylint: disable=arguments-differ """ diff --git a/openedx/features/course_experience/views/course_updates.py b/openedx/features/course_experience/views/course_updates.py index 4640da9d61..d64ed51018 100644 --- a/openedx/features/course_experience/views/course_updates.py +++ b/openedx/features/course_experience/views/course_updates.py @@ -80,7 +80,6 @@ class CourseUpdatesFragmentView(EdxFragmentView): """ A fragment to render the updates page for a course. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id=None, **kwargs): """ @@ -104,7 +103,6 @@ class CourseUpdatesFragmentView(EdxFragmentView): 'updates': ordered_updates, 'plain_html_updates': plain_html_updates, 'disable_courseware_js': True, - 'uses_pattern_library': True, } html = render_to_string('course_experience/course-updates-fragment.html', context) return Fragment(html) diff --git a/openedx/features/course_experience/views/latest_update.py b/openedx/features/course_experience/views/latest_update.py index b2d5a28f5e..9b1b9df935 100644 --- a/openedx/features/course_experience/views/latest_update.py +++ b/openedx/features/course_experience/views/latest_update.py @@ -21,7 +21,6 @@ class LatestUpdateFragmentView(EdxFragmentView): """ A fragment that displays the latest course update. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id=None, **kwargs): """ diff --git a/openedx/features/course_experience/views/welcome_message.py b/openedx/features/course_experience/views/welcome_message.py index e4d414344d..dfb2dc5e86 100644 --- a/openedx/features/course_experience/views/welcome_message.py +++ b/openedx/features/course_experience/views/welcome_message.py @@ -24,7 +24,6 @@ class WelcomeMessageFragmentView(EdxFragmentView): """ A fragment that displays a course's welcome message. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id=None, **kwargs): """ diff --git a/openedx/features/course_search/views/course_search.py b/openedx/features/course_search/views/course_search.py index 6b7e834e48..0c606cc4ce 100644 --- a/openedx/features/course_search/views/course_search.py +++ b/openedx/features/course_search/views/course_search.py @@ -51,7 +51,6 @@ class CourseSearchFragmentView(EdxFragmentView): """ A fragment to render the home page for a course. """ - _uses_pattern_library = False def render_to_fragment(self, request, course_id=None, **kwargs): """ diff --git a/openedx/features/learner_profile/views/learner_achievements.py b/openedx/features/learner_profile/views/learner_achievements.py index 2ed37411ee..ac5dba1ae9 100644 --- a/openedx/features/learner_profile/views/learner_achievements.py +++ b/openedx/features/learner_profile/views/learner_achievements.py @@ -16,7 +16,6 @@ class LearnerAchievementsFragmentView(EdxFragmentView): """ A fragment to render a learner's achievements. """ - _uses_pattern_library = False def render_to_fragment(self, request, username=None, own_profile=False, **kwargs): """