Merge branch 'remove-sidebar-title' into 'master'

app/assets/javascripts/new_sidebar.js

@@ -15,6 +15,7 @@ export default class NewNavSidebar {
     this.$openSidebar = $('.toggle-mobile-nav');
     this.$closeSidebar = $('.close-nav-button');
     this.$sidebarToggle = $('.js-toggle-sidebar');
+    this.$topLevelLinks = $('.sidebar-top-level-items > li > a');
   }
 
   bindEvents() {
@@ -50,6 +51,10 @@ export default class NewNavSidebar {
       this.$page.toggleClass('page-with-icon-sidebar', breakpoint === 'sm' ? true : collapsed);
     }
     NewNavSidebar.setCollapsedCookie(collapsed);
+
+    this.$topLevelLinks.attr('title', function updateTopLevelTitle() {
+      return collapsed ? this.getAttribute('aria-label') : '';
+    });
   }
 
   render() {

app/helpers/tab_helper.rb

@@ -119,4 +119,8 @@ module TabHelper
 
     'active' if current_controller?('oauth/applications')
   end
+
+  def sidebar_link(href, title: nil, css: nil, &block)
+    link_to capture(&block), href, title: (title if collapsed_sidebar?), class: css, aria: { label: title }
+  end
 end

app/views/layouts/nav/_new_admin_sidebar.html.haml

@@ -7,7 +7,7 @@
         .sidebar-context-title Admin Area
     %ul.sidebar-top-level-items
       = nav_link(controller: %w(dashboard admin projects users groups jobs runners cohorts), html_options: {class: 'home'}) do
-        = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
+        = sidebar_link admin_root_path, title: _('Overview'), css: 'shortcuts-tree' do
           .nav-icon-container
             = custom_icon('overview')
           %span.nav-item-name
@@ -48,7 +48,7 @@
                 ConvDev Index
 
       = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do
-        = link_to admin_conversational_development_index_path, title: 'Monitoring' do
+        = sidebar_link admin_conversational_development_index_path, title: _('Monitoring') do
           .nav-icon-container
             = custom_icon('monitoring')
           %span.nav-item-name
@@ -77,28 +77,28 @@
                 Requests Profiles
 
       = nav_link(controller: :broadcast_messages) do
-        = link_to admin_broadcast_messages_path, title: 'Messages' do
+        = sidebar_link admin_broadcast_messages_path, title: _('Messages') do
           .nav-icon-container
             = custom_icon('messages')
           %span.nav-item-name
             Messages
 
       = nav_link(controller: [:hooks, :hook_logs]) do
-        = link_to admin_hooks_path, title: 'Hooks' do
+        = sidebar_link admin_hooks_path, title: _('Hooks') do
           .nav-icon-container
             = custom_icon('system_hooks')
           %span.nav-item-name
             System Hooks
 
       = nav_link(controller: :applications) do
-        = link_to admin_applications_path, title: 'Applications' do
+        = sidebar_link admin_applications_path, title: _('Applications') do
           .nav-icon-container
             = custom_icon('applications')
           %span.nav-item-name
             Applications
 
       = nav_link(controller: :abuse_reports) do
-        = link_to admin_abuse_reports_path, title: "Abuse Reports" do
+        = sidebar_link admin_abuse_reports_path, title: _("Abuse Reports") do
           .nav-icon-container
             = custom_icon('abuse_reports')
           %span.nav-item-name
@@ -107,42 +107,42 @@
 
       - if akismet_enabled?
         = nav_link(controller: :spam_logs) do
-          = link_to admin_spam_logs_path, title: "Spam Logs" do
+          = sidebar_link admin_spam_logs_path, title: _("Spam Logs") do
             .nav-icon-container
               = custom_icon('spam_logs')
             %span.nav-item-name
               Spam Logs
 
       = nav_link(controller: :deploy_keys) do
-        = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
+        = sidebar_link admin_deploy_keys_path, title: _('Deploy Keys') do
           .nav-icon-container
             = custom_icon('key')
           %span.nav-item-name
             Deploy Keys
 
       = nav_link(controller: :services) do
-        = link_to admin_application_settings_services_path, title: 'Service Templates' do
+        = sidebar_link admin_application_settings_services_path, title: _('Service Templates') do
           .nav-icon-container
             = custom_icon('service_templates')
           %span.nav-item-name
             Service Templates
 
       = nav_link(controller: :labels) do
-        = link_to admin_labels_path, title: 'Labels' do
+        = sidebar_link admin_labels_path, title: _('Labels') do
           .nav-icon-container
             = custom_icon('labels')
           %span.nav-item-name
             Labels
 
       = nav_link(controller: :appearances) do
-        = link_to admin_appearances_path, title: 'Appearances' do
+        = sidebar_link admin_appearances_path, title: _('Appearances') do
           .nav-icon-container
             = custom_icon('appearance')
           %span.nav-item-name
             Appearance
 
       = nav_link(controller: :application_settings) do
-        = link_to admin_application_settings_path, title: 'Settings' do
+        = sidebar_link admin_application_settings_path, title: _('Settings') do
           .nav-icon-container
             = custom_icon('settings')
           %span.nav-item-name

app/views/layouts/nav/_new_group_sidebar.html.haml

@@ -8,7 +8,7 @@
           = @group.name
     %ul.sidebar-top-level-items
       = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
-        = link_to group_path(@group), title: 'Group overview' do
+        = sidebar_link group_path(@group), title: _('Group overview') do
           .nav-icon-container
             = custom_icon('project')
           %span.nav-item-name
@@ -26,7 +26,7 @@
                 Activity
 
       = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do
-        = link_to issues_group_path(@group), title: 'Issues' do
+        = sidebar_link issues_group_path(@group), title: _('Issues') do
           .nav-icon-container
             = custom_icon('issues')
           %span.nav-item-name
@@ -51,7 +51,7 @@
                 Milestones
 
       = nav_link(path: 'groups#merge_requests') do
-        = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
+        = sidebar_link merge_requests_group_path(@group), title: _('Merge Requests') do
           .nav-icon-container
             = custom_icon('mr_bold')
           %span.nav-item-name
@@ -59,14 +59,14 @@
             Merge Requests
           %span.badge.count= number_with_delimiter(merge_requests.count)
       = nav_link(path: 'group_members#index') do
-        = link_to group_group_members_path(@group), title: 'Members' do
+        = sidebar_link group_group_members_path(@group), title: _('Members') do
           .nav-icon-container
             = custom_icon('members')
           %span.nav-item-name
             Members
       - if current_user && can?(current_user, :admin_group, @group)
         = nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do
-          = link_to edit_group_path(@group), title: 'Settings' do
+          = sidebar_link edit_group_path(@group), title: _('Settings') do
             .nav-icon-container
               = custom_icon('settings')
             %span.nav-item-name

app/views/layouts/nav/_new_profile_sidebar.html.haml

@@ -7,76 +7,76 @@
         .sidebar-context-title User Settings
     %ul.sidebar-top-level-items
       = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
-        = link_to profile_path, title: 'Profile Settings' do
+        = sidebar_link profile_path, title: _('Profile Settings') do
           .nav-icon-container
             = custom_icon('profile')
           %span.nav-item-name
             Profile
       = nav_link(controller: [:accounts, :two_factor_auths]) do
-        = link_to profile_account_path, title: 'Account' do
+        = sidebar_link profile_account_path, title: _('Account') do
           .nav-icon-container
             = custom_icon('account')
           %span.nav-item-name
             Account
       - if current_application_settings.user_oauth_applications?
         = nav_link(controller: 'oauth/applications') do
-          = link_to applications_profile_path, title: 'Applications' do
+          = sidebar_link applications_profile_path, title: _('Applications') do
             .nav-icon-container
               = custom_icon('applications')
             %span.nav-item-name
               Applications
       = nav_link(controller: :chat_names) do
-        = link_to profile_chat_names_path, title: 'Chat' do
+        = sidebar_link profile_chat_names_path, title: _('Chat') do
           .nav-icon-container
             = custom_icon('chat')
           %span.nav-item-name
             Chat
       = nav_link(controller: :personal_access_tokens) do
-        = link_to profile_personal_access_tokens_path, title: 'Access Tokens' do
+        = sidebar_link profile_personal_access_tokens_path, title: _('Access Tokens') do
           .nav-icon-container
             = custom_icon('access_tokens')
           %span.nav-item-name
             Access Tokens
       = nav_link(controller: :emails) do
-        = link_to profile_emails_path, title: 'Emails' do
+        = sidebar_link profile_emails_path, title: _('Emails') do
           .nav-icon-container
             = custom_icon('emails')
           %span.nav-item-name
             Emails
       - unless current_user.ldap_user?
         = nav_link(controller: :passwords) do
-          = link_to edit_profile_password_path, title: 'Password' do
+          = sidebar_link edit_profile_password_path, title: _('Password') do
             .nav-icon-container
               = custom_icon('lock')
             %span.nav-item-name
               Password
       = nav_link(controller: :notifications) do
-        = link_to profile_notifications_path, title: 'Notifications' do
+        = sidebar_link profile_notifications_path, title: _('Notifications') do
           .nav-icon-container
             = custom_icon('notifications')
           %span.nav-item-name
             Notifications
 
       = nav_link(controller: :keys) do
-        = link_to profile_keys_path, title: 'SSH Keys' do
+        = sidebar_link profile_keys_path, title: _('SSH Keys') do
           .nav-icon-container
             = custom_icon('key')
           %span.nav-item-name
             SSH Keys
       = nav_link(controller: :gpg_keys) do
-        = link_to profile_gpg_keys_path, title: 'GPG Keys' do
+        = sidebar_link profile_gpg_keys_path, title: _('GPG Keys') do
           .nav-icon-container
             = custom_icon('key_2')
           %span.nav-item-name
             GPG Keys
       = nav_link(controller: :preferences) do
-        = link_to profile_preferences_path, title: 'Preferences' do
+        = sidebar_link profile_preferences_path, title: _('Preferences') do
           .nav-icon-container
             = custom_icon('preferences')
           %span.nav-item-name
             Preferences
       = nav_link(path: 'profiles#audit_log') do
-        = link_to audit_log_profile_path, title: 'Authentication log' do
+        = sidebar_link audit_log_profile_path, title: _('Authentication log') do
           .nav-icon-container
             = custom_icon('authentication_log')
           %span.nav-item-name

app/views/layouts/nav/_new_project_sidebar.html.haml

@@ -9,7 +9,7 @@
           = @project.name
     %ul.sidebar-top-level-items
       = nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do
-        = link_to project_path(@project), title: 'Project overview', class: 'shortcuts-project' do
+        = sidebar_link project_path(@project), title: _('Project overview'), css: 'shortcuts-project' do
           .nav-icon-container
             = custom_icon('project')
           %span.nav-item-name
@@ -31,7 +31,7 @@
 
       - if project_nav_tab? :files
         = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare projects/repositories tags branches releases graphs network)) do
-          = link_to project_tree_path(@project), title: 'Repository',  class: 'shortcuts-tree' do
+          = sidebar_link project_tree_path(@project), title: _('Repository'),  css: 'shortcuts-tree' do
             .nav-icon-container
               = custom_icon('doc_text')
             %span.nav-item-name
@@ -72,7 +72,7 @@
 
       - if project_nav_tab? :container_registry
         = nav_link(controller: %w[projects/registry/repositories]) do
-          = link_to project_container_registry_index_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
+          = sidebar_link project_container_registry_index_path(@project), title: _('Container Registry'), css: 'shortcuts-container-registry' do
             .nav-icon-container
               = custom_icon('container_registry')
             %span.nav-item-name
@@ -80,7 +80,7 @@
 
       - if project_nav_tab? :issues
         = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
-          = link_to project_issues_path(@project), title: 'Issues', class: 'shortcuts-issues' do
+          = sidebar_link project_issues_path(@project), title: _('Issues'), css: 'shortcuts-issues' do
             .nav-icon-container
               = custom_icon('issues')
             %span.nav-item-name
@@ -112,7 +112,7 @@
 
       - if project_nav_tab? :merge_requests
         = nav_link(controller: @project.issues_enabled? ? :merge_requests : [:merge_requests, :labels, :milestones]) do
-          = link_to project_merge_requests_path(@project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+          = sidebar_link project_merge_requests_path(@project), title: _('Merge Requests'), css: 'shortcuts-merge_requests' do
             .nav-icon-container
               = custom_icon('mr_bold')
             %span.nav-item-name
@@ -122,7 +122,7 @@
 
       - if project_nav_tab? :pipelines
         = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do
-          = link_to project_pipelines_path(@project), title: 'CI / CD', class: 'shortcuts-pipelines' do
+          = sidebar_link project_pipelines_path(@project), title: _('CI / CD'), css: 'shortcuts-pipelines' do
             .nav-icon-container
               = custom_icon('pipeline')
             %span.nav-item-name
@@ -161,7 +161,7 @@
 
       - if project_nav_tab? :wiki
         = nav_link(controller: :wikis) do
-          = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
+          = sidebar_link get_project_wiki_path(@project), title: _('Wiki'), css: 'shortcuts-wiki' do
             .nav-icon-container
               = custom_icon('wiki')
             %span.nav-item-name
@@ -169,7 +169,7 @@
 
       - if project_nav_tab? :snippets
         = nav_link(controller: :snippets) do
-          = link_to project_snippets_path(@project), title: 'Snippets', class: 'shortcuts-snippets' do
+          = sidebar_link project_snippets_path(@project), title: _('Snippets'), css: 'shortcuts-snippets' do
             .nav-icon-container
               = custom_icon('snippets')
             %span.nav-item-name
@@ -177,7 +177,7 @@
 
       - if project_nav_tab? :settings
         = nav_link(path: %w[projects#edit project_members#index integrations#show services#edit repository#show ci_cd#show pages#show]) do
-          = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do
+          = sidebar_link edit_project_path(@project), title: _('Settings'), css: 'shortcuts-tree' do
             .nav-icon-container
               = custom_icon('settings')
             %span.nav-item-name