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
2079253f
Commit
2079253f
authored
May 22, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '32496-admin-tabs' into 'master'
Fix admin tabs Closes #32496 See merge request !11514
parents
a83bef6c
e983f03a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
35 deletions
+36
-35
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+36
-35
No files found.
app/views/admin/users/index.html.haml
View file @
2079253f
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
=
render
"admin/dashboard/head"
=
render
"admin/dashboard/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.top-area
.prepend-top-default
.prepend-top-default
=
form_tag
admin_users_path
,
method: :get
do
=
form_tag
admin_users_path
,
method: :get
do
-
if
params
[
:filter
].
present?
-
if
params
[
:filter
].
present?
...
@@ -35,9 +34,12 @@
...
@@ -35,9 +34,12 @@
=
sort_title_oldest_updated
=
sort_title_oldest_updated
=
link_to
'New user'
,
new_admin_user_path
,
class:
'btn btn-new btn-search'
=
link_to
'New user'
,
new_admin_user_path
,
class:
'btn btn-new btn-search'
.nav-block
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
%ul
.nav-links.wide.scrolling-tabs.white.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
].
nil?
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
].
nil?
)
})
do
=
link_to
admin_users_path
do
=
link_to
admin_users_path
do
Active
Active
...
@@ -66,7 +68,6 @@
...
@@ -66,7 +68,6 @@
=
link_to
admin_users_path
(
filter:
"wop"
)
do
=
link_to
admin_users_path
(
filter:
"wop"
)
do
Without projects
Without projects
%small
.badge
=
number_with_delimiter
(
User
.
without_projects
.
count
)
%small
.badge
=
number_with_delimiter
(
User
.
without_projects
.
count
)
.fade-right
%ul
.flex-list.content-list
%ul
.flex-list.content-list
-
if
@users
.
empty?
-
if
@users
.
empty?
...
...
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