diff --git a/lms/djangoapps/teams/static/teams/js/spec/views/team_profile_spec.js b/lms/djangoapps/teams/static/teams/js/spec/views/team_profile_spec.js index f0ced91b10..d2582fcd01 100644 --- a/lms/djangoapps/teams/static/teams/js/spec/views/team_profile_spec.js +++ b/lms/djangoapps/teams/static/teams/js/spec/views/team_profile_spec.js @@ -55,7 +55,10 @@ define([ ['en', 'English'], ['fr', 'French'] ], - teamMembershipDetailUrl: 'api/team/v0/team_membership/team_id,bilbo' + teamMembershipDetailUrl: 'api/team/v0/team_membership/team_id,bilbo', + setFocusToHeaderFunc: function() { + $('.teams-content').focus(); + } }); profileView.render(); AjaxHelpers.expectRequest( diff --git a/lms/djangoapps/teams/static/teams/js/views/team_profile.js b/lms/djangoapps/teams/static/teams/js/views/team_profile.js index a10deffb6f..10beac0a7e 100644 --- a/lms/djangoapps/teams/static/teams/js/views/team_profile.js +++ b/lms/djangoapps/teams/static/teams/js/views/team_profile.js @@ -23,6 +23,7 @@ this.requestUsername = options.requestUsername; this.isPrivileged = options.isPrivileged; this.teamMembershipDetailUrl = options.teamMembershipDetailUrl; + this.setFocusToHeaderFunc = options.setFocusToHeaderFunc; this.countries = TeamUtils.selectorOptionsArrayToHashWithBlank(options.countries); this.languages = TeamUtils.selectorOptionsArrayToHashWithBlank(options.languages); @@ -43,6 +44,7 @@ membershipText: TeamUtils.teamCapacityText(memberships.length, this.maxTeamSize), isMember: isMember, hasCapacity: memberships.length < this.maxTeamSize, + hasMembers: memberships.length >= 1 })); this.discussionView = new TeamDiscussionView({ @@ -51,6 +53,8 @@ this.discussionView.render(); this.renderTeamMembers(); + + this.setFocusToHeaderFunc(); return this; }, diff --git a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js index d8d56374c4..704a967b6d 100644 --- a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js +++ b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js @@ -282,6 +282,13 @@ }); }, + /** + * Sets focus to teams header. + */ + setFocusToHeader: function() { + $('.page-header-main .sr-is-focusable').focus(); + }, + /** * Return a promise for the team view for the given team ID. */ @@ -301,7 +308,8 @@ requestUsername: self.userInfo.username, countries: self.countries, languages: self.languages, - teamMembershipDetailUrl: self.teamMembershipDetailUrl + teamMembershipDetailUrl: self.teamMembershipDetailUrl, + setFocusToHeaderFunc: self.setFocusToHeader }); var teamJoinView = new TeamJoinView({ teamEvents: self.teamEvents, diff --git a/lms/djangoapps/teams/static/teams/templates/team-profile.underscore b/lms/djangoapps/teams/static/teams/templates/team-profile.underscore index da9d5853d2..77f26fd21a 100644 --- a/lms/djangoapps/teams/static/teams/templates/team-profile.underscore +++ b/lms/djangoapps/teams/static/teams/templates/team-profile.underscore @@ -5,7 +5,7 @@ data-user-create-comment="<%= !readOnly %>" data-user-create-subcomment="<%= !readOnly %>"> <% if ( !readOnly) { %> - <%= gettext("New Post") %> + <% } %> @@ -18,7 +18,9 @@ <% } %>