Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9214 from edx/tasawer/bugfix/ecom-1987-fixing-validation-error-in-minimum-grade

Browse Source 
Fixing course settings page for change in minimum grade
This commit is contained in:
tasawernawaz
2015-08-10 12:41:18 +05:00
parent cb678b9c35 80b0edf082
commit 96779dfe52
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/js/views/settings/grading.js
View File

@@ -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) {

10
cms/static/sass/views/_settings.scss
View File

@@ -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);

3
cms/templates/settings_graders.html
View File

@@ -86,7 +86,8 @@
<ol class="list-input">
<li class="field text" id="field-course-minimum_grade_credit">
<label for="course-minimum_grade_credit">${_("Minimum Credit-Eligible Grade:")}</label>
<input type="text" class="short time" id="course-minimum_grade_credit" value="0" placeholder="80%" autocomplete="off" aria-describedby="minimum_grade_description"/>
<input type="text" class="short time input-minimum-grade" id="course-minimum_grade_credit" value="0" placeholder="80" autocomplete="off" aria-describedby="minimum_grade_description"/>
<span class="minimum-grade-percentage-sign">%</span>
<span class="tip tip-inline" id="minimum_grade_description">${_("Must be greater than or equal to the course passing grade")}</span>
</li>
</ol>