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
5ea5e8f5
Commit
5ea5e8f5
authored
Aug 26, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Standartize how we render group rows
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e0b4222f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
38 deletions
+30
-38
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-0
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+4
-27
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+1
-11
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+24
-0
No files found.
app/assets/stylesheets/generic/common.scss
View file @
5ea5e8f5
...
@@ -377,6 +377,7 @@ table {
...
@@ -377,6 +377,7 @@ table {
.center-top-menu
{
.center-top-menu
{
list-style
:
none
;
list-style
:
none
;
text-align
:
center
;
text-align
:
center
;
margin-top
:
5px
;
padding-bottom
:
15px
;
padding-bottom
:
15px
;
margin-bottom
:
15px
;
margin-bottom
:
15px
;
...
...
app/views/dashboard/groups/index.html.haml
View file @
5ea5e8f5
...
@@ -8,32 +8,9 @@
...
@@ -8,32 +8,9 @@
=
link_to
new_group_path
,
class:
"btn btn-new btn-sm"
do
=
link_to
new_group_path
,
class:
"btn btn-new btn-sm"
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Group
New Group
.panel.panel-default
%ul
.bordered-list
.panel-heading
-
@group_members
.
each
do
|
group_member
|
%strong
Groups
-
group
=
group_member
.
group
(
#{
@group_members
.
count
}
)
=
render
'shared/groups/group'
,
group:
group
,
group_member:
group_member
%ul
.well-list
-
@group_members
.
each
do
|
group_member
|
-
group
=
group_member
.
group
%li
.pull-right.hidden-xs
-
if
can?
(
current_user
,
:admin_group
,
group
)
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
%i
.fa.fa-cogs
Settings
=
link_to
leave_group_group_members_path
(
group
),
data:
{
confirm:
leave_group_message
(
group
.
name
)
},
method: :delete
,
class:
"btn-sm btn btn-grouped"
,
title:
'Leave this group'
do
%i
.fa.fa-sign-out
Leave
=
image_tag
group_icon
(
group
),
class:
"avatar s40 avatar-tile hidden-xs"
=
link_to
group
,
class:
'group-name'
do
%strong
=
group
.
name
as
%strong
#{
group_member
.
human_access
}
%div
.light
#{
pluralize
(
group
.
projects
.
count
,
"project"
)
}
,
#{
pluralize
(
group
.
users
.
count
,
"user"
)
}
=
paginate
@group_members
=
paginate
@group_members
app/views/explore/groups/index.html.haml
View file @
5ea5e8f5
...
@@ -32,17 +32,7 @@
...
@@ -32,17 +32,7 @@
%ul
.bordered-list
%ul
.bordered-list
-
@groups
.
each
do
|
group
|
-
@groups
.
each
do
|
group
|
%li
=
render
'shared/groups/group'
,
group:
group
.clearfix
%h4
=
link_to
group_path
(
id:
group
.
path
)
do
=
group
.
name
.clearfix
%p
=
truncate
group
.
description
,
length:
150
.clearfix
%p
.light
#{
pluralize
(
group
.
members
.
size
,
'member'
)
}
,
#{
pluralize
(
group
.
projects
.
count
,
'project'
)
}
-
unless
@groups
.
present?
-
unless
@groups
.
present?
.nothing-here-block
No public groups
.nothing-here-block
No public groups
...
...
app/views/shared/groups/_group.html.haml
0 → 100644
View file @
5ea5e8f5
-
group_member
=
local_assigns
[
:group_member
]
%li
-
if
group_member
.pull-right.hidden-xs
-
if
can?
(
current_user
,
:admin_group
,
group
)
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
%i
.fa.fa-cogs
Settings
=
link_to
leave_group_group_members_path
(
group
),
data:
{
confirm:
leave_group_message
(
group
.
name
)
},
method: :delete
,
class:
"btn-sm btn btn-grouped"
,
title:
'Leave this group'
do
%i
.fa.fa-sign-out
Leave
=
image_tag
group_icon
(
group
),
class:
"avatar s40 avatar-tile hidden-xs"
=
link_to
group
,
class:
'group-name'
do
%strong
=
group
.
name
-
if
group_member
as
%strong
#{
group_member
.
human_access
}
%div
.light
#{
pluralize
(
group
.
projects
.
count
,
"project"
)
}
,
#{
pluralize
(
group
.
users
.
count
,
"user"
)
}
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