From f318f1b355b2818762a8d27df2f58cb20045359b Mon Sep 17 00:00:00 2001 From: Carol Tong Date: Thu, 2 Apr 2015 13:26:06 -0400 Subject: [PATCH 1/2] Edits to UI text for Discussion Blackout Dates, Discussion Topic Mapping to address DOC-1434, DOC-1828 --- common/lib/xmodule/xmodule/course_module.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index 9d1e3ee99b..dfd91784ed 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -277,11 +277,12 @@ class CourseFields(object): discussion_blackouts = List( display_name=_("Discussion Blackout Dates"), help=_( - 'Enter pairs of dates between which students cannot post to discussion forums. Each pair should be ' - 'formatted as ["YYYY-MM-DD", "YYYY-MM-DD"]. To specify times as well as dates, format each pair ' - 'as ["YYYY-MM-DDTHH:MM", "YYYY-MM-DDTHH:MM"] (be sure to include the "T" between the date and ' - 'time). An entry defining more than one blackout period might look like this: ' - '[["2014-09-15", "2014-09-21"], ["2014-10-01", "2014-10-08"]]' + 'Enter pairs of dates between which students cannot post to discussion forums. Inside the provided ' + 'brackets, enter an additional set of square brackets surrounding each pair of dates you add. ' + 'Format each pair of dates as ["YYYY-MM-DD", "YYYY-MM-DD"]. To specify times as well as dates, format ' + 'each pair as ["YYYY-MM-DDTHH:MM", "YYYY-MM-DDTHH:MM"]. Be sure to include the "T" between the date and time. ' + 'For example, an entry defining two blackout periods looks like this, including the outer pair of square ' + 'brackets: [["2015-09-15", "2015-09-21"], ["2015-10-01", "2015-10-08"]] ' ), scope=Scope.settings ) @@ -290,8 +291,9 @@ class CourseFields(object): help=_( 'Enter discussion categories in the following format: "CategoryName": ' '{"id": "i4x-InstitutionName-CourseNumber-course-CourseRun"}. For example, one discussion ' - 'category may be "Lydian Mode": {"id": "i4x-UniversityX-MUS101-course-2014_T1"}. The "id" ' - 'value for each category must be unique.' + 'category may be "Lydian Mode": {"id": "i4x-UniversityX-MUS101-course-2015_T1"}. The "id" ' + 'value for each category must be unique. In "id" values, the only special characters that are ' + 'supported are underscore, hyphen, and period.' ), scope=Scope.settings ) From 4ebefce767114efc68092a6517cf5dedc565c980 Mon Sep 17 00:00:00 2001 From: Carol Tong Date: Thu, 2 Apr 2015 16:04:32 -0400 Subject: [PATCH 2/2] Fix line length --- common/lib/xmodule/xmodule/course_module.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index dfd91784ed..48a6807510 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -279,10 +279,10 @@ class CourseFields(object): help=_( 'Enter pairs of dates between which students cannot post to discussion forums. Inside the provided ' 'brackets, enter an additional set of square brackets surrounding each pair of dates you add. ' - 'Format each pair of dates as ["YYYY-MM-DD", "YYYY-MM-DD"]. To specify times as well as dates, format ' - 'each pair as ["YYYY-MM-DDTHH:MM", "YYYY-MM-DDTHH:MM"]. Be sure to include the "T" between the date and time. ' - 'For example, an entry defining two blackout periods looks like this, including the outer pair of square ' - 'brackets: [["2015-09-15", "2015-09-21"], ["2015-10-01", "2015-10-08"]] ' + 'Format each pair of dates as ["YYYY-MM-DD", "YYYY-MM-DD"]. To specify times as well as dates, ' + 'format each pair as ["YYYY-MM-DDTHH:MM", "YYYY-MM-DDTHH:MM"]. Be sure to include the "T" between ' + 'the date and time. For example, an entry defining two blackout periods looks like this, including ' + 'the outer pair of square brackets: [["2015-09-15", "2015-09-21"], ["2015-10-01", "2015-10-08"]] ' ), scope=Scope.settings )