From b58579526cfae66f2c7439f86ba7684a3d7d98d8 Mon Sep 17 00:00:00 2001
From: Braden MacDonald <mail@bradenm.com>
Date: Wed, 9 Aug 2017 09:05:05 -0700
Subject: [PATCH 1/5] Revert "Update problem-builder xblock install version
 (PLAT-1644)"

---
 requirements/edx/edx-private.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt
index 05cc6a8d09..191c636649 100644
--- a/requirements/edx/edx-private.txt
+++ b/requirements/edx/edx-private.txt
@@ -8,7 +8,7 @@
 
 # For Harvard courses:
 -e git+https://github.com/gsehub/xblock-mentoring.git@4d1cce78dc232d5da6ffd73817b5c490e87a6eee#egg=xblock-mentoring
-git+https://github.com/open-craft/problem-builder.git@v2.6.10#egg=xblock-problem-builder==2.6.10
+git+https://github.com/open-craft/problem-builder.git@v2.6.5#egg=xblock-problem-builder==2.6.5
 
 # Oppia XBlock
 -e git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock

From 2511c9fad6aabddd225cb22d77f1585c8e807293 Mon Sep 17 00:00:00 2001
From: Sarah Fischmann <sfischmann@edx.org>
Date: Fri, 4 Aug 2017 11:26:20 -0400
Subject: [PATCH 2/5] Adding link to proctor review rules in Studio

Allows instructors to see a link to the online proctoring review rules documentation while configuring and exam to be a proctored exam. Also updates the GitHub requirements to point to the newest 0.19.0 release of edx-proctoring.

EDUCATOR-757
---
 cms/djangoapps/contentstore/views/item.py           |  1 +
 .../timed-examination-preference-editor.underscore  | 13 ++++++++++++-
 requirements/edx/github.txt                         |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index 330eb0ee35..240a7dc2d4 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -1194,6 +1194,7 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
             elif xblock.category == 'sequential':
                 xblock_info.update({
                     'is_proctored_exam': xblock.is_proctored_exam,
+                    'online_proctoring_rules': settings.PROCTORING_SETTINGS.get('LINK_URLS', {}).get('online_proctoring_rules', {}),
                     'is_practice_exam': xblock.is_practice_exam,
                     'is_time_limited': xblock.is_time_limited,
                     'exam_review_rules': xblock.exam_review_rules,
diff --git a/cms/templates/js/timed-examination-preference-editor.underscore b/cms/templates/js/timed-examination-preference-editor.underscore
index a72e72996a..fad00198d3 100644
--- a/cms/templates/js/timed-examination-preference-editor.underscore
+++ b/cms/templates/js/timed-examination-preference-editor.underscore
@@ -42,7 +42,18 @@
                     <textarea cols="50" maxlength="255" aria-describedby="review-rules-description"
                         class="review-rules input input-text" autocomplete="off" />
                 </label>
-                <p class='field-message' id='review-rules-description'><%- gettext('Specify any additional rules or rule exceptions that the proctoring review team should enforce when reviewing the videos. For example, you could specify that calculators are allowed.') %></p>
+                <% var online_proctoring_rules = xblockInfo.get('online_proctoring_rules'); %>
+                <p class='field-message' id='review-rules-description'>
+                <%= edx.HtmlUtils.interpolateHtml(
+                    gettext('Specify any rules or rule exceptions that the proctoring review team should enforce when reviewing the videos. For example, you could specify that calculators are allowed. These specified rules are visible to learners before the learners start the exam, along with the {linkStart}general proctored exam rules{linkEnd}.'),
+                    {
+                        linkStart: edx.HtmlUtils.interpolateHtml(
+                            edx.HtmlUtils.HTML('<a href="{onlineProctoringUrl}" title="{onlineProctoringTitle}">'),
+                            { onlineProctoringUrl: online_proctoring_rules, onlineProctoringTitle: gettext('General Proctored Exam Rules')}),
+                        linkEnd: edx.HtmlUtils.HTML('</a>')
+                    })
+                %>
+                </p>
             </div>
         </div>
     </div>
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index a0eb04e88f..15bdbebf22 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -91,7 +91,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1
 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.5#egg=lti_consumer-xblock==1.1.5
-git+https://github.com/edx/edx-proctoring.git@0.18.2#egg=edx-proctoring==0.18.2
+git+https://github.com/edx/edx-proctoring.git@0.19.0#egg=edx-proctoring==0.19.0
 
 # Third Party XBlocks
 git+https://github.com/open-craft/xblock-poll@v1.2.7#egg=xblock-poll==1.2.7

From 700e8053db7794feb2adca7b56a7badd63d7a54f Mon Sep 17 00:00:00 2001
From: Jesse Shapiro <jesse@opencraft.com>
Date: Tue, 1 Aug 2017 14:08:20 -0400
Subject: [PATCH 3/5] Generalize support for user fields from SAP
 SuccessFactors SSO providers

---
 cms/envs/test.py                              |   1 +
 common/djangoapps/third_party_auth/saml.py    |  92 ++++++++++++--
 .../third_party_auth/tests/specs/base.py      |   4 +-
 .../tests/specs/test_testshib.py              | 113 ++++++++++++++++--
 4 files changed, 189 insertions(+), 21 deletions(-)

diff --git a/cms/envs/test.py b/cms/envs/test.py
index f33f0f3e76..4875b8447b 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -36,6 +36,7 @@ from lms.envs.test import (
     MEDIA_URL,
     COMPREHENSIVE_THEME_DIRS,
     JWT_AUTH,
+    REGISTRATION_EXTRA_FIELDS,
 )
 
 # mongo connection settings
diff --git a/common/djangoapps/third_party_auth/saml.py b/common/djangoapps/third_party_auth/saml.py
index 9b4ea285cb..568e785920 100644
--- a/common/djangoapps/third_party_auth/saml.py
+++ b/common/djangoapps/third_party_auth/saml.py
@@ -7,6 +7,7 @@ import requests
 from django.contrib.sites.models import Site
 from django.http import Http404
 from django.utils.functional import cached_property
+from django_countries import countries
 from social_core.backends.saml import OID_EDU_PERSON_ENTITLEMENT, SAMLAuth, SAMLIdentityProvider
 from social_core.exceptions import AuthForbidden
 
@@ -134,6 +135,77 @@ class SapSuccessFactorsIdentityProvider(EdXSAMLIdentityProvider):
         'odata_client_id',
     )
 
+    # Define the relationships between SAPSF record fields and Open edX logistration fields.
+    default_field_mapping = {
+        'username': 'username',
+        'firstName': 'first_name',
+        'lastName': 'last_name',
+        'defaultFullName': 'fullname',
+        'email': 'email',
+        'country': 'country',
+        'city': 'city',
+    }
+
+    # Define a simple mapping to relate SAPSF values to Open edX-compatible values for
+    # any given field. By default, this only contains the Country field, as SAPSF supplies
+    # a country name, which has to be translated to a country code.
+    default_value_mapping = {
+        'country': {name: code for code, name in countries}
+    }
+
+    # Unfortunately, not everything has a 1:1 name mapping between Open edX and SAPSF, so
+    # we need some overrides. TODO: Fill in necessary mappings
+    default_value_mapping.update({
+        'United States': 'US',
+    })
+
+    def get_registration_fields(self, response):
+        """
+        Get a dictionary mapping registration field names to default values.
+        """
+        field_mapping = self.field_mappings
+        registration_fields = {edx_name: response['d'].get(odata_name, '') for odata_name, edx_name in field_mapping.items()}
+        value_mapping = self.value_mappings
+        for field, value in registration_fields.items():
+            if field in value_mapping and value in value_mapping[field]:
+                registration_fields[field] = value_mapping[field][value]
+        return registration_fields
+
+    @property
+    def field_mappings(self):
+        """
+        Get a dictionary mapping the field names returned in an SAP SuccessFactors
+        user entity to the field names with which those values should be used in
+        the Open edX registration form.
+        """
+        overrides = self.conf.get('sapsf_field_mappings', {})
+        base = self.default_field_mapping.copy()
+        base.update(overrides)
+        return base
+
+    @property
+    def value_mappings(self):
+        """
+        Get a dictionary mapping of field names to override objects which each
+        map values received from SAP SuccessFactors to values expected in the
+        Open edX platform registration form.
+        """
+        overrides = self.conf.get('sapsf_value_mappings', {})
+        base = self.default_value_mapping.copy()
+        for field, override in overrides.items():
+            if field in base:
+                base[field].update(override)
+            else:
+                base[field] = override[field]
+        return base
+
+    @property
+    def timeout(self):
+        """
+        The number of seconds OData API requests should wait for a response before failing.
+        """
+        return self.conf.get('odata_api_request_timeout', 10)
+
     @property
     def sapsf_idp_url(self):
         return self.conf['sapsf_oauth_root_url'] + 'idp'
@@ -187,7 +259,7 @@ class SapSuccessFactorsIdentityProvider(EdXSAMLIdentityProvider):
                 'token_url': self.sapsf_token_url,
                 'private_key': self.sapsf_private_key,
             },
