diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss index f2bd25c601..45ea111b6f 100644 --- a/cms/static/sass/_courseware.scss +++ b/cms/static/sass/_courseware.scss @@ -498,6 +498,7 @@ input.courseware-unit-search-input { } &.new-section { + header { height: auto; @include clearfix(); @@ -506,6 +507,15 @@ input.courseware-unit-search-input { .expand-collapse-icon { visibility: hidden; } + + .item-details { + padding: 25px 0 0 0; + + .section-name { + float: none; + width: 100%; + } + } } } diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index 9fe1531489..d6fe53d982 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -13,9 +13,6 @@ from xmodule.xml_module import XmlDescriptor import self_assessment_module import open_ended_module from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST -import dateutil -import dateutil.parser -from xmodule.timeparse import parse_timedelta log = logging.getLogger("mitx.courseware") @@ -152,7 +149,7 @@ class CombinedOpenEndedV1Module(): self.skip_basic_checks = self.metadata.get('skip_spelling_checks', SKIP_BASIC_CHECKS) display_due_date_string = self.metadata.get('due', None) - + grace_period_string = self.metadata.get('graceperiod', None) try: self.timeinfo = TimeInfo(display_due_date_string, grace_period_string) @@ -817,4 +814,4 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor): for child in ['task']: add_child(child) - return elt \ No newline at end of file + return elt diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py index c6fbd8e5df..e262db5615 100644 --- a/common/lib/xmodule/xmodule/peer_grading_module.py +++ b/common/lib/xmodule/xmodule/peer_grading_module.py @@ -428,7 +428,7 @@ class PeerGradingModule(XModule): #This is a dev_facing_error log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id)) #This is a student_facing_error - return self._err_response('') + return self._err_response('There was an error saving your score. Please notify course staff.') def peer_grading_closed(self): '''