')
)
@ddt.unpack
def test_message_escaping(self, message, expected_message_html):
diff --git a/openedx/core/djangoapps/util/user_messages.py b/openedx/core/djangoapps/util/user_messages.py
index 961d6288d4..22ae96769d 100644
--- a/openedx/core/djangoapps/util/user_messages.py
+++ b/openedx/core/djangoapps/util/user_messages.py
@@ -87,7 +87,7 @@ class UserMessageCollection():
raise NotImplementedError('Subclasses must define a namespace for messages.')
@classmethod
- def get_message_html(self, body_html, title=None):
+ def get_message_html(self, body_html, title=None, dismissable=False):
"""
Returns the entire HTML snippet for the message.
@@ -96,16 +96,35 @@ class UserMessageCollection():
not use a title can just pass the body_html.
"""
if title:
- return Text(_('{header_open}{title}{header_close}{body}')).format(
+ title_area = Text(_('{header_open}{title}{header_close}')).format(
header_open=HTML('
').format(
+ body_html=body_html,
+ ),
+ dismiss_button=dismiss_button,
+ )
@classmethod
- def register_user_message(self, request, message_type, body_html, title=None):
+ def register_user_message(self, request, message_type, body_html, **kwargs):
"""
Register a message to be shown to the user in the next page.
@@ -113,9 +132,10 @@ class UserMessageCollection():
message_type (UserMessageType): the user message type
body_html (str): body of the message in html format
title (str): optional title for the message as plain text
+ dismissable (bool): shows a dismiss button (defaults to no button)
"""
assert isinstance(message_type, UserMessageType)
- message = Text(self.get_message_html(body_html, title))
+ message = Text(self.get_message_html(body_html, **kwargs))
messages.add_message(request, message_type.value, Text(message), extra_tags=self.get_namespace())
@classmethod
diff --git a/openedx/features/learner_profile/__init__.py b/openedx/features/learner_profile/__init__.py
index d1d21fdd14..50ce2da8d4 100644
--- a/openedx/features/learner_profile/__init__.py
+++ b/openedx/features/learner_profile/__init__.py
@@ -11,3 +11,7 @@ WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='learner_profile')
# Waffle flag to show achievements on the learner profile.
# TODO: LEARNER-2443: 08/2017: Remove flag after rollout.
SHOW_ACHIEVEMENTS_FLAG = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'show_achievements')
+
+# Waffle flag for showing a message about the new profile features.
+# TODO: LEARNER-2554: 09/2017: Remove flag once message is no longer needed.
+SHOW_PROFILE_MESSAGE = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'show_message')
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 321b1080bc..aa5dbeca66 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
@@ -25,6 +25,11 @@
return function(options) {
var $learnerProfileElement = $('.wrapper-profile');
+ // TODO: LEARNER-2554: 09/2017: Remove this hiding logic when the message is removed.
+ $('.action-dismiss').click(function() {
+ $('.user-messages').hide();
+ });
+
var accountSettingsModel = new AccountSettingsModel(
_.extend(
options.account_settings_data,
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 59ee8a93ad..5510a03eb0 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
@@ -57,6 +57,13 @@
$('.wrapper-profile-section-container-one').removeClass('is-hidden');
$('.wrapper-profile-section-container-two').removeClass('is-hidden');
+ // Only show accomplishments if this is a full profile
+ if (this.showFullProfile()) {
+ $('.learner-achievements').removeClass('is-hidden');
+ } else {
+ $('.learner-achievements').addClass('is-hidden');
+ }
+
if (this.showFullProfile() && (this.options.accountSettingsModel.get('accomplishments_shared'))) {
tabs = [
{view: this.sectionTwoView, title: gettext('About Me'), url: 'about_me'},
diff --git a/openedx/features/learner_profile/templates/learner_profile/learner_profile.html b/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
index 9acbffea95..2160c7ecae 100644
--- a/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
+++ b/openedx/features/learner_profile/templates/learner_profile/learner_profile.html
@@ -26,17 +26,17 @@ from openedx.core.djangolib.markup import HTML
-
- % if own_profile:
-
-
${_("My Profile")}
-
- ${_('Build out your profile to personalize your identity on {platform_name}.').format(
- platform_name=platform_name,
- )}
-
+ % if own_profile:
+
+
${_("My Profile")}
+
+ ${_('Build out your profile to personalize your identity on {platform_name}.').format(
+ platform_name=platform_name,
+ )}
- % endif
+
+ % endif
+
${_("Loading")}
diff --git a/openedx/features/learner_profile/views/learner_profile.py b/openedx/features/learner_profile/views/learner_profile.py
index 4a166d4bc8..14969d694c 100644
--- a/openedx/features/learner_profile/views/learner_profile.py
+++ b/openedx/features/learner_profile/views/learner_profile.py
@@ -8,6 +8,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse
from django.http import Http404
from django.shortcuts import render_to_response
+from django.utils.translation import ugettext as _
from django.views.decorators.http import require_http_methods
from django_countries import countries
from edxmako.shortcuts import marketing_link
@@ -15,9 +16,11 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
from openedx.core.djangoapps.user_api.accounts.api import get_account_settings
from openedx.core.djangoapps.user_api.errors import UserNotAuthorized, UserNotFound
from openedx.core.djangoapps.user_api.preferences.api import get_user_preferences
+from openedx.core.djangoapps.util.user_messages import PageLevelMessages
+from openedx.core.djangolib.markup import HTML, Text
from student.models import User
-from .. import SHOW_ACHIEVEMENTS_FLAG
+from .. import SHOW_ACHIEVEMENTS_FLAG, SHOW_PROFILE_MESSAGE
from learner_achievements import LearnerAchievementsFragmentView
@@ -42,10 +45,33 @@ def learner_profile(request, username):
GET /account/profile
"""
try:
- return render_to_response(
+ context = learner_profile_context(request, username, request.user.is_staff)
+ # TODO: LEARNER-2554: 09/2017: Remove message and cookie logic when we no longer want this message
+ message_viewed = False
+ if (context['own_profile'] and
+ SHOW_PROFILE_MESSAGE.is_enabled() and
+ request.COOKIES.get('profile-message-viewed', '') != 'True'):
+ message_text = Text(_(
+ 'Welcome to the new learner profile page. Your full profile now displays more '
+ 'information to other learners. You can instead choose to display a limited '
+ 'profile. {learn_more_link_start}Learn more{learn_more_link_end}'
+ )).format(
+ learn_more_link_start=HTML(
+ ''
+ ),
+ learn_more_link_end=HTML('')
+ )
+ PageLevelMessages.register_info_message(request, message_text, dismissable=True)
+ message_viewed = True
+ response = render_to_response(
'learner_profile/learner_profile.html',
- learner_profile_context(request, username, request.user.is_staff)
+ context
)
+
+ if message_viewed:
+ response.set_cookie('profile-message-viewed', 'True')
+ return response
except (UserNotAuthorized, UserNotFound, ObjectDoesNotExist):
raise Http404
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index 43d83d93bd..e76c51c17a 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -13,7 +13,7 @@ set -e
# Violations thresholds for failing the build
export PYLINT_THRESHOLD=3600
export ESLINT_THRESHOLD=9134
-export STYLELINT_THRESHOLD=15579
+export STYLELINT_THRESHOLD=15852
XSSLINT_THRESHOLDS=`cat scripts/xsslint_thresholds.json`
export XSSLINT_THRESHOLDS=${XSSLINT_THRESHOLDS//[[:space:]]/}