From 80b0edf08266b26113a80104297a0099f56d4d3c Mon Sep 17 00:00:00 2001 From: Tasawer Date: Thu, 6 Aug 2015 15:39:01 +0500 Subject: [PATCH] Fixing course settings page for change in minimum grade ECOM-1987 --- cms/static/js/views/settings/grading.js | 2 +- cms/static/sass/views/_settings.scss | 10 ++++++++++ cms/templates/settings_graders.html | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cms/static/js/views/settings/grading.js b/cms/static/js/views/settings/grading.js index def1ff1bc0..8a3bab4fc6 100644 --- a/cms/static/js/views/settings/grading.js +++ b/cms/static/js/views/settings/grading.js @@ -102,7 +102,7 @@ var GradingView = ValidatingView.extend({ renderMinimumGradeCredit: function() { var minimum_grade_credit = this.model.get('minimum_grade_credit'); this.$el.find('#course-minimum_grade_credit').val( - Math.round(parseFloat(minimum_grade_credit) * 100) + '%' + Math.round(parseFloat(minimum_grade_credit) * 100) ); }, setGracePeriod : function(event) { diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss index e579baa6ad..467a2b464e 100644 --- a/cms/static/sass/views/_settings.scss +++ b/cms/static/sass/views/_settings.scss @@ -225,6 +225,16 @@ } } } + + .input-minimum-grade { + @include float(left); + @include size(92%,100%); + } + + .minimum-grade-percentage-sign { + @include line-height(30); + padding-left: ($baseline/4);; + } textarea.long { height: ($baseline*5); diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index 43c220bc5b..6deac5c679 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -86,7 +86,8 @@
  1. - + + % ${_("Must be greater than or equal to the course passing grade")}