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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d5fadfe0
Commit
d5fadfe0
authored
Apr 04, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI for admin/groups page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
ba7fcc98
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
35 deletions
+49
-35
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+11
-0
app/views/admin/groups/_group.html.haml
app/views/admin/groups/_group.html.haml
+28
-0
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+10
-35
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
d5fadfe0
...
@@ -56,6 +56,17 @@
...
@@ -56,6 +56,17 @@
}
}
}
}
.nav-search
{
display
:
inline-block
;
width
:
50%
;
padding
:
11px
0
;
/* Small devices (phones, tablets, 768px and lower) */
@media
(
max-width
:
$screen-sm-min
)
{
width
:
100%
;
}
}
.nav-links
{
.nav-links
{
display
:
inline-block
;
display
:
inline-block
;
width
:
50%
;
width
:
50%
;
...
...
app/views/admin/groups/_group.html.haml
0 → 100644
View file @
d5fadfe0
-
css_class
=
''
unless
local_assigns
[
:css_class
]
-
css_class
+=
" no-description"
if
group
.
description
.
blank?
%li
.group-row
{
class:
css_class
}
.controls.hidden-xs
=
link_to
'Edit'
,
edit_admin_group_path
(
group
),
id:
"edit_
#{
dom_id
(
group
)
}
"
,
class:
"btn btn-grouped btn-sm"
=
link_to
'Destroy'
,
[
:admin
,
group
],
data:
{
confirm:
"REMOVE
#{
group
.
name
}
? Are you sure?"
},
method: :delete
,
class:
"btn btn-grouped btn-sm btn-remove"
.stats
%span
=
icon
(
'bookmark'
)
=
number_with_delimiter
(
group
.
projects
.
count
)
%span
=
icon
(
'users'
)
=
number_with_delimiter
(
group
.
users
.
count
)
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
group
)}
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.title
=
link_to
[
:admin
,
group
],
class:
'group-name'
do
=
group
.
name
-
if
group
.
description
.
present?
.description
=
markdown
(
group
.
description
,
pipeline: :description
)
app/views/admin/groups/index.html.haml
View file @
d5fadfe0
-
page_title
"Groups"
-
page_title
"Groups"
%h3
.page-title
%h3
.page-title
Groups (
#{
number_with_delimiter
(
@groups
.
total_count
)
}
)
Groups (
#{
number_with_delimiter
(
@groups
.
total_count
)
}
)
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new pull-right"
%p
.light
%p
.light
Group allows you to keep projects organized.
Group allows you to keep projects organized.
Use groups for uniting related projects.
Use groups for uniting related projects.
%hr
.top-area
=
form_tag
admin_groups_path
,
method: :get
,
class:
'form-inline'
do
.nav-search
=
hidden_field_tag
:sort
,
@sort
=
form_tag
admin_groups_path
,
method: :get
,
class:
'form-inline'
do
.form-group
=
hidden_field_tag
:sort
,
@sort
=
text_field_tag
:name
,
params
[
:name
],
class:
"form-control"
=
text_field_tag
:name
,
params
[
:name
],
class:
"form-control"
=
button_tag
"Search"
,
class:
"btn submit btn-primary"
=
button_tag
"Search"
,
class:
"btn submit btn-primary"
.
pull-right
.
nav-controls
.dropdown.inline
.dropdown.inline
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%span
.light
%span
.light
...
@@ -33,34 +32,10 @@
...
@@ -33,34 +32,10 @@
=
sort_title_recently_updated
=
sort_title_recently_updated
=
link_to
admin_groups_path
(
sort:
sort_value_oldest_updated
)
do
=
link_to
admin_groups_path
(
sort:
sort_value_oldest_updated
)
do
=
sort_title_oldest_updated
=
sort_title_oldest_updated
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new"
%hr
%ul
.content-list
%ul
.bordered-list
-
@groups
.
each
do
|
group
|
-
@groups
.
each
do
|
group
|
%li
=
render
'group'
,
group:
group
.clearfix
.pull-right.prepend-top-10
=
link_to
'Edit'
,
edit_admin_group_path
(
group
),
id:
"edit_
#{
dom_id
(
group
)
}
"
,
class:
"btn btn-sm"
=
link_to
'Destroy'
,
[
:admin
,
group
],
data:
{
confirm:
"REMOVE
#{
group
.
name
}
? Are you sure?"
},
method: :delete
,
class:
"btn btn-sm btn-remove"
%h4
=
link_to
[
:admin
,
group
]
do
%span
{
class:
visibility_level_color
(
group
.
visibility_level
)
}
=
visibility_level_icon
(
group
.
visibility_level
)
%i
.fa.fa-folder
=
group
.
name
→
%span
.monospace
%strong
#{
group
.
path
}
/
.clearfix
%p
=
truncate
group
.
description
,
length:
150
.clearfix
%p
.light
#{
pluralize
(
group
.
members
.
size
,
'member'
)
}
,
#{
pluralize
(
group
.
projects
.
count
,
'project'
)
}
=
paginate
@groups
,
theme:
"gitlab"
=
paginate
@groups
,
theme:
"gitlab"
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