diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py index 11e0289acb..00b4881808 100644 --- a/lms/djangoapps/courseware/tests/test_course_info.py +++ b/lms/djangoapps/courseware/tests/test_course_info.py @@ -388,7 +388,7 @@ class SelfPacedCourseInfoTestCase(LoginEnrollmentTestCase, SharedModuleStoreTest self.assertEqual(resp.status_code, 200) def test_num_queries_instructor_paced(self): - self.fetch_course_info_with_queries(self.instructor_paced_course, 22, 3) + self.fetch_course_info_with_queries(self.instructor_paced_course, 25, 3) def test_num_queries_self_paced(self): - self.fetch_course_info_with_queries(self.self_paced_course, 22, 3) + self.fetch_course_info_with_queries(self.self_paced_course, 25, 3) diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss index 25b1095129..ddca292653 100644 --- a/lms/static/sass/_build-lms-v1.scss +++ b/lms/static/sass/_build-lms-v1.scss @@ -18,6 +18,7 @@ @import 'edx-pattern-library-shims/buttons'; // base - elements +@import 'elements/banners'; @import 'elements/controls'; @import 'elements/creative-commons'; @import 'elements/icons'; diff --git a/lms/static/sass/bootstrap/_components.scss b/lms/static/sass/bootstrap/_components.scss new file mode 100644 index 0000000000..3957b06a25 --- /dev/null +++ b/lms/static/sass/bootstrap/_components.scss @@ -0,0 +1,19 @@ +// Open edX: components +// ==================== + +// Page banner +.page-banner { + max-width: $lms-max-width; + margin: 0 auto; + + .user-messages { + margin-top: $baseline; + } +} + +// Alerts +.alert { + .icon-alert { + margin-right: $baseline / 4; + } +} diff --git a/lms/static/sass/bootstrap/lms-main.scss b/lms/static/sass/bootstrap/lms-main.scss index 8b2059f028..4f89e9c064 100644 --- a/lms/static/sass/bootstrap/lms-main.scss +++ b/lms/static/sass/bootstrap/lms-main.scss @@ -13,3 +13,4 @@ @import 'footer'; @import 'navigation'; @import 'layouts'; +@import 'components'; diff --git a/lms/static/sass/elements/_banners.scss b/lms/static/sass/elements/_banners.scss index 27d76fd8e9..dab763fb8e 100644 --- a/lms/static/sass/elements/_banners.scss +++ b/lms/static/sass/elements/_banners.scss @@ -44,3 +44,50 @@ $full-width-banner-margin: 20px; right: $full-width-banner-margin; } } + +.page-banner { + max-width: $lms-max-width; + margin: 0 auto; + + .user-messages { + padding-top: $baseline; + } + + .alert { + margin-bottom: $baseline !important; + padding: $baseline; + border: 1px solid; + + .icon-alert { + margin-right: $baseline / 4; + } + + &.alert-info { + color: $state-info-text; + background-color: $state-info-bg; + border-color: $state-info-border; + box-shadow: none; + } + + &.alert-success { + color: $state-success-text; + background-color: $state-success-bg; + border-color: $state-success-border; + box-shadow: none; + } + + &.alert-warning { + color: $state-warning-text; + background-color: $state-warning-bg; + border-color: $state-warning-border; + box-shadow: none; + } + + &.alert-danger { + color: $state-danger-text; + background-color: $state-danger-bg; + border-color: $state-danger-border; + box-shadow: none; + } + } +} diff --git a/lms/static/sass/partials/base/_variables.scss b/lms/static/sass/partials/base/_variables.scss index 00aa6d412f..27bfac453d 100644 --- a/lms/static/sass/partials/base/_variables.scss +++ b/lms/static/sass/partials/base/_variables.scss @@ -220,6 +220,26 @@ $alert-color: rgb(212, 64, 64) !default; $success-color: rgb(0, 155, 0) !default; $success-color-hover: rgb(0, 129, 0) !default; +// ---------------------------- +// #COLORS- Bootstrap-style +// ---------------------------- + +$state-success-text: $black !default; +$state-success-bg: #dff0d8 !default; +$state-success-border: darken($state-success-bg, 5%) !default; + +$state-info-text: $black !default; +$state-info-bg: #d9edf7 !default; +$state-info-border: darken($state-info-bg, 7%) !default; + +$state-warning-text: $black !default; +$state-warning-bg: #fcf8e3 !default; +$state-warning-border: darken($state-warning-bg, 5%) !default; + +$state-danger-text: $black !default; +$state-danger-bg: #f2dede !default; +$state-danger-border: darken($state-danger-bg, 5%) !default; + // ---------------------------- // #COLORS- EDX-SPECIFIC // ---------------------------- diff --git a/lms/static/sass/shared-v2/_components.scss b/lms/static/sass/shared-v2/_components.scss index 59ec336dd5..cabb4e45cf 100644 --- a/lms/static/sass/shared-v2/_components.scss +++ b/lms/static/sass/shared-v2/_components.scss @@ -89,6 +89,48 @@ } } +.page-banner { + max-width: $lms-max-width; + margin: 0 auto; + + .alert { + margin-top: $baseline; + border: 1px solid; + + .icon-alert { + margin-right: $baseline / 4; + } + + &.alert-info { + color: $state-info-text; + background-color: $state-info-bg; + border-color: $state-info-border; + box-shadow: none; + } + + &.alert-success { + color: $state-success-text; + background-color: $state-success-bg; + border-color: $state-success-border; + box-shadow: none; + } + + &.alert-warning { + color: $state-warning-text; + background-color: $state-warning-bg; + border-color: $state-warning-border; + box-shadow: none; + } + + &.alert-danger { + color: $state-danger-text; + background-color: $state-danger-bg; + border-color: $state-danger-border; + box-shadow: none; + } + } +} + .wrapper-preview-menu { @include clearfix(); @include box-sizing(border-box); diff --git a/lms/static/sass/shared-v2/_variables.scss b/lms/static/sass/shared-v2/_variables.scss index 5ea9424aae..9603ac1136 100644 --- a/lms/static/sass/shared-v2/_variables.scss +++ b/lms/static/sass/shared-v2/_variables.scss @@ -62,3 +62,23 @@ $lms-dark-icon-background-color: palette(grayscale, black) !default; $site-status-color: rgb(182,37,103) !default; $shadow-l1: rgba(0,0,0,0.1) !default; + +// ---------------------------- +// #ALERTS +// ---------------------------- + +$state-success-text: $black !default; +$state-success-bg: #dff0d8 !default; +$state-success-border: darken($state-success-bg, 5%) !default; + +$state-info-text: $black !default; +$state-info-bg: #d9edf7 !default; +$state-info-border: darken($state-info-bg, 7%) !default; + +$state-warning-text: $black !default; +$state-warning-bg: #fcf8e3 !default; +$state-warning-border: darken($state-warning-bg, 5%) !default; + +$state-danger-text: $black !default; +$state-danger-bg: #f2dede !default; +$state-danger-border: darken($state-danger-bg, 5%) !default; diff --git a/lms/templates/main.html b/lms/templates/main.html index 8cf1562992..dad1767c40 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -141,6 +141,8 @@ from pipeline_mako import render_require_js_path_overrides <%include file="/preview_menu.html" /> % endif + <%include file="/page_banner.html" /> +
${self.body()} <%block name="bodyextra"/> diff --git a/lms/templates/page_banner.html b/lms/templates/page_banner.html new file mode 100644 index 0000000000..e7f998732e --- /dev/null +++ b/lms/templates/page_banner.html @@ -0,0 +1,24 @@ +## mako + +<%page expression_filter="h"/> + +<%namespace name='static' file='static_content.html'/> +<% online_help_token = self.online_help_token() if hasattr(self, 'online_help_token') else None %> +<%! +from django.utils.translation import ugettext as _ +from openedx.core.djangolib.markup import HTML +from openedx.core.djangoapps.util.user_messages import user_messages +%> + +% if user_messages: +
+
+ % for message in user_messages(request): + + % endfor +
+
+% endif diff --git a/lms/templates/ux/reference/bootstrap/course-skeleton.html b/lms/templates/ux/reference/bootstrap/course-skeleton.html index 7eae185815..ff31a6368a 100644 --- a/lms/templates/ux/reference/bootstrap/course-skeleton.html +++ b/lms/templates/ux/reference/bootstrap/course-skeleton.html @@ -1,3 +1,5 @@ +## mako + ## Override the default styles_version to use Bootstrap <%! main_css = "css/bootstrap/lms-main.css" %> diff --git a/lms/templates/ux/reference/index.html b/lms/templates/ux/reference/index.html index bb4db4d303..a9d1b8de3b 100644 --- a/lms/templates/ux/reference/index.html +++ b/lms/templates/ux/reference/index.html @@ -1,5 +1,4 @@ -## Override the default styles_version to the Pattern Library version (version 2) -<%! main_css = "style-main-v2" %> +## mako <%page expression_filter="h"/> <%inherit file="/main.html" /> @@ -18,10 +17,14 @@

UX Style Reference

-

Page Types

+

v1-style LMS Pages

+ +

Pattern Library

+

Bootstrap

diff --git a/lms/templates/ux/reference/pattern-library-test.html b/lms/templates/ux/reference/pattern-library-test.html deleted file mode 100644 index 67f68270c5..0000000000 --- a/lms/templates/ux/reference/pattern-library-test.html +++ /dev/null @@ -1,24 +0,0 @@ -## Override the default styles_version to the Pattern Library version (version 2) -<%! main_css = "style-main-v2" %> - -<%page expression_filter="h"/> -<%inherit file="/main.html" /> - -<%block name="pagetitle">Pattern Library Test -<%block name="nav_skip">#content - -<%block name="bodyclass">pattern-library - -<%block name="content"> -

Pattern Library test page

- - - diff --git a/lms/templates/ux/reference/course-skeleton.html b/lms/templates/ux/reference/pattern-library/course-skeleton.html similarity index 99% rename from lms/templates/ux/reference/course-skeleton.html rename to lms/templates/ux/reference/pattern-library/course-skeleton.html index f626364591..c5ccc5357a 100644 --- a/lms/templates/ux/reference/course-skeleton.html +++ b/lms/templates/ux/reference/pattern-library/course-skeleton.html @@ -1,3 +1,5 @@ +## mako + ## Override the default styles_version to the Pattern Library version (version 2) <%! main_css = "style-main-v2" %> diff --git a/lms/templates/ux/reference/v1/course-skeleton.html b/lms/templates/ux/reference/v1/course-skeleton.html new file mode 100644 index 0000000000..f19081dbe3 --- /dev/null +++ b/lms/templates/ux/reference/v1/course-skeleton.html @@ -0,0 +1,945 @@ +## mako + +<%page expression_filter="h"/> + +<%namespace name='static' file='/static_content.html'/> +<%inherit file="/main.html" /> + +<%block name="pagetitle">Course Skeleton + +<%block name="bodyclass">view-in-course view-courseware courseware + +<%block name="headextra"> +<%static:css group='style-course-vendor'/> +<%static:css group='style-course'/> + + +<%block name="content"> + +
+ +
+ diff --git a/lms/urls.py b/lms/urls.py index 87cda93ceb..2ba2ced7fd 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -998,7 +998,10 @@ if settings.DEBUG: settings.PROFILE_IMAGE_BACKEND['options']['base_url'], document_root=settings.PROFILE_IMAGE_BACKEND['options']['location'] ) + # TODO: re-enable this after removing the URL below + # urlpatterns += url(r'^template/(?P