Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
42865bfe
Commit
42865bfe
authored
Jul 12, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aria labels on top header links
Closes #12797
parent
158786ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+9
-9
No files found.
app/helpers/projects_helper.rb
View file @
42865bfe
...
@@ -60,7 +60,7 @@ module ProjectsHelper
...
@@ -60,7 +60,7 @@ module ProjectsHelper
project_link
=
link_to
simple_sanitize
(
project
.
name
),
project_path
(
project
),
{
class:
"project-item-select-holder"
}
project_link
=
link_to
simple_sanitize
(
project
.
name
),
project_path
(
project
),
{
class:
"project-item-select-holder"
}
if
current_user
if
current_user
project_link
<<
icon
(
"chevron-down"
,
class:
"dropdown-toggle-caret js-projects-dropdown-toggle"
,
data:
{
target:
".js-dropdown-menu-projects"
,
toggle:
"dropdown"
})
project_link
<<
icon
(
"chevron-down"
,
class:
"dropdown-toggle-caret js-projects-dropdown-toggle"
,
aria:
{
label:
"Toggle switch project dropdown"
},
data:
{
target:
".js-dropdown-menu-projects"
,
toggle:
"dropdown"
})
end
end
full_title
=
"
#{
namespace_link
}
/
#{
project_link
}
"
.
html_safe
full_title
=
"
#{
namespace_link
}
/
#{
project_link
}
"
.
html_safe
...
...
app/views/layouts/header/_default.html.haml
View file @
42865bfe
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
%div
{
class:
fluid_layout
?
"container-fluid"
:
"container-fluid"
}
%div
{
class:
fluid_layout
?
"container-fluid"
:
"container-fluid"
}
.header-content
.header-content
%button
.side-nav-toggle
{
type:
'button'
}
%button
.side-nav-toggle
{
type:
'button'
,
"aria-label"
=>
"Toggle global navigation"
}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
=
icon
(
'bars'
)
%button
.navbar-toggle
{
type:
'button'
}
%button
.navbar-toggle
{
type:
'button'
}
...
@@ -13,25 +13,25 @@
...
@@ -13,25 +13,25 @@
%li
.hidden-sm.hidden-xs
%li
.hidden-sm.hidden-xs
=
render
'layouts/search'
unless
current_controller?
(
:search
)
=
render
'layouts/search'
unless
current_controller?
(
:search
)
%li
.visible-sm.visible-xs
%li
.visible-sm.visible-xs
=
link_to
search_path
,
title:
'Search'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'search'
)
=
icon
(
'search'
)
-
if
current_user
-
if
current_user
-
if
session
[
:impersonator_id
]
-
if
session
[
:impersonator_id
]
%li
.impersonation
%li
.impersonation
=
link_to
admin_impersonation_path
,
method: :delete
,
title:
'Stop Impersonation'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_impersonation_path
,
method: :delete
,
title:
"Stop Impersonation"
,
aria:
{
label:
'Stop Impersonation'
}
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'user-secret fw'
)
=
icon
(
'user-secret fw'
)
-
if
current_user
.
is_admin?
-
if
current_user
.
is_admin?
%li
%li
=
link_to
admin_root_path
,
title:
'Admin Area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_root_path
,
title:
'Admin Area'
,
aria:
{
label:
"Admin Area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
=
icon
(
'wrench fw'
)
%li
%li
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'bell fw'
)
=
icon
(
'bell fw'
)
%span
.badge.todos-pending-count
{
class:
(
"hidden"
if
todos_pending_count
==
0
)
}
%span
.badge.todos-pending-count
{
class:
(
"hidden"
if
todos_pending_count
==
0
)
}
=
todos_pending_count
=
todos_pending_count
-
if
current_user
.
can_create_project?
-
if
current_user
.
can_create_project?
%li
%li
=
link_to
new_project_path
,
title:
'New project'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
new_project_path
,
title:
'New project'
,
aria:
{
label:
"New project"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'plus fw'
)
=
icon
(
'plus fw'
)
-
if
Gitlab
::
Sherlock
.
enabled?
-
if
Gitlab
::
Sherlock
.
enabled?
%li
%li
...
@@ -45,12 +45,12 @@
...
@@ -45,12 +45,12 @@
.dropdown-menu-nav.dropdown-menu-align-right
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%ul
%li
%li
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
%li
%li
=
link_to
"Profile Settings"
,
profile_path
=
link_to
"Profile Settings"
,
profile_path
,
aria:
{
label:
"Profile Settings"
}
%li
.divider
%li
.divider
%li
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
,
title:
'Sign out'
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
,
aria:
{
label:
"Sign out"
}
-
else
-
else
%li
%li
%div
%div
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment