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

Merge pull request #17200 from edx/saleem-latif/ENT-576

Browse Source 
ENT-576: Update Registration/Signin Page to include static message
This commit is contained in:
Saleem Latif
2018-01-17 15:38:30 +05:00
committed by GitHub
parent 78f5b102ca 2ae02a6559
commit f78d5d2de6
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/djangoapps/student_account/test/test_views.py
View File

@@ -660,6 +660,7 @@ class StudentAccountLoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMi
expected_message = welcome_message.format(
start_bold=u'<b>',
end_bold=u'</b>',
line_break=u'<br/>',
enterprise_name=ec_name,
platform_name=settings.PLATFORM_NAME
)

6
lms/envs/common.py
View File

@@ -3392,8 +3392,10 @@ ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = 512 # Enterprise logo image size limit i
ENTERPRISE_PLATFORM_WELCOME_TEMPLATE = _(u'Welcome to {platform_name}.')
ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = _(
u'{start_bold}{enterprise_name}{end_bold} has partnered with {start_bold}'
'{platform_name}{end_bold} to offer you high-quality learning opportunities '
'from the world\'s best universities.'
'{platform_name}{end_bold} to offer you always available, high-quality learning '
'programs to help you advance your knowledge and your career. '
'{line_break}Please continue with registration, or log in if you are an existing user, '
'and press continue to start learning.'
)
ENTERPRISE_TAGLINE = ''
ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = {

2
lms/static/sass/views/_login-register.scss
View File

@@ -10,7 +10,7 @@
height: 100%;
padding-left: $baseline;
padding-right: $baseline;
margin-left: auto;
margin: auto;
}
.login-register.border-left {

7
openedx/features/enterprise_support/utils.py
View File

@@ -90,9 +90,10 @@ def get_enterprise_sidebar_context(enterprise_customer):
settings.ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE
)
branded_welcome_string = branded_welcome_template.format(
start_bold=u'<b>',
end_bold=u'</b>',
branded_welcome_string = Text(branded_welcome_template).format(
start_bold=HTML('<b>'),
end_bold=HTML('</b>'),
line_break=HTML('<br/>'),
enterprise_name=enterprise_customer['name'],
platform_name=platform_name
)