diff --git a/changelog.d/20240614_162236_codewithemad_cleanup.md b/changelog.d/20240614_162236_codewithemad_cleanup.md new file mode 100644 index 000000000..b13abff92 --- /dev/null +++ b/changelog.d/20240614_162236_codewithemad_cleanup.md @@ -0,0 +1 @@ +- [Improvement] Instead of forcing users to use Authentication MFe, the platform decides how users should log in. (by @CodeWithEmad) \ No newline at end of file diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py index 6ce6324aa..68640935c 100644 --- a/tutorindigo/plugin.py +++ b/tutorindigo/plugin.py @@ -28,7 +28,7 @@ {"title": "About Us", "url": "/about"}, {"title": "Blog", "url": "/blog"}, {"title": "Donate", "url": "/donate"}, - {"title": "Terms of Sevice", "url": "/tos"}, + {"title": "Terms of Service", "url": "/tos"}, {"title": "Privacy Policy", "url": "/privacy"}, {"title": "Help", "url": "/help"}, {"title": "Contact Us", "url": "/contact"}, @@ -116,7 +116,7 @@ def _override_openedx_docker_image( RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' """, ), - # Tutor-Indigo v2.1 targets the styling updations in discussions and learner-dashboard MFE + # Tutor-Indigo v2.1 targets the styling updates in discussions and learner-dashboard MFE # brand-openedx is related to styling updates while others are for header and footer updates ( "mfe-dockerfile-post-npm-install-discussions", diff --git a/tutorindigo/templates/indigo/lms/static/fonts/OFL.txt b/tutorindigo/templates/indigo/lms/static/fonts/OFL.txt index bb385d236..fc189f5e9 100644 --- a/tutorindigo/templates/indigo/lms/static/fonts/OFL.txt +++ b/tutorindigo/templates/indigo/lms/static/fonts/OFL.txt @@ -19,7 +19,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss index 6b82acbdf..087de9627 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss @@ -17,7 +17,7 @@ .courses-listing { letter-spacing: -.32em; margin: 0 -2.5%; - @media only screen and (min-width: $big-screen) { + @media only screen and (min-width: $big-screen) { margin: 0 -1.5%; } li { @@ -34,7 +34,7 @@ @include media-breakpoint-up(md) { width: 28.33% !important; } - @media only screen and (min-width: $big-screen) { + @media only screen and (min-width: $big-screen) { width: calc(25% - 3%) !important; margin: 0 1.5% 25px !important; } diff --git a/tutorindigo/templates/indigo/lms/static/sass/dashboard/_dashboard.scss b/tutorindigo/templates/indigo/lms/static/sass/dashboard/_dashboard.scss index 60f4c21a4..35d8dd17b 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/dashboard/_dashboard.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/dashboard/_dashboard.scss @@ -53,7 +53,7 @@ padding: 100px 0; } } - .wrapper-header-courses { display: none; } + .wrapper-header-courses { display: none; } } .course-heading-area { margin: 0 0 20px; diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss index ee61337dc..b29ffa3f3 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss @@ -455,9 +455,9 @@ body.view-instructordash { box-shadow: none; } } -.course-wrapper .course-content .xblock.xblock-student_view-vertical, -.course-wrapper .course-content .xblock.xblock-public_view-vertical, -.course-wrapper .courseware-results-wrapper .xblock.xblock-student_view-vertical, +.course-wrapper .course-content .xblock.xblock-student_view-vertical, +.course-wrapper .course-content .xblock.xblock-public_view-vertical, +.course-wrapper .courseware-results-wrapper .xblock.xblock-student_view-vertical, .course-wrapper .courseware-results-wrapper .xblock.xblock-public_view-vertical { max-width: 100% !important; } diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss index c11fa75b3..08b245b44 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss @@ -10,8 +10,8 @@ $f-sans-serif: Crimson, 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-ser @import 'edx-bootstrap/sass/open-edx/theme'; -// Introducing new variables +// Introducing new variables -$dark: #111827; +$dark: #111827; $light-dark: #374151; $big-screen: 1200px; diff --git a/tutorindigo/templates/indigo/lms/static/sass/programs/_programs.scss b/tutorindigo/templates/indigo/lms/static/sass/programs/_programs.scss index be9aed9e9..a267206f6 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/programs/_programs.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/programs/_programs.scss @@ -242,7 +242,7 @@ @include media-breakpoint-up(md) { width: calc(100% - 32% - 40px); } - @media only screen and (min-width: $big-screen) { + @media only screen and (min-width: $big-screen) { max-width: calc(100% - 24% - 40px); } } @@ -260,7 +260,7 @@ @include media-breakpoint-up(md) { max-width: calc(100% - 32% - 40px); } - @media only screen and (min-width: $big-screen) { + @media only screen and (min-width: $big-screen) { max-width: calc(100% - 24% - 40px); } .program-heading { @@ -334,7 +334,7 @@ .run-period { font-size: 12px; line-height: 16px; - color: #0F8B8D; + color: #0F8B8D; } } } diff --git a/tutorindigo/templates/indigo/lms/templates/courseware/course_about.html b/tutorindigo/templates/indigo/lms/templates/courseware/course_about.html index 48f1a59d6..939ae79cb 100644 --- a/tutorindigo/templates/indigo/lms/templates/courseware/course_about.html +++ b/tutorindigo/templates/indigo/lms/templates/courseware/course_about.html @@ -149,7 +149,7 @@

- +
diff --git a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html index f743ac198..4eaf3faea 100644 --- a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html +++ b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html @@ -85,7 +85,6 @@

${_('Refine Your Search')}

% endif -
- + % if show_courseware_link and not is_unfulfilled_entitlement: % if not is_course_expired: - + ${_('{course_number} {course_name} Home Page').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default)} - + % else: - + ${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default)} - + % endif % else: - + ${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default)} - + % endif % if display_course_modes_on_dashboard and course_verified_certs.get('display_mode') != 'audit': @@ -329,7 +329,7 @@

