Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ab74f64e
Commit
ab74f64e
authored
Jul 08, 2015
by
zubair-arbi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update credit eligibility ui text
ECOM-1648
parent
8cde240d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
21 deletions
+26
-21
cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py
+6
-6
cms/static/js/views/settings/main.js
+2
-2
cms/static/sass/views/_settings.scss
+4
-0
cms/templates/settings.html
+10
-9
cms/templates/settings_graders.html
+4
-4
No files found.
cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py
View file @
ab74f64e
...
...
@@ -29,8 +29,8 @@ class CreditEligibilityTest(CourseTestCase):
"""
response
=
self
.
client
.
get_html
(
self
.
course_details_url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertNotContains
(
response
,
"C
redit Eligibility
Requirements"
)
self
.
assertNotContains
(
response
,
"Steps
needed for credit eligibility
"
)
self
.
assertNotContains
(
response
,
"C
ourse Credit
Requirements"
)
self
.
assertNotContains
(
response
,
"Steps
required to earn course credit
"
)
@mock.patch.dict
(
"django.conf.settings.FEATURES"
,
{
'ENABLE_CREDIT_ELIGIBILITY'
:
True
})
def
test_course_details_with_enabled_setting
(
self
):
...
...
@@ -41,8 +41,8 @@ class CreditEligibilityTest(CourseTestCase):
# course is not set as credit course
response
=
self
.
client
.
get_html
(
self
.
course_details_url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertNotContains
(
response
,
"C
redit Eligibility
Requirements"
)
self
.
assertNotContains
(
response
,
"Steps
needed for credit eligibility
"
)
self
.
assertNotContains
(
response
,
"C
ourse Credit
Requirements"
)
self
.
assertNotContains
(
response
,
"Steps
required to earn course credit
"
)
# verify that credit eligibility requirements block shows if the
# course is set as credit course and it has eligibility requirements
...
...
@@ -55,5 +55,5 @@ class CreditEligibilityTest(CourseTestCase):
response
=
self
.
client
.
get_html
(
self
.
course_details_url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertContains
(
response
,
"C
redit Eligibility
Requirements"
)
self
.
assertContains
(
response
,
"Steps
needed for credit eligibility
"
)
self
.
assertContains
(
response
,
"C
ourse Credit
Requirements"
)
self
.
assertContains
(
response
,
"Steps
required to earn course credit
"
)
cms/static/js/views/settings/main.js
View file @
ab74f64e
...
...
@@ -54,8 +54,8 @@ var DetailsView = ValidatingView.extend({
if
(
options
.
showMinGradeWarning
||
false
)
{
new
NotificationView
.
Warning
({
title
:
gettext
(
"C
redit Eligibility
Requirements"
),
message
:
gettext
(
"
Minimum passing grade for
credit is not set."
),
title
:
gettext
(
"C
ourse Credit
Requirements"
),
message
:
gettext
(
"
The minimum grade for course
credit is not set."
),
closeIcon
:
true
}).
show
();
}
...
...
cms/static/sass/views/_settings.scss
View file @
ab74f64e
...
...
@@ -97,6 +97,10 @@
}
// in form -UI hints/tips/messages
.header-help
{
margin
:
0
0
$baseline
0
;
}
.instructions
{
@extend
%t-copy-sub1
;
margin
:
0
0
$baseline
0
;
...
...
cms/templates/settings.html
View file @
ab74f64e
...
...
@@ -112,8 +112,8 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
<p>
${_(
'Your course summary page will not be viewable until your course '
'has been announced. To provide content for the page and preview '
'it, follow the instructions provided by your Program Manager.')
}
</p>
'it, follow the instructions provided by your Program Manager.')
}
</p>
</div>
</div>
% endif
...
...
@@ -123,16 +123,18 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
% if credit_eligibility_enabled and is_credit_course:
<section
class=
"group-settings basic"
>
<header>
<h2
class=
"title-2"
>
${_("C
redit Eligibility
Requirements")}
</h2>
<span
class=
"tip"
>
${_("Steps
needed for credit eligibility
")}
</span>
<h2
class=
"title-2"
>
${_("C
ourse Credit
Requirements")}
</h2>
<span
class=
"tip"
>
${_("Steps
required to earn course credit
")}
</span>
</header>
<span
class=
"header-help tip"
>
A requirement appears in this list when you publish the unit that contains the requirement.
</span>
% if credit_requirements:
<ol
class=
"list-input"
>
% if 'grade' in credit_requirements:
<li
class=
"field text is-not-editable"
id=
"credit-minimum-passing-grade"
>
<label>
${_("Minimum
Passing
Grade")}
</label>
<label>
${_("Minimum Grade")}
</label>
% for requirement in credit_requirements['grade']:
<label
for=
"${requirement['name']}"
class=
"sr"
>
${_("Minimum
Passing
Grade")}
</label>
<label
for=
"${requirement['name']}"
class=
"sr"
>
${_("Minimum Grade")}
</label>
<input
title=
"${_('This field is disabled: this information cannot be changed.')}"
type=
"text"
class=
"long"
id=
"${requirement['name']}"
value=
"${'{0:.0f}%'.format(float(requirement['criteria']['min_grade'] or 0)*100)}"
readonly
/>
% endfor
...
...
@@ -152,12 +154,11 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
% if 'reverification' in credit_requirements:
<li
class=
"field text is-not-editable"
id=
"credit-reverification-requirements"
>
<label>
${_("
Successful In-Course Rev
erification")}
</label>
<label>
${_("
ID V
erification")}
</label>
% for requirement in credit_requirements['reverification']:
## Translators: 'Access to Assessment 1' means the access for a requirement with name 'Assessment 1'
<label
for=
"${requirement['name']}"
class=
"sr"
>
${_('In-Course Reverification {number}').format(number=loop.index+1)}
</label>
<input
title=
"${_('This field is disabled: this information cannot be changed.')}"
type=
"text"
class=
"long"
id=
"${requirement['name']}"
value=
"${
_('Access to {display_name}').format(display_name=requirement['display_name'])
}"
readonly
/>
class=
"long"
id=
"${requirement['name']}"
value=
"${
requirement['display_name']
}"
readonly
/>
% endfor
</li>
% endif
...
...
cms/templates/settings_graders.html
View file @
ab74f64e
...
...
@@ -79,15 +79,15 @@
% if settings.FEATURES.get("ENABLE_CREDIT_ELIGIBILITY", False) and is_credit_course:
<section
class=
"group-settings grade-rules"
>
<header>
<h2
class=
"title-2"
>
${_("Credit
Grade
&
Eligibility")}
</h2>
<span
class=
"tip"
>
${_("Settings for credit eligibility")}
</span>
<h2
class=
"title-2"
>
${_("Credit Eligibility")}
</h2>
<span
class=
"tip"
>
${_("Settings for c
ourse c
redit eligibility")}
</span>
</header>
<ol
class=
"list-input"
>
<li
class=
"field text"
id=
"field-course-minimum_grade_credit"
>
<label
for=
"course-minimum_grade_credit"
>
${_("Minimum
Passing Grade to Earn Credit
:")}
</label>
<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"
/>
<span
class=
"tip tip-inline"
id=
"minimum_grade_description"
>
${_("Must be greater than or equal to passing grade")}
</span>
<span
class=
"tip tip-inline"
id=
"minimum_grade_description"
>
${_("Must be greater than or equal to
the course
passing grade")}
</span>
</li>
</ol>
</section>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment