- % if settings.FEATURES.get('CONTENT_VISIBILITY_NOTICE',''): -
-
-
- -
-

Content Visibility Notice

-

- ${_("Materials uploaded here are viewable by the general public in addition " - "to your registered Stanford students. Such publicly-viewable content is subject " - "to copyright exemptions more restrictive than material viewable only by registered " - "Stanford students. Therefore, before uploading any content that has not been " - "created by you or content to which neither you nor Stanford owns all of the " - "rights, you must obtain the permissions (releases, waivers, licenses, etc.) " - "necessary to distribute such materials to the public through the Internet. " - "If you have any questions, please send an email to " - "{copyright_email}").format(copyright_email=settings.COPYRIGHT_EMAIL)} -

-
-
-
-
- % endif + <%static:optional_include_mako file="asset_index_content_header.html" />

${_("Loading")}

diff --git a/cms/templates/asset_index_content_header.html b/cms/templates/asset_index_content_header.html new file mode 100644 index 000000000000..a692e1021726 --- /dev/null +++ b/cms/templates/asset_index_content_header.html @@ -0,0 +1,20 @@ +## Update text for upstream PR +
+
+ +
+

Content Visibility Notice

+

+ ${_("Materials uploaded here are viewable by the general public in addition " + "to your registered Stanford students. Such publicly-viewable content is subject " + "to copyright exemptions more restrictive than material viewable only by registered " + "Stanford students. Therefore, before uploading any content that has not been " + "created by you or content to which neither you nor Stanford owns all of the " + "rights, you must obtain the permissions (releases, waivers, licenses, etc.) " + "necessary to distribute such materials to the public through the Internet. " + "If you have any questions, please send an email to " + "{copyright_email}").format(copyright_email=settings.COPYRIGHT_EMAIL)} +

+
+
+
From cf22bcaca6d7c87c4751b8cb5a8e53efebbc01d2 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 16:42:14 -0800 Subject: [PATCH 2/8] Moves stanford FullScreenImage hack to file --- cms/templates/base.html | 7 +------ cms/templates/stanford-hack-full-screen-image.html | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 cms/templates/stanford-hack-full-screen-image.html diff --git a/cms/templates/base.html b/cms/templates/base.html index a0ff3e0b4dd0..cb9df74b5ded 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -62,12 +62,7 @@ - - + <%include file="stanford-hack-full-screen-image.html" />
diff --git a/cms/templates/stanford-hack-full-screen-image.html b/cms/templates/stanford-hack-full-screen-image.html new file mode 100644 index 000000000000..618c63c90da1 --- /dev/null +++ b/cms/templates/stanford-hack-full-screen-image.html @@ -0,0 +1,5 @@ + From 99e19dc01fba2be47e3fbc515b7ab0f9f66ddb28 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 16:49:46 -0800 Subject: [PATCH 3/8] Moves course info keyword subs to file --- cms/templates/course_info.html | 5 ----- cms/templates/course_info_introduction_post.html | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 cms/templates/course_info_introduction_post.html diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index e61057810e00..07c95b17ab73 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -7,7 +7,6 @@ from openedx.core.djangolib.js_utils import ( dump_js_escaped_json, js_escaped_string ) -from openedx.core.djangolib.markup import HTML, Text %> ## TODO decode course # from context_course into title. @@ -57,10 +56,6 @@

${_('Page Actions')}

${_('Use course updates to notify students of important dates or exams, highlight particular discussions in the forums, announce schedule changes, and respond to student questions. You add or edit updates in HTML.')}

-

${Text(_('Updates support {link_start}keyword substitution{link_end}.')).format( - link_start=HTML(''), - link_end=HTML(''))} -

diff --git a/cms/templates/course_info_introduction_post.html b/cms/templates/course_info_introduction_post.html new file mode 100644 index 000000000000..d40cae7b3af6 --- /dev/null +++ b/cms/templates/course_info_introduction_post.html @@ -0,0 +1,10 @@ +<%! +from openedx.core.djangolib.markup import HTML, Text +%> + +

+ ${Text(_('Updates support {link_start}keyword substitution{link_end}.')).format( + link_start=HTML(''), + link_end=HTML(''), + )} +

From 331044937633bfa7926f459f40d1b9a5e8346fc2 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 16:59:36 -0800 Subject: [PATCH 4/8] Move extra underscore includes to file --- cms/templates/course_outline.html | 3 ++- cms/templates/course_outline_header_extras_post.html | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 cms/templates/course_outline_header_extras_post.html diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html index da2c12584e1f..de7e3c6f2caf 100644 --- a/cms/templates/course_outline.html +++ b/cms/templates/course_outline.html @@ -26,11 +26,12 @@ <%block name="header_extras"> -% for template_name in ['course-outline', 'xblock-string-field-editor', 'basic-modal', 'modal-button', 'course-outline-modal', 'due-date-editor', 'release-date-editor', 'grading-editor', 'publish-editor', 'staff-lock-editor', 'content-visibility-editor', 'verification-access-editor', 'timed-examination-preference-editor', 'access-editor', 'settings-modal-tabs', 'show-correctness-editor']: +% for template_name in ['course-outline', 'xblock-string-field-editor', 'basic-modal', 'modal-button', 'course-outline-modal', 'due-date-editor', 'release-date-editor', 'grading-editor', 'publish-editor', 'staff-lock-editor', 'content-visibility-editor', 'verification-access-editor', 'timed-examination-preference-editor', 'access-editor', 'settings-modal-tabs']: % endfor +<%static:optional_include_mako file="course_outline_header_extras_post.html" /> <%block name="page_alert"> diff --git a/cms/templates/course_outline_header_extras_post.html b/cms/templates/course_outline_header_extras_post.html new file mode 100644 index 000000000000..790b39b5ec83 --- /dev/null +++ b/cms/templates/course_outline_header_extras_post.html @@ -0,0 +1,4 @@ +% for template_name in ['show-correctness-editor',]: + From 6cfd2bea7fda7d5f80b7507ec5d36b560f8da0fc Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 17:03:28 -0800 Subject: [PATCH 5/8] TODO: PR split studio home upstream --- cms/templates/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/templates/index.html b/cms/templates/index.html index 4fb412c7c157..9c063e879a18 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -298,6 +298,7 @@

${course_info['display_name']}

% if libraries_enabled or is_programs_enabled:
  • + ## PR upstream without feature flag % if split_studio_home: ${_("Courses")} % else: From 8a78261de5bb9bb0fb1da587ac29eaef5351387b Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 17:08:06 -0800 Subject: [PATCH 6/8] TODO: PR course about sidebar HTML upstream --- cms/templates/settings.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/templates/settings.html b/cms/templates/settings.html index cc0d4c33d14b..b1bc90ca3fc3 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -343,6 +343,7 @@

    ${_("Introducing Your Course")}

    )}
    • + ## PR this feature upstream
  • From b9de75ac8f3cf4221e20f8499a1bc1ad9e92dc1e Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 22 Jan 2018 17:30:57 -0800 Subject: [PATCH 7/8] Moves header subnav to file --- cms/templates/widgets/header.html | 17 +---------------- cms/templates/widgets/header_nav_help_post.html | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 cms/templates/widgets/header_nav_help_post.html diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index ed8ea3d82686..baf36121afc3 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -225,22 +225,7 @@

    ${_("Account Navigation")}