From e29800428724c9db80e28784ae986c0c19627458 Mon Sep 17 00:00:00 2001
From: Ahsan Ulhaq <ahsan.haq@arbisoft.com>
Date: Wed, 2 Aug 2017 17:08:16 +0500
Subject: [PATCH] Accessibility issues on LMS Dashboard Social links
 LEARNER-2105

---
 .../test/acceptance/tests/lms/test_lms_dashboard.py  |  4 ----
 .../dashboard/_dashboard_course_listing.html         | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/common/test/acceptance/tests/lms/test_lms_dashboard.py b/common/test/acceptance/tests/lms/test_lms_dashboard.py
index 06f0aaa768..62c3562f72 100644
--- a/common/test/acceptance/tests/lms/test_lms_dashboard.py
+++ b/common/test/acceptance/tests/lms/test_lms_dashboard.py
@@ -158,8 +158,6 @@ class LmsDashboardPageTest(BaseLmsDashboardTest):
                        "%3Futm_campaign%3Dsocial-sharing%26utm_medium%3Dsocial-post%26utm_source%3Dtwitter")
         self.assertEqual(twitter_widget.attrs('title')[0], 'Share on Twitter')
         self.assertEqual(twitter_widget.attrs('data-tooltip')[0], 'Share on Twitter')
-        self.assertEqual(twitter_widget.attrs('aria-haspopup')[0], 'true')
-        self.assertEqual(twitter_widget.attrs('aria-expanded')[0], 'false')
         self.assertEqual(twitter_widget.attrs('target')[0], '_blank')
         self.assertIn(twitter_url, twitter_widget.attrs('href')[0])
         self.assertIn(twitter_url, twitter_widget.attrs('onclick')[0])
@@ -170,8 +168,6 @@ class LmsDashboardPageTest(BaseLmsDashboardTest):
                         "quote=I%27m+taking+Test")
         self.assertEqual(facebook_widget.attrs('title')[0], 'Share on Facebook')
         self.assertEqual(facebook_widget.attrs('data-tooltip')[0], 'Share on Facebook')
-        self.assertEqual(facebook_widget.attrs('aria-haspopup')[0], 'true')
-        self.assertEqual(facebook_widget.attrs('aria-expanded')[0], 'false')
         self.assertEqual(facebook_widget.attrs('target')[0], '_blank')
         self.assertIn(facebook_url, facebook_widget.attrs('href')[0])
         self.assertIn(facebook_url, facebook_widget.attrs('onclick')[0])
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index a8b992a86f..97088e942d 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -169,18 +169,18 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_
                           share_text = _("I'm taking {course_name} online with edX.org. Check it out!").format(course_name=course_overview.display_name_with_default)
                           query_params = urllib.urlencode((('u', facebook_share_url), ('quote', share_text.encode('utf-8')),))
                           facebook_url = 'https://www.facebook.com/sharer/sharer.php?{query}'.format(query=query_params)
+                          share_msg = _("Share {course_name} on Facebook").format(course_name=course_overview.display_name_with_default)
                         %>
                         <a
                           data-tooltip="${_('Share on Facebook')}"
+                          data-trigger="focus hover"
                           class="action action-facebook"
-                          aria-haspopup="true"
-                          aria-expanded="false"
                           href="${facebook_url}"
                           target="_blank"
                           title="${_('Share on Facebook')}"
                           data-course-id="${course_overview.id}"
                           onclick="window.open('${facebook_url}', '${share_window_name}', '${share_window_config}'); return false;">
-                          <span class="sr">${_('Facebook')}</span>
+                          <span class="sr">${share_msg}</span>
                           <span class="fa fa-facebook" aria-hidden="true"></span>
                         </a>
                     % endif
@@ -190,18 +190,18 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_
                           default_share_text = _("I'm taking {course_name} online with @edxonline. Check it out!").format(course_name=course_overview.display_name_with_default)
                           share_text = urllib.quote_plus(share_settings.get('DASHBOARD_TWITTER_TEXT', default_share_text.encode('utf-8')))
                           twitter_url = 'https://twitter.com/intent/tweet?text=' + share_text + '%20' + urllib.quote_plus(twitter_share_url)
+                          share_msg = _("Share {course_name} on Twitter").format(course_name=course_overview.display_name_with_default)
                         %>
                         <a
                           data-tooltip="${_('Share on Twitter')}"
+                          data-trigger="focus hover"
                           class="action action-twitter"
-                          aria-haspopup="true"
-                          aria-expanded="false"
                           href="${twitter_url}"
                           target="_blank"
                           title="${_('Share on Twitter')}"
                           data-course-id="${course_overview.id}"
                           onclick="window.open('${twitter_url}', '${share_window_name}', '${share_window_config}'); return false;">
-                          <span class="sr">${_('Twitter')}</span>
+                          <span class="sr">${share_msg}</span>
                           <span class="fa fa-twitter" aria-hidden="true"></span>
                         </a>
                     % endif