- + diff --git a/tutorindigo/templates/indigo/lms/templates/footer.html b/tutorindigo/templates/indigo/lms/templates/footer.html index 0c8a36eb5..9bb2593e5 100644 --- a/tutorindigo/templates/indigo/lms/templates/footer.html +++ b/tutorindigo/templates/indigo/lms/templates/footer.html @@ -57,7 +57,7 @@ Copyrights ©${datetime.now().year}. All Rights Reserved. % endif
- + % if context.get('include_language_selector', footer_language_selector_is_enabled()): <%include file="${static.get_template_path('widgets/footer-language-selector.html')}"/> % endif @@ -121,7 +121,7 @@ Copyrights ©${datetime.now().year}. All Rights Reserved. % endif
- + % if context.get('include_language_selector', footer_language_selector_is_enabled()): <%include file="${static.get_template_path('widgets/footer-language-selector.html')}"/> % endif diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html index 87730c676..62c26e3db 100644 --- a/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html +++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html @@ -9,8 +9,6 @@ from django.conf import settings from django.urls import reverse from django.utils.translation import gettext as _ - -from openedx.core.djangoapps.user_authn.toggles import should_redirect_to_authn_microfrontend %> <% @@ -19,7 +17,6 @@ allows_login = not settings.FEATURES['DISABLE_LOGIN_BUTTON'] and not combined_login_and_register can_discover_courses = settings.FEATURES.get('ENABLE_COURSE_DISCOVERY') allow_public_account_creation = static.get_value('ALLOW_PUBLIC_ACCOUNT_CREATION', settings.FEATURES.get('ALLOW_PUBLIC_ACCOUNT_CREATION')) and settings.FEATURES.get('SHOW_REGISTRATION_LINKS', True) - should_redirect_to_authn_mfe = should_redirect_to_authn_microfrontend() %>
diff --git a/tutorindigo/templates/indigo/lms/templates/learner_dashboard/program_card.underscore b/tutorindigo/templates/indigo/lms/templates/learner_dashboard/program_card.underscore index 1a7c142a6..6aeafb29c 100644 --- a/tutorindigo/templates/indigo/lms/templates/learner_dashboard/program_card.underscore +++ b/tutorindigo/templates/indigo/lms/templates/learner_dashboard/program_card.underscore @@ -57,7 +57,7 @@ - +