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

ENT-576: Update Registration/Signin Page to include static message
hastexo · Jan 17, 2018 · f78d5d2 · f78d5d2
2 parents 78f5b10 + 2ae02a6
commit f78d5d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py
@@ -660,6 +660,7 @@ def test_enterprise_register(self, url_name, ec_present, ec_name, logo_url, mock
             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
             )

diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -3392,8 +3392,10 @@ def _make_locale_paths(settings):
 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 = {

diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss
@@ -10,7 +10,7 @@
     height: 100%;
     padding-left: $baseline;
     padding-right: $baseline;
-    margin-left: auto;
+    margin: auto;
   }
 
   .login-register.border-left {

diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py
@@ -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
     )