-            timeout=10,
+            timeout=self.timeout,
         )
         assertion.raise_for_status()
         assertion = assertion.text
@@ -199,7 +271,7 @@ class SapSuccessFactorsIdentityProvider(EdXSAMLIdentityProvider):
                 'grant_type': 'urn:ietf:params:oauth:grant-type:saml2-bearer',
                 'assertion': assertion,
             },
-            timeout=10,
+            timeout=self.timeout,
         )
         token.raise_for_status()
         token = token.json()['access_token']
@@ -220,12 +292,14 @@ class SapSuccessFactorsIdentityProvider(EdXSAMLIdentityProvider):
         username = details['username']
         try:
             client = self.get_odata_api_client(user_id=username)
+            fields = ','.join(self.field_mappings)
             response = client.get(
-                '{root_url}User(userId=\'{user_id}\')?$select=username,firstName,lastName,defaultFullName,email'.format(
+                '{root_url}User(userId=\'{user_id}\')?$select={fields}'.format(
                     root_url=self.odata_api_root_url,
-                    user_id=username
+                    user_id=username,
+                    fields=fields,
                 ),
-                timeout=10,
+                timeout=self.timeout,
             )
             response.raise_for_status()
             response = response.json()
@@ -237,13 +311,7 @@ class SapSuccessFactorsIdentityProvider(EdXSAMLIdentityProvider):
                 self.odata_company_id,
             )
             return details
-        return {
-            'username': response['d']['username'],
-            'first_name': response['d']['firstName'],
-            'last_name': response['d']['lastName'],
-            'fullname': response['d']['defaultFullName'],
-            'email': response['d']['email'],
-        }
+        return self.get_registration_fields(response)
 
 
 def get_saml_idp_choices():
diff --git a/common/djangoapps/third_party_auth/tests/specs/base.py b/common/djangoapps/third_party_auth/tests/specs/base.py
index 8c32eb8363..ffea3e0efa 100644
--- a/common/djangoapps/third_party_auth/tests/specs/base.py
+++ b/common/djangoapps/third_party_auth/tests/specs/base.py
@@ -54,7 +54,7 @@ class IntegrationTestMixin(object):
         self.addCleanup(patcher.stop)
         # Override this method in a subclass and enable at least one provider.
 
-    def test_register(self):
+    def test_register(self, **extra_defaults):
         # The user goes to the register page, and sees a button to register with the provider:
         provider_register_url = self._check_register_page()
         # The user clicks on the Dummy button:
@@ -76,6 +76,8 @@ class IntegrationTestMixin(object):
         self.assertEqual(form_fields['email']['defaultValue'], self.USER_EMAIL)
         self.assertEqual(form_fields['name']['defaultValue'], self.USER_NAME)
         self.assertEqual(form_fields['username']['defaultValue'], self.USER_USERNAME)
+        for field_name, value in extra_defaults.items():
+            self.assertEqual(form_fields[field_name]['defaultValue'], value)
         registration_values = {
             'email': 'email-edited@tpa-test.none',
             'name': 'My Customized Name',
diff --git a/common/djangoapps/third_party_auth/tests/specs/test_testshib.py b/common/djangoapps/third_party_auth/tests/specs/test_testshib.py
index 6224d48148..d80607309d 100644
--- a/common/djangoapps/third_party_auth/tests/specs/test_testshib.py
+++ b/common/djangoapps/third_party_auth/tests/specs/test_testshib.py
@@ -309,6 +309,7 @@ class SuccessFactorsIntegrationTest(SamlIntegrationTestUtilities, IntegrationTes
                         'lastName': 'Smith',
                         'defaultFullName': 'John Smith',
                         'email': 'john@smith.com',
+                        'country': 'Australia',
                     }
                 })
             )
