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
Boxiang Sun
gitlab-ce
Commits
e983f03a
Commit
e983f03a
authored
May 18, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix admin tabs
parent
e4eec191
Changes
1
Hide 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 @
e983f03a
...
@@ -3,41 +3,43 @@
...
@@ -3,41 +3,43 @@
=
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?
=
hidden_field_tag
"filter"
,
h
(
params
[
:filter
])
=
hidden_field_tag
"filter"
,
h
(
params
[
:filter
])
.search-holder
.search-holder
.search-field-holder
.search-field-holder
=
search_field_tag
:search_query
,
params
[
:search_query
],
placeholder:
'Search by name, email or username'
,
class:
'form-control search-text-input js-search-input'
,
spellcheck:
false
=
search_field_tag
:search_query
,
params
[
:search_query
],
placeholder:
'Search by name, email or username'
,
class:
'form-control search-text-input js-search-input'
,
spellcheck:
false
=
icon
(
"search"
,
class:
"search-icon"
)
=
icon
(
"search"
,
class:
"search-icon"
)
.dropdown
.dropdown
-
toggle_text
=
if
@sort
.
present?
then
sort_options_hash
[
@sort
]
else
sort_title_name
end
-
toggle_text
=
if
@sort
.
present?
then
sort_options_hash
[
@sort
]
else
sort_title_name
end
=
dropdown_toggle
(
toggle_text
,
{
toggle:
'dropdown'
})
=
dropdown_toggle
(
toggle_text
,
{
toggle:
'dropdown'
})
%ul
.dropdown-menu.dropdown-menu-align-right
%ul
.dropdown-menu.dropdown-menu-align-right
%li
.dropdown-header
%li
.dropdown-header
Sort by
Sort by
%li
%li
=
link_to
admin_users_path
(
sort:
sort_value_name
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_name
,
filter:
params
[
:filter
])
do
=
sort_title_name
=
sort_title_name
=
link_to
admin_users_path
(
sort:
sort_value_recently_signin
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_recently_signin
,
filter:
params
[
:filter
])
do
=
sort_title_recently_signin
=
sort_title_recently_signin
=
link_to
admin_users_path
(
sort:
sort_value_oldest_signin
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_oldest_signin
,
filter:
params
[
:filter
])
do
=
sort_title_oldest_signin
=
sort_title_oldest_signin
=
link_to
admin_users_path
(
sort:
sort_value_recently_created
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_recently_created
,
filter:
params
[
:filter
])
do
=
sort_title_recently_created
=
sort_title_recently_created
=
link_to
admin_users_path
(
sort:
sort_value_oldest_created
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_oldest_created
,
filter:
params
[
:filter
])
do
=
sort_title_oldest_created
=
sort_title_oldest_created
=
link_to
admin_users_path
(
sort:
sort_value_recently_updated
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_recently_updated
,
filter:
params
[
:filter
])
do
=
sort_title_recently_updated
=
sort_title_recently_updated
=
link_to
admin_users_path
(
sort:
sort_value_oldest_updated
,
filter:
params
[
:filter
])
do
=
link_to
admin_users_path
(
sort:
sort_value_oldest_updated
,
filter:
params
[
:filter
])
do
=
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