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

Merge pull request #8720 from edx/ECOM-1601-credit-help-link

Browse Source 
ECOM-1601: Added the help link of credit info
This commit is contained in:
Aamir
2015-07-08 11:55:11 +05:00
parent ef89c662f3 935da3a12c
commit 9f0b5ed2cd
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/envs/aws.py
View File

@@ -686,3 +686,6 @@ CREDIT_PROVIDER_SECRET_KEYS = AUTH_TOKENS.get("CREDIT_PROVIDER_SECRET_KEYS", {})
if FEATURES.get('ENABLE_LTI_PROVIDER'):
INSTALLED_APPS += ('lti_provider',)
AUTHENTICATION_BACKENDS += ('lti_provider.users.LtiBackend', )
##################### Credit Provider help link ####################
CREDIT_HELP_LINK_URL = ENV_TOKENS.get('CREDIT_HELP_LINK_URL', CREDIT_HELP_LINK_URL)

3
lms/envs/common.py
View File

@@ -2563,6 +2563,9 @@ CREDIT_PROVIDER_SECRET_KEYS = {}
# or denied for credit.
CREDIT_PROVIDER_TIMESTAMP_EXPIRATION = 15 * 60
# The Help link to the FAQ page about the credit
CREDIT_HELP_LINK_URL = "#"
# Default domain for the e-mail address associated with users who are created
# via the LTI Provider feature. Note that the generated e-mail addresses are
# not expected to be active; this setting simply allows administrators to

4
lms/static/sass/course/_profile.scss
View File

@@ -187,14 +187,16 @@
> .credit-eligibility-container {
padding: lh();
> .credit-help {
display: inline-block;
background: $blue;
color: $white;
width: lh();
width: lh(0.6);
margin: 0;
padding: 0;
border-radius: lh(0.9);
border-color: $white;
text-shadow: None;
@include padding-left(0.2em);
}
> .detail-collapse{
border: none;

2
lms/templates/courseware/progress.html
View File

@@ -114,7 +114,7 @@ from django.utils.http import urlquote_plus
%elif credit_course_requirements['eligibility_status'] == 'partial_eligible':
<span>${student.get_full_name()}, ${_("You have not yet met the requirements for credit.")}</span>
%endif
<button class="credit-help"><i class="fa fa-question"></i><span class="sr">Help regarding credit requirement</span></button><br>
<a href="${settings.CREDIT_HELP_LINK_URL}" class="credit-help"><i class="fa fa-question"></i><span class="sr">Help regarding course credit requirements</span></a><br>
<div class="requirement-container" data-eligible="${credit_course_requirements['eligibility_status']}">
%for requirement in credit_course_requirements['requirements']:
<div class="requirement">