@@ -331,23 +332,119 @@ class SuccessFactorsIntegrationTest(SamlIntegrationTestUtilities, IntegrationTes
         self.USER_USERNAME = "myself"
         super(SuccessFactorsIntegrationTest, self).test_register()
 
+    @patch.dict('django.conf.settings.REGISTRATION_EXTRA_FIELDS', country='optional')
     def test_register_sapsf_metadata_present(self):
         """
         Configure the provider such that it can talk to a mocked-out version of the SAP SuccessFactors
         API, and ensure that the data it gets that way gets passed to the registration form.
+
+        Check that value mappings overrides work in cases where we override a value other than
+        what we're looking for, and when an empty override is provided (expected behavior is that
+        existing value maps will be left alone).
         """
+        expected_country = 'AU'
+        provider_settings = {
+            'sapsf_oauth_root_url': 'http://successfactors.com/oauth/',
+            'sapsf_private_key': 'fake_private_key_here',
+            'odata_api_root_url': 'http://api.successfactors.com/odata/v2/',
+            'odata_company_id': 'NCC1701D',
+            'odata_client_id': 'TatVotSEiCMteSNWtSOnLanCtBGwNhGB',
+        }
+
         self._configure_testshib_provider(
             identity_provider_type='sap_success_factors',
             metadata_source=TESTSHIB_METADATA_URL,
-            other_settings=json.dumps({
-                'sapsf_oauth_root_url': 'http://successfactors.com/oauth/',
-                'sapsf_private_key': 'fake_private_key_here',
-                'odata_api_root_url': 'http://api.successfactors.com/odata/v2/',
-                'odata_company_id': 'NCC1701D',
-                'odata_client_id': 'TatVotSEiCMteSNWtSOnLanCtBGwNhGB',
-            })
+            other_settings=json.dumps(provider_settings)
         )
-        super(SuccessFactorsIntegrationTest, self).test_register()
+        super(SuccessFactorsIntegrationTest, self).test_register(country=expected_country)
+
+    @patch.dict('django.conf.settings.REGISTRATION_EXTRA_FIELDS', country='optional')
+    def test_register_sapsf_metadata_present_override_relevant_value(self):
+        """
+        Configure the provider such that it can talk to a mocked-out version of the SAP SuccessFactors
+        API, and ensure that the data it gets that way gets passed to the registration form.
+
+        Check that value mappings overrides work in cases where we override a value other than
+        what we're looking for, and when an empty override is provided (expected behavior is that
+        existing value maps will be left alone).
+        """
+        value_map = {'country': {'Australia': 'NZ'}}
+        expected_country = 'NZ'
+        provider_settings = {
+            'sapsf_oauth_root_url': 'http://successfactors.com/oauth/',
+            'sapsf_private_key': 'fake_private_key_here',
+            'odata_api_root_url': 'http://api.successfactors.com/odata/v2/',
+            'odata_company_id': 'NCC1701D',
+            'odata_client_id': 'TatVotSEiCMteSNWtSOnLanCtBGwNhGB',
+        }
+        if value_map:
+            provider_settings['sapsf_value_mappings'] = value_map
+
+        self._configure_testshib_provider(
+            identity_provider_type='sap_success_factors',
+            metadata_source=TESTSHIB_METADATA_URL,
+            other_settings=json.dumps(provider_settings)
+        )
+        super(SuccessFactorsIntegrationTest, self).test_register(country=expected_country)
+
+    @patch.dict('django.conf.settings.REGISTRATION_EXTRA_FIELDS', country='optional')
+    def test_register_sapsf_metadata_present_override_other_value(self):
+        """
+        Configure the provider such that it can talk to a mocked-out version of the SAP SuccessFactors
+        API, and ensure that the data it gets that way gets passed to the registration form.
+
+        Check that value mappings overrides work in cases where we override a value other than
+        what we're looking for, and when an empty override is provided (expected behavior is that
+        existing value maps will be left alone).
+        """
+        value_map = {'country': {'United States': 'blahfake'}}
+        expected_country = 'AU'
+        provider_settings = {
+            'sapsf_oauth_root_url': 'http://successfactors.com/oauth/',
+            'sapsf_private_key': 'fake_private_key_here',
+            'odata_api_root_url': 'http://api.successfactors.com/odata/v2/',
+            'odata_company_id': 'NCC1701D',
+            'odata_client_id': 'TatVotSEiCMteSNWtSOnLanCtBGwNhGB',
+        }
+        if value_map:
+            provider_settings['sapsf_value_mappings'] = value_map
+
+        self._configure_testshib_provider(
+            identity_provider_type='sap_success_factors',
+            metadata_source=TESTSHIB_METADATA_URL,
+            other_settings=json.dumps(provider_settings)
+        )
+        super(SuccessFactorsIntegrationTest, self).test_register(country=expected_country)
+
+    @patch.dict('django.conf.settings.REGISTRATION_EXTRA_FIELDS', country='optional')
+    def test_register_sapsf_metadata_present_empty_value_override(self):
+        """
+        Configure the provider such that it can talk to a mocked-out version of the SAP SuccessFactors
+        API, and ensure that the data it gets that way gets passed to the registration form.
+
+        Check that value mappings overrides work in cases where we override a value other than
+        what we're looking for, and when an empty override is provided (expected behavior is that
+        existing value maps will be left alone).
+        """
+
+        value_map = {'country': {}}
+        expected_country = 'AU'
+        provider_settings = {
+            'sapsf_oauth_root_url': 'http://successfactors.com/oauth/',
+            'sapsf_private_key': 'fake_private_key_here',
+            'odata_api_root_url': 'http://api.successfactors.com/odata/v2/',
+            'odata_company_id': 'NCC1701D',
+            'odata_client_id': 'TatVotSEiCMteSNWtSOnLanCtBGwNhGB',
+        }
+        if value_map:
+            provider_settings['sapsf_value_mappings'] = value_map
+
+        self._configure_testshib_provider(
+            identity_provider_type='sap_success_factors',
+            metadata_source=TESTSHIB_METADATA_URL,
+            other_settings=json.dumps(provider_settings)
+        )
+        super(SuccessFactorsIntegrationTest, self).test_register(country=expected_country)
 
     def test_register_http_failure(self):
         """

From e8bae62f04063fe6d70fe242883bbdf719522311 Mon Sep 17 00:00:00 2001
From: Harry Rein <hrein@edx.org>
Date: Tue, 25 Jul 2017 15:30:42 -0400
Subject: [PATCH 4/5] UX improvements on learner profile.

LEARNER-1857

This story constitutes a large change to the UX of the learner profile.

Some specific changes include adding a flexible learner profile card, limiting the bio entry to only 300 characters and assuring that the page is responsive.
---
 .../acceptance/pages/lms/learner_profile.py   |  16 --
 .../tests/lms/test_learner_profile.py         |   4 -
 lms/static/js/views/fields.js                 |  28 ++-
 lms/static/sass/_build-lms-v1.scss            |   2 +-
 lms/static/sass/elements/_pagination.scss     |   2 +-
 .../{views => features}/_learner-profile.scss | 197 +++++++++++++-----
 lms/static/sass/partials/base/_variables.scss |   6 +
 lms/static/sass/shared/_fields.scss           |   4 +-
 lms/static/sass/shared/_header.scss           |   2 +-
 .../fields/field_dropdown.underscore          |  24 +--
 .../fields/field_dropdown_account.underscore  |  18 +-
 .../fields/field_readonly.underscore          |   3 +-
 .../fields/field_textarea.underscore          |  19 +-
 .../views/course_home_messages.py             |   7 +-
 .../js/learner_profile_factory.js             |  29 ++-
 .../spec/views/learner_profile_view_spec.js   |  14 +-
 .../js/spec/views/section_two_tab_spec.js     |   2 +-
 .../js/spec_helpers/helpers.js                |   9 +-
 .../js/views/learner_profile_view.js          |  22 +-
 .../templates/learner_profile.underscore      |  22 +-
 .../templates/section_two.underscore          |   4 +-
 21 files changed, 292 insertions(+), 142 deletions(-)
 rename lms/static/sass/{views => features}/_learner-profile.scss (73%)

diff --git a/common/test/acceptance/pages/lms/learner_profile.py b/common/test/acceptance/pages/lms/learner_profile.py
index 73751e0f30..91d1d6e255 100644
--- a/common/test/acceptance/pages/lms/learner_profile.py
+++ b/common/test/acceptance/pages/lms/learner_profile.py
@@ -13,10 +13,6 @@ from common.test.acceptance.tests.helpers import select_option_by_value
 
 PROFILE_VISIBILITY_SELECTOR = '#u-field-select-account_privacy option[value="{}"]'
 PROFILE_VISIBILITY_INPUT = '#u-field-select-account_privacy'
-FIELD_ICONS = {
-    'country': 'fa-map-marker',
-    'language_proficiencies': 'fa-comment',
-}
 
 
 class Badge(PageObject):
@@ -214,18 +210,6 @@ class LearnerProfilePage(FieldsMixin, PageObject):
         self.wait_for_ajax()
         return self.q(css='#u-field-select-account_privacy').visible
 
-    def field_icon_present(self, field_id):
-        """
-        Check if an icon is present for a field. Only dropdown fields have icons.
-
-        Arguments:
-            field_id (str): field id
-
-        Returns:
-            True/False
-        """
-        return self.icon_for_field(field_id, FIELD_ICONS[field_id])
-
     def wait_for_public_fields(self):
         """
         Wait for `country`, `language` and `bio` fields to be visible.
diff --git a/common/test/acceptance/tests/lms/test_learner_profile.py b/common/test/acceptance/tests/lms/test_learner_profile.py
index 95ef7d452b..f896cea2bb 100644
--- a/common/test/acceptance/tests/lms/test_learner_profile.py
+++ b/common/test/acceptance/tests/lms/test_learner_profile.py
@@ -367,8 +367,6 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, AcceptanceTest):
         profile_page.make_field_editable('country')
         self.assertEqual(profile_page.mode_for_field('country'), 'edit')
 
-        self.assertTrue(profile_page.field_icon_present('country'))
-
     def test_language_field(self):
         """
         Test behaviour of `Language` field.
@@ -396,8 +394,6 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, AcceptanceTest):
         profile_page.make_field_editable('language_proficiencies')
         self.assertTrue(profile_page.mode_for_field('language_proficiencies'), 'edit')
 
-        self.assertTrue(profile_page.field_icon_present('language_proficiencies'))
-
     def test_about_me_field(self):
         """
         Test behaviour of `About Me` field.
diff --git a/lms/static/js/views/fields.js b/lms/static/js/views/fields.js
index 6f87581da3..878333df28 100644
--- a/lms/static/js/views/fields.js
+++ b/lms/static/js/views/fields.js
@@ -515,15 +515,16 @@
                 'click .wrapper-u-field': 'startEditing',
                 'click .u-field-placeholder': 'startEditing',
                 'focusout textarea': 'finishEditing',
-                'change textarea': 'adjustTextareaHeight',
-                'keyup textarea': 'adjustTextareaHeight',
+                'change textarea': 'manageTextareaContentChange',
+                'keyup textarea': 'manageTextareaContentChange',
                 'keydown textarea': 'onKeyDown',
-                'paste textarea': 'adjustTextareaHeight',
-                'cut textarea': 'adjustTextareaHeight'
+                'paste textarea': 'manageTextareaContentChange',
+                'cut textarea': 'manageTextareaContentChange'
             },
 
             initialize: function(options) {
-                _.bindAll(this, 'render', 'onKeyDown', 'adjustTextareaHeight', 'fieldValue', 'saveValue', 'updateView');
+                _.bindAll(this, 'render', 'onKeyDown', 'adjustTextareaHeight', 'manageTextareaContentChange',
+                    'fieldValue', 'saveValue', 'updateView');
                 this._super(options);
                 this.listenTo(this.model, 'change:' + this.options.valueAttribute, this.updateView);
             },
@@ -541,7 +542,8 @@
                     value: value,
                     message: this.helpMessage,
                     messagePosition: this.options.messagePosition || 'footer',
-                    placeholderValue: this.options.placeholderValue
+                    placeholderValue: this.options.placeholderValue,
+                    maxCharacters: this.options.maxCharacters || ''
                 }));
                 this.delegateEvents();
                 this.title((this.modelValue() || this.mode === 'edit') ?
@@ -562,12 +564,26 @@
                 }
             },
 
+            updateCharCount: function() {
+                var curCharCount;
+                // Update character count for textarea
+                if (this.options.maxCharacters) {
+                    curCharCount = $('#u-field-textarea-' + this.options.valueAttribute).val().length;
+                    $('.u-field-footer .current-char-count').text(curCharCount);
+                }
+            },
+
             adjustTextareaHeight: function() {
                 if (this.persistChanges === false) { return; }
                 var textarea = this.$('textarea');
                 textarea.css('height', 'auto').css('height', textarea.prop('scrollHeight') + 10);
             },
 
+            manageTextareaContentChange: function() {
+                this.updateCharCount();
+                this.adjustTextareaHeight();
+            },
+
             modelValue: function() {
                 var value = this._super();
                 return value ? $.trim(value) : '';
diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss
index ddca292653..3a311a74e6 100644
--- a/lms/static/sass/_build-lms-v1.scss
+++ b/lms/static/sass/_build-lms-v1.scss
@@ -55,7 +55,6 @@
 
 // base - specific views
 @import "views/account-settings";
-@import "views/learner-profile";
 @import 'views/login-register';
 @import 'views/verification';
 @import 'views/decoupled-verification';
@@ -69,6 +68,7 @@
 
 // features
 @import 'features/bookmarks-v1';
+@import 'features/learner-profile';
 
 // search
 @import 'search/search';
diff --git a/lms/static/sass/elements/_pagination.scss b/lms/static/sass/elements/_pagination.scss
index 21d3fea81f..fa907f93ea 100644
--- a/lms/static/sass/elements/_pagination.scss
+++ b/lms/static/sass/elements/_pagination.scss
@@ -74,7 +74,7 @@
     margin: 0 ($baseline*0.75);
     padding: ($baseline/4);
     text-align: center;
-    color: $gray;
+    color: $gray-d1;
   }
 
   .current-page {
diff --git a/lms/static/sass/views/_learner-profile.scss b/lms/static/sass/features/_learner-profile.scss
similarity index 73%
rename from lms/static/sass/views/_learner-profile.scss
rename to lms/static/sass/features/_learner-profile.scss
index 99ff1d9248..8a0226c168 100644
--- a/lms/static/sass/views/_learner-profile.scss
+++ b/lms/static/sass/features/_learner-profile.scss
@@ -25,8 +25,6 @@
     }
 
     .profile-image-field {
-        @include float(left);
-
         button {
             background: transparent !important;
             border: none !important;
@@ -41,13 +39,18 @@
         .image-wrapper {
             width: $profile-image-dimension;
             position: relative;
+            margin: auto;
 
             .image-frame {
                 display: block;
                 position: relative;
                 width: $profile-image-dimension;
                 height: $profile-image-dimension;
-                border-radius: ($baseline/4);
+                border-radius: ($profile-image-dimension/2);
+                overflow: hidden;
+                border: 3px solid $gray-lightest;
+                margin-top: $baseline*-0.75;
+                background: $white;
             }
 
             .u-field-upload-button {
@@ -55,13 +58,12 @@
                 top: 0;
                 width: $profile-image-dimension;
                 height: $profile-image-dimension;
-                border-radius: ($baseline/4);
+                border-radius: ($profile-image-dimension/2);
                 border: 2px dashed transparent;
                 background: rgba(229,241,247, .8);
                 color: $link-color;
                 text-shadow: none;
                 @include transition(all $tmg-f1 ease-in-out 0s);
-                opacity: 0;
                 z-index: 6;
 
                 i {
@@ -87,17 +89,20 @@
                 line-height: 1.3em;
                 text-align: center;
                 z-index: 7;
+                color: $base-font-color;
             }
 
             .upload-button-input {
                 position: absolute;
-                top: -($profile-image-dimension * 2);
+                top: 0;
                 @include left(0);
                 width: $profile-image-dimension;
+                border-radius: ($profile-image-dimension/2);
                 height: 100%;
                 cursor: pointer;
                 z-index: 5;
                 outline: 0;
+                opacity: 0;
             }
 
             .u-field-remove-button {
@@ -113,6 +118,7 @@
 
     .wrapper-profile {
         min-height: 200px;
+        background-color: $gray-lightest;
 
         .ui-loading-indicator {
             margin-top: 100px;
@@ -133,7 +139,7 @@
                 @extend .container;
                 border: none;
                 box-shadow: none;
-                padding: 0 ($baseline*1.5);
+                padding: 0 ($baseline*3);
             }
 
             .u-field-title {
@@ -164,53 +170,93 @@
 
     .wrapper-profile-sections {
         @extend .container;
-        padding: 0 ($baseline*1.5);
+        @include padding($baseline*1.5, $baseline*1.5, $baseline*1.5, 0);
+        min-width: 0;
+
+        @media (max-width: $learner-profile-container-flex) { // Switch to map-get($grid-breakpoints,md) for bootstrap
+            @include margin-left(0);
+            @include padding($baseline*1.5, 0, $baseline*1.5, 0);
+        }
+    }
+
+    .profile-header {
+        @include padding(0, $baseline*2, $baseline, $baseline*3);
+
+        .header {
+            @extend %t-title4;
+            @extend %t-ultrastrong;
+            display: inline-block;
+        }
+
+        .subheader {
+            @extend %t-title6;
+        }
     }
 
     .wrapper-profile-section-one {
-        width: 100%;
-        display: inline-block;
-        margin-top: ($baseline*1.5);
-        @include margin-left($baseline/2);
+        @include float(left);
+        @include margin-left($baseline*3);
+        width: 300px;
+        background-color: $white;
+        border-top: 5px solid $blue;
+        padding-bottom: $baseline;
+
+        @media (max-width: $learner-profile-container-flex) { // Switch to map-get($grid-breakpoints,md) for bootstrap
+            @include margin-left(0);
+            width: 100%;
+        }
     }
 
     .profile-section-one-fields {
-        @include float(left);
-        width: flex-grid(4, 12);
-        @include margin-left($baseline);
+        margin: 0 $baseline/2;
 
         .u-field {
-            margin-bottom: ($baseline/4);
-            padding-top: 3px;
-            padding-bottom: 3px;
-            @include padding-left(3px);
-        }
-
-        .u-field-username {
-
-            input[type="text"] {
-                font-weight: 600;
-            }
+            @extend %t-weight4;
+            @include padding(0, 0, 0, 3px);
+            color: $base-font-color;
 
             .u-field-value {
-                width: 350px;
-                @extend %t-title4;
+                @extend %t-weight4;
+                width: calc(100% - 40px);
+
+                .u-field-value-readonly {
+                    @extend %t-weight3;
+                }
+            }
+
+            .u-field-title {
+                color: $base-font-color;
+                font-size: $body-font-size;
+                display: block;
+            }
+
+            &.u-field-dropdown {
+                margin-top: $baseline/5;
+
+                &:not(.editable-never) {
+                    cursor: pointer;
+                }
+
+                &:not(:last-child) {
+                    padding-bottom: $baseline/4;
+                    border-bottom: 1px solid $gray-lighter;
+                }
             }
         }
 
-        .u-field-icon {
-            display: inline-block;
-            vertical-align: baseline;
-        }
+        &>.u-field {
+            &:not(:first-child) {
+                font-size: $body-font-size;
+                color: $base-font-color;
+                font-weight: $font-light;
+                margin-bottom: 0;
+            }
 
-        .u-field-title {
-            width: 0;
-        }
-
-        .u-field-value {
-            width: 200px;
-            display: inline-block;
-            vertical-align: baseline;
+            &:first-child {
+                @extend %t-title4;
+                @extend %t-weight4;
+                font-size: em(24);
+            }
         }
 
         select {
@@ -230,16 +276,29 @@
         }
     }
 
-    .wrapper-profile-section-two {
-        padding-top: 1em;
-        width: flex-grid(8, 12);
-    }
+    .wrapper-profile-section-container-two {
+        @include float(left);
+        width: calc(100% - 380px);
+        max-width: $learner-profile-container-flex; // Switch to map-get($grid-breakpoints,md) for bootstrap
 
-    .profile-section-two-fields {
+        @media (max-width: $learner-profile-container-flex) { // Switch to map-get($grid-breakpoints,md) for bootstrap
+            width: 100%;
+            margin-top: $baseline;
+        }
 
         .u-field-textarea {
             margin-bottom: ($baseline/2);
-            padding: ($baseline/2) ($baseline*.75) ($baseline*.75) ($baseline*.75);
+            padding: 0 ($baseline*.75) ($baseline*.75) ($baseline*.75);
+
+            .u-field-header {
+                position: relative;
+
+                .u-field-message {
+                    @include right(0);
+                    top: $baseline/4;
+                    position: absolute;
+                }
+            }
 
             &.editable-toggle {
                 cursor: pointer;
@@ -247,22 +306,30 @@
         }
 
         .u-field-title {
-            @extend %t-title5;
-            @extend %t-weight4;
+            @extend %t-title6;
+            @extend %t-weight5;
             display: inline-block;
             margin-top: 0;
             margin-bottom: ($baseline/4);
-            color: inherit;
+            color: $gray-dark;
+            width: 100%;
         }
 
         .u-field-value {
             @extend %t-copy-base;
             width: 100%;
+            overflow: scroll;
 
             textarea {
                 width: 100%;
                 background-color: transparent;
+                border-radius: 5px;
+                border-color: $gray-d1;
+                resize: none;
                 white-space: pre-line;
+                outline: 0;
+                box-shadow: none;
+                -webkit-appearance: none;
             }
 
             a {
@@ -273,16 +340,22 @@
         .u-field-message {
             @include float(right);
             width: auto;
+
+            .message-can-edit {
+                position: absolute;
+            }
         }
 
         .u-field.mode-placeholder {
             padding: $baseline;
+            margin: $baseline * 0.75;
             border: 2px dashed $gray-l3;
+
             i {
                 font-size: 12px;
                 @include padding-right(5px);
                 vertical-align: middle;
-                color: $gray;
+                color: $base-font-color;
             }
             .u-field-title {
                 width: 100%;
@@ -293,7 +366,7 @@
                 text-align: center;
                 line-height: 1.5em;
                 @extend %t-copy-sub1;
-                color: $gray;
+                color: $base-font-color;
             }
         }
 
@@ -304,6 +377,28 @@
                 color: $link-color;
             }
         }
+
+        .wrapper-u-field {
+            font-size: $body-font-size;
+            color: $base-font-color;
+
+            .u-field-header .u-field-title{
+                color: $base-font-color;
+            }
+
+            .u-field-footer {
+                .field-textarea-character-count {
+                    @extend %t-weight1;
+                    @include float(right);
+                    margin-top: $baseline/4;
+                }
+            }
+        }
+
+        .profile-private-message {
+            @include padding-left($baseline*0.75);
+            line-height: 3.0em;
+        }
     }
 
     .badge-paging-header {
diff --git a/lms/static/sass/partials/base/_variables.scss b/lms/static/sass/partials/base/_variables.scss
index 6ff97cec34..f15a9c7929 100644
--- a/lms/static/sass/partials/base/_variables.scss
+++ b/lms/static/sass/partials/base/_variables.scss
@@ -223,6 +223,9 @@ $success-color-hover: rgb(0, 129, 0) !default;
 // ----------------------------
 // #COLORS- Bootstrap-style
 // ----------------------------
+$gray-dark: #4e5455 !default;
+$gray-lighter: #eceeef !default;
+$gray-lightest: #f7f7f9 !default;
 
 $state-success-text: $black !default;
 $state-success-bg: #dff0d8 !default;
@@ -545,6 +548,9 @@ $palette-success-border: #b9edb9;
 $palette-success-back: #ecfaec;
 $palette-success-text: #008100;
 
+// learner profile elements
+$learner-profile-container-flex: 768px;
+
 // course elements
 $content-wrapper-bg: $white !default;
 $course-bg-color: $uxpl-grayscale-x-back !default;
diff --git a/lms/static/sass/shared/_fields.scss b/lms/static/sass/shared/_fields.scss
index 02e51ac95c..e2d3e8a022 100644
--- a/lms/static/sass/shared/_fields.scss
+++ b/lms/static/sass/shared/_fields.scss
@@ -12,7 +12,7 @@
         border-radius: 3px;
 
         span {
-            color: $gray;
+            color: $gray-d1;
         }
 
         &:hover {
@@ -84,7 +84,7 @@
 .u-field-title {
     width: flex-grid(3, 12);
     display: inline-block;
-    color: $gray;
+    color: $gray-d1;
     vertical-align: top;
     margin-bottom: 0;
     -webkit-font-smoothing: antialiased;
diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index 1e47a40a22..6eabedef18 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -3,7 +3,7 @@
 
 .header-global {
   @extend %ui-depth1;
-  border-bottom: 2px solid $header-border-color;
+  border-bottom: 1px solid $header-border-color;
   box-shadow: 0 1px 5px 0 $shadow-l1;
   background: $header-bg;
   position: relative;
diff --git a/lms/templates/fields/field_dropdown.underscore b/lms/templates/fields/field_dropdown.underscore
index 097365c9dc..48826683a1 100644
--- a/lms/templates/fields/field_dropdown.underscore
+++ b/lms/templates/fields/field_dropdown.underscore
@@ -1,17 +1,17 @@
-<% if (editable !== 'never') { %>
-    <% if (title && titleVisible) { %>
-        <label class="u-field-title" for="u-field-select-<%- id %>">
-            <%- title %>
-        </label>
-    <% } else { %>
-        <label class="sr" for="u-field-select-<%- id %>">
-            <%- screenReaderTitle %>
-        </label>
-    <% } %>
+<% if (title && titleVisible) { %>
+    <label class="u-field-title" for="u-field-select-<%- id %>">
+        <%- title %>
+    </label>
+<% } else { %>
+    <label class="sr" for="u-field-select-<%- id %>">
+        <%- screenReaderTitle %>
+    </label>
 <% } %>
 
-<% if (iconName) { %>
-    <span class="u-field-icon icon fa <%- iconName %> fa-fw" aria-hidden="true"></span>
+<% if (editable !== 'never') { %>
+    <% if (iconName) { %>
+        <span class="u-field-icon icon fa <%- iconName %> fa-fw" aria-hidden="true"></span>
+    <% } %>
 <% } %>
 
 <span class="u-field-value">
diff --git a/lms/templates/fields/field_dropdown_account.underscore b/lms/templates/fields/field_dropdown_account.underscore
index 6bb8bef0ad..4fa6e5e458 100644
--- a/lms/templates/fields/field_dropdown_account.underscore
+++ b/lms/templates/fields/field_dropdown_account.underscore
@@ -1,14 +1,12 @@
 <div class="u-field-value field">
-    <% if (editable !== 'never') { %>
-        <% if (title && titleVisible) { %>
-            <label class="u-field-title field-label" for="u-field-select-<%- id %>">
-                <%- title %>
-            </label>
-        <% } else { %>
-            <label class="sr" for="u-field-select-<%- id %>">
-                <%- screenReaderTitle %>
-            </label>
-        <% } %>
+    <% if (title && titleVisible) { %>
+        <label class="u-field-title field-label" for="u-field-select-<%- id %>">
+            <%- title %>
+        </label>
+    <% } else { %>
+        <label class="sr" for="u-field-select-<%- id %>">
+            <%- screenReaderTitle %>
+        </label>
     <% } %>
 
     <% if (iconName) { %>
diff --git a/lms/templates/fields/field_readonly.underscore b/lms/templates/fields/field_readonly.underscore
index 307b014b64..96293ff01b 100644
--- a/lms/templates/fields/field_readonly.underscore
+++ b/lms/templates/fields/field_readonly.underscore
@@ -1,6 +1,7 @@
 <% if (title) { %>
-<span class="u-field-title" aria-hidden="true"><%- title %></span>
+    <span class="u-field-title" aria-hidden="true"><%- title %></span>
 <% } %>
+
 <span class="sr" for="u-field-value-<%- id %>"><%- screenReaderTitle %></span>
 <span class="u-field-value" id="u-field-value-<%- id %>" aria-describedby="u-field-message-<%- id %>"><%- value %></span>
 <span class="u-field-message" id="u-field-message-<%- id %>">
diff --git a/lms/templates/fields/field_textarea.underscore b/lms/templates/fields/field_textarea.underscore
index 79a959b644..915f4f4553 100644
--- a/lms/templates/fields/field_textarea.underscore
+++ b/lms/templates/fields/field_textarea.underscore
@@ -1,4 +1,4 @@
-<div class="wrapper-u-field">
+<div class="wrapper-u-field" role="group">
     <div class="u-field-header">
         <% if (mode === 'edit') { %>
             <label class="u-field-title" for="u-field-textarea-<%- id %>" id="u-field-title-<%- id %>"></label>
@@ -15,7 +15,7 @@
 
     <div class="u-field-value" id="u-field-value-<%- id %>"
         <% if (mode === 'edit') { %>
-            aria-labelledby="u-field-title-<%- id %>"><textarea id="u-field-textarea-<%- id %>" rows="4"
+            aria-labelledby="u-field-title-<%- id %>"><textarea maxlength="<%- maxCharacters%>" id="u-field-textarea-<%- id %>" rows="4"
             <% if (message) { %>
                 aria-describedby="u-field-message-help-<%- id %>"
             <% } %>
@@ -43,5 +43,20 @@
                 <span class="u-field-message-help" id="u-field-message-help-<%- id %>"> <%- message %></span>
             </span>
         <% } %>
+        <% if (mode === 'edit' && maxCharacters) { %>
+            <div class="field-textarea-character-count">
+                <%=
+                    HtmlUtils.interpolateHtml(
+                        gettext('{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} of {maxCharacters}'),
+                        {
+                            currentCountOpeningTag: HtmlUtils.HTML('<span class="current-char-count">'),
+                            currentCountClosingTag: HtmlUtils.HTML('</span>'),
+                            currentCharacterCount: value.length,
+                            maxCharacters: maxCharacters
+                        }
+                    )
+                %>
+            </div>
+        <% } %>
     </div>
 </div>
diff --git a/openedx/features/course_experience/views/course_home_messages.py b/openedx/features/course_experience/views/course_home_messages.py
index d14280079d..c00cc82afb 100644
--- a/openedx/features/course_experience/views/course_home_messages.py
+++ b/openedx/features/course_experience/views/course_home_messages.py
@@ -114,11 +114,8 @@ class CourseHomeMessageFragmentView(EdxFragmentView):
             CourseHomeMessages.register_info_message(
                 request,
                 Text(_(
-                    "{add_reminder_open_tag}Don't forget to add a calendar reminder!{add_reminder_close_tag}."
-                )).format(
-                    add_reminder_open_tag='',
-                    add_reminder_close_tag=''
-                ),
+                    "Don't forget to add a calendar reminder!"
+                )),
                 title=Text("Course starts in {days_until_start_string} on {course_start_date}.").format(
                     days_until_start_string=course_start_data['days_until_start_string'],
                     course_start_date=course_start_data['course_start_date']
diff --git a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
index 0a47bf6e8f..7b4b657461 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
@@ -48,6 +48,7 @@
             var accountPrivacyFieldView,
                 profileImageFieldView,
                 usernameFieldView,
+                nameFieldView,
                 sectionOneFieldViews,
                 sectionTwoFieldViews,
                 BadgeCollection,
@@ -65,10 +66,7 @@
                 required: true,
                 editable: 'always',
                 showMessages: false,
-                title: StringUtils.interpolate(
-                    gettext('{platform_name} learners can see my:'),
-                    {platform_name: options.platform_name}
-                ),
+                title: gettext('Profile Visibility:'),
                 valueAttribute: 'account_privacy',
                 options: [
                     ['private', gettext('Limited Profile')],
@@ -97,29 +95,37 @@
                 helpMessage: ''
             });
 
+            nameFieldView = new FieldsView.ReadonlyFieldView({
+                model: accountSettingsModel,
+                screenReaderTitle: gettext('Full Name'),
+                valueAttribute: 'name',
+                helpMessage: ''
+            });
+
             sectionOneFieldViews = [
                 new FieldsView.DropdownFieldView({
+                    title: gettext('Location'),
+                    titleVisible: true,
                     model: accountSettingsModel,
                     screenReaderTitle: gettext('Country'),
-                    titleVisible: false,
                     required: true,
                     editable: editable,
                     showMessages: false,
-                    iconName: 'fa-map-marker',
                     placeholderValue: gettext('Add Country'),
                     valueAttribute: 'country',
                     options: options.country_options,
                     helpMessage: '',
                     persistChanges: true
                 }),
+
                 new AccountSettingsFieldViews.LanguageProficienciesFieldView({
+                    title: gettext('Language'),
+                    titleVisible: true,
                     model: accountSettingsModel,
                     screenReaderTitle: gettext('Preferred Language'),
-                    titleVisible: false,
                     required: false,
                     editable: editable,
                     showMessages: false,
-                    iconName: 'fa-comment',
                     placeholderValue: gettext('Add language'),
                     valueAttribute: 'language_proficiencies',
                     options: options.language_options,
@@ -139,7 +145,8 @@
                     valueAttribute: 'bio',
                     helpMessage: '',
                     persistChanges: true,
-                    messagePosition: 'header'
+                    messagePosition: 'header',
+                    maxCharacters: 300
                 })
             ];
 
@@ -172,9 +179,11 @@
                 accountPrivacyFieldView: accountPrivacyFieldView,
                 profileImageFieldView: profileImageFieldView,
                 usernameFieldView: usernameFieldView,
+                nameFieldView: nameFieldView,
                 sectionOneFieldViews: sectionOneFieldViews,
                 sectionTwoFieldViews: sectionTwoFieldViews,
-                badgeListContainer: badgeListContainer
+                badgeListContainer: badgeListContainer,
+                platformName: options.platform_name
             });
 
             getProfileVisibility = function() {
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
index bbc154b293..fe802b43c4 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
@@ -1,6 +1,7 @@
 /* eslint-disable vars-on-top */
 define(
     [
+        'gettext',
         'backbone',
         'jquery',
         'underscore',
@@ -18,7 +19,7 @@ define(
         'js/student_account/views/account_settings_fields',
         'js/views/message_banner'
     ],
-    function(Backbone, $, _, PagingCollection, AjaxHelpers, TemplateHelpers, Helpers, LearnerProfileHelpers,
+    function(gettext, Backbone, $, _, PagingCollection, AjaxHelpers, TemplateHelpers, Helpers, LearnerProfileHelpers,
               FieldViews, UserAccountModel, AccountPreferencesModel, LearnerProfileFields, LearnerProfileView,
               BadgeListContainer, AccountSettingsFieldViews, MessageBannerView) {
         'use strict';
@@ -73,13 +74,19 @@ define(
                     helpMessage: ''
                 });
 
+                var nameFieldView = new FieldViews.ReadonlyFieldView({
+                    model: accountSettingsModel,
+                    valueAttribute: 'name',
+                    helpMessage: ''
+                });
+
                 var sectionOneFieldViews = [
                     new FieldViews.DropdownFieldView({
+                        title: gettext('Location'),
                         model: accountSettingsModel,
                         required: false,
                         editable: editable,
                         showMessages: false,
-                        iconName: 'fa-map-marker',
                         placeholderValue: '',
                         valueAttribute: 'country',
                         options: Helpers.FIELD_OPTIONS,
@@ -87,11 +94,11 @@ define(
                     }),
 
                     new AccountSettingsFieldViews.LanguageProficienciesFieldView({
+                        title: gettext('Language'),
                         model: accountSettingsModel,
                         required: false,
                         editable: editable,
                         showMessages: false,
-                        iconName: 'fa-comment',
                         placeholderValue: 'Add language',
                         valueAttribute: 'language_proficiencies',
                         options: Helpers.FIELD_OPTIONS,
@@ -131,6 +138,7 @@ define(
                         preferencesModel: accountPreferencesModel,
                         accountPrivacyFieldView: accountPrivacyFieldView,
                         usernameFieldView: usernameFieldView,
+                        nameFieldView: nameFieldView,
                         profileImageFieldView: profileImageFieldView,
                         sectionOneFieldViews: sectionOneFieldViews,
                         sectionTwoFieldViews: sectionTwoFieldViews,
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/section_two_tab_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/section_two_tab_spec.js
index c80c6c62c2..9e4909ffa0 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/section_two_tab_spec.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec/views/section_two_tab_spec.js
@@ -65,7 +65,7 @@ define(
                 view.render();
                 var bio = view.$el.find('.u-field-bio');
                 expect(bio.length).toBe(0);
-                var msg = view.$el.find('span.profile-private--message');
+                var msg = view.$el.find('span.profile-private-message');
                 expect(msg.length).toBe(1);
                 expect(_.count(msg.html(), messageString)).toBeTruthy();
             };
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js b/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
index 7363bb384f..9833f4dab1 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
@@ -41,11 +41,12 @@ define(['underscore', 'URI', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
     var expectSectionOneTobeRendered = function(learnerProfileView) {
         var sectionOneFieldElements = $(learnerProfileView.$('.wrapper-profile-section-one')).find('.u-field');
 
-        expect(sectionOneFieldElements.length).toBe(4);
+        expect(sectionOneFieldElements.length).toBe(5);
         expectProfileElementContainsField(sectionOneFieldElements[0], learnerProfileView.options.profileImageFieldView);
         expectProfileElementContainsField(sectionOneFieldElements[1], learnerProfileView.options.usernameFieldView);
+        expectProfileElementContainsField(sectionOneFieldElements[2], learnerProfileView.options.nameFieldView);
 
-        _.each(_.rest(sectionOneFieldElements, 2), function(sectionFieldElement, fieldIndex) {
+        _.each(_.rest(sectionOneFieldElements, 3), function(sectionFieldElement, fieldIndex) {
             expectProfileElementContainsField(
                 sectionFieldElement,
                 learnerProfileView.options.sectionOneFieldViews[fieldIndex]
@@ -89,10 +90,10 @@ define(['underscore', 'URI', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
         );
 
         if (othersProfile) {
-            expect($('.profile-private--message').text())
+            expect($('.profile-private-message').text())
                 .toBe('This learner is currently sharing a limited profile.');
         } else {
-            expect($('.profile-private--message').text()).toBe('You are currently sharing a limited profile.');
+            expect($('.profile-private-message').text()).toBe('You are currently sharing a limited profile.');
         }
     };
 
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js b/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
index e4a4e17bb7..96a8e55cdb 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
@@ -6,9 +6,10 @@
             'gettext', 'jquery', 'underscore', 'backbone', 'edx-ui-toolkit/js/utils/html-utils',
             'common/js/components/views/tabbed_view',
             'learner_profile/js/views/section_two_tab',
-            'text!learner_profile/templates/learner_profile.underscore'
+            'text!learner_profile/templates/learner_profile.underscore',
+            'edx-ui-toolkit/js/utils/string-utils'
         ],
-        function(gettext, $, _, Backbone, HtmlUtils, TabbedView, SectionTwoTab, learnerProfileTemplate) {
+        function(gettext, $, _, Backbone, HtmlUtils, TabbedView, SectionTwoTab, learnerProfileTemplate, StringUtils) {
             var LearnerProfileView = Backbone.View.extend({
 
                 initialize: function(options) {
@@ -53,10 +54,19 @@
                         ownProfile: this.options.ownProfile
                     });
 
+
                     HtmlUtils.setHtml(this.$el, HtmlUtils.template(learnerProfileTemplate)({
                         username: self.options.accountSettingsModel.get('username'),
+                        name: self.options.accountSettingsModel.get('name'),
                         ownProfile: self.options.ownProfile,
-                        showFullProfile: self.showFullProfile()
+                        showFullProfile: self.showFullProfile(),
+                        profile_header: gettext('My Profile'),
+                        profile_subheader:
+                            StringUtils.interpolate(
+                                gettext('Build out your profile to personalize your identity on {platform_name}.'), {
+                                    platform_name: self.options.platformName
+                                }
+                            )
                     }));
                     this.renderFields();
 
@@ -98,7 +108,7 @@
                             Backbone.history.start();
                         }
                     } else {
-                        this.$el.find('.account-settings-container').append(this.sectionTwoView.render().el);
+                        this.$el.find('.wrapper-profile-section-container-two').append(this.sectionTwoView.render().el);
                     }
                     return this;
                 },
@@ -120,6 +130,10 @@
                         fieldView.delegateEvents();
                     }
 
+                    // Do not show name when in limited mode or no name has been set
+                    if (this.showFullProfile() && this.options.accountSettingsModel.get('name')) {
+                        this.$('.profile-section-one-fields').append(this.options.nameFieldView.render().el);
+                    }
                     this.$('.profile-section-one-fields').append(this.options.usernameFieldView.render().el);
 
                     imageView = this.options.profileImageFieldView;
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore b/openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
index aee4339e4c..2ff1a6f397 100644
--- a/openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
+++ b/openedx/features/learner_profile/static/learner_profile/templates/learner_profile.underscore
@@ -1,15 +1,25 @@
 <div class="profile <%- ownProfile ? 'profile-self' : 'profile-other' %>">
     <div class="wrapper-profile-field-account-privacy"></div>
     <div class="wrapper-profile-sections account-settings-container">
-        <div class="wrapper-profile-section-one">
-            <div class="profile-image-field">
+        <% if (ownProfile) { %>
+            <div class="profile-header">
+                <div class="header"> <%- profile_header %></div>
+                <div class="subheader"> <%- profile_subheader %></div>
             </div>
-            <div class="profile-section-one-fields">
+        <% } %>
+        <div class="wrapper-profile-section-container-one">
+            <div class="wrapper-profile-section-one">
+                <div class="profile-image-field">
+                </div>
+                <div class="profile-section-one-fields">
+                </div>
+            </div>
+            <div class="ui-loading-error is-hidden">
+                <span class="fa fa-exclamation-triangle message-error" aria-hidden="true"></span>
+                <span class="copy"><%- gettext("An error occurred. Try loading the page again.") %></span>
             </div>
         </div>
-        <div class="ui-loading-error is-hidden">
-            <span class="fa fa-exclamation-triangle message-error" aria-hidden="true"></span>
-            <span class="copy"><%- gettext("An error occurred. Try loading the page again.") %></span>
+        <div class="wrapper-profile-section-container-two">
         </div>
     </div>
 </div>
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore b/openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
index 5c9794db3f..0c7d11cd8b 100644
--- a/openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
+++ b/openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
@@ -2,9 +2,9 @@
     <div class="field-container"></div>
     <% if (!showFullProfile) { %>
         <% if(ownProfile) { %>
-            <span class="profile-private--message" tabindex="0"><%- gettext("You are currently sharing a limited profile.") %></span>
+            <span class="profile-private-message"><%- gettext("You are currently sharing a limited profile.") %></span>
         <% } else {  %>
-            <span class="profile-private--message" tabindex="0"><%- gettext("This learner is currently sharing a limited profile.") %></span>
+            <span class="profile-private-message"><%- gettext("This learner is currently sharing a limited profile.") %></span>
         <% } %>
     <% } %>
 </div>
\ No newline at end of file

From 8f6aa79c1a6fc3fa701c49dd863d3774cb2af676 Mon Sep 17 00:00:00 2001
From: Harry Rein <hrein@edx.org>
Date: Wed, 9 Aug 2017 13:31:46 -0400
Subject: [PATCH 5/5] Adds eventing to Resume/Start course on Home Page.

LEARNER-2027

Adding eventing on resume and start course button clicks as well as a single jasmine test to assure Logging is occuring as expected.
---
 .../fixtures/course-home-fragment.html              |  4 ++--
 .../static/course_experience/js/CourseHome.js       | 13 +++++++++++++
 .../course_experience/js/spec/CourseHome_spec.js    | 13 +++++++++++++
 .../course_experience/course-home-fragment.html     |  5 +++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html b/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html
index f4a255ec87..d3007aff0b 100644
--- a/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html
+++ b/openedx/features/course_experience/static/course_experience/fixtures/course-home-fragment.html
@@ -20,8 +20,8 @@
                   </form>
               </div>
             <div class="form-actions">
-                <a class="btn btn-brand action-resume-course" href="${resume_course_url}">
-                    Start Course
+                <a class="btn btn-brand action-resume-course" href="/courses/course-v1:edX+DemoX+Demo_Course/courseware/19a30717eff543078a5d94ae9d6c18a5/">
+                    <span data-action-type="start">Start Course</span>
                 </a>
             </div>
         </div>
diff --git a/openedx/features/course_experience/static/course_experience/js/CourseHome.js b/openedx/features/course_experience/static/course_experience/js/CourseHome.js
index 274bddda50..b6d3b81809 100644
--- a/openedx/features/course_experience/static/course_experience/js/CourseHome.js
+++ b/openedx/features/course_experience/static/course_experience/js/CourseHome.js
@@ -2,6 +2,19 @@
 
 export class CourseHome {  // eslint-disable-line import/prefer-default-export
   constructor(options) {
+    // Logging for 'Resume Course' or 'Start Course' button click
+    const $resumeCourseLink = $(options.resumeCourseLink);
+    $resumeCourseLink.on('click', (event) => {
+      const eventType = $resumeCourseLink.find('span').data('action-type');
+      Logger.log(
+        'edx.course.home.resume_course.clicked',
+        {
+          event_type: eventType,
+          url: event.currentTarget.href,
+        },
+      );
+    });
+
     // Logging for course tool click events
     const $courseToolLink = $(options.courseToolLink);
     $courseToolLink.on('click', (event) => {
diff --git a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
index 1fb00e1e4f..be48d904f6 100644
--- a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
+++ b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
@@ -9,11 +9,24 @@ describe('Course Home factory', () => {
     beforeEach(() => {
       loadFixtures('course_experience/fixtures/course-home-fragment.html');
       home = new CourseHome({
+        resumeCourseLink: '.action-resume-course',
         courseToolLink: '.course-tool-link',
       });
       spyOn(Logger, 'log');
     });
 
+    it('sends an event when resume or start course is clicked', () => {
+      $('.action-resume-course').click();
+      expect(Logger.log).toHaveBeenCalledWith(
+        'edx.course.home.resume_course.clicked',
+        {
+          event_type: 'start',
+          url: `http://${window.location.host}/courses/course-v1:edX+DemoX+Demo_Course/courseware` +
+            '/19a30717eff543078a5d94ae9d6c18a5/',
+        },
+      );
+    });
+
     it('sends an event when an course tool is clicked', () => {
       const courseToolNames = document.querySelectorAll('.course-tool-link');
       for (let i = 0; i < courseToolNames.length; i += 1) {
diff --git a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
index 93e38c1670..384581e88f 100644
--- a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
@@ -45,9 +45,9 @@ from openedx.features.course_experience import UNIFIED_COURSE_TAB_FLAG, SHOW_REV
                 % if resume_course_url:
                     <a class="btn btn-brand action-resume-course" href="${resume_course_url}">
                         % if has_visited_course:
-                            ${_("Resume Course")}
+                            <span data-action-type="resume">${_("Resume Course")}</span>
                         % else:
-                            ${_("Start Course")}
+                            <span data-action-type="start">${_("Start Course")}</span>
                         % endif
                     </a>
                 % endif
@@ -109,6 +109,7 @@ from openedx.features.course_experience import UNIFIED_COURSE_TAB_FLAG, SHOW_REV
 
 <%static:webpack entry="CourseHome">
     new CourseHome({
+        resumeCourseLink: ".action-resume-course",
         courseToolLink: ".course-tool-link",
     });
 </%static:webpack>