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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ce857b7c
Commit
ce857b7c
authored
Mar 26, 2014
by
Tom de Bruijn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve alignment of labels in .well-list items
parent
b7225bea
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
42 additions
and
27 deletions
+42
-27
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+6
-0
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+3
-2
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+4
-2
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+4
-3
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+3
-2
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+10
-9
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+2
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+3
-2
app/views/users_groups/_users_group.html.haml
app/views/users_groups/_users_group.html.haml
+7
-6
No files found.
app/assets/stylesheets/generic/lists.scss
View file @
ce857b7c
...
@@ -52,6 +52,12 @@
...
@@ -52,6 +52,12 @@
.author
{
color
:
#999
;
}
.author
{
color
:
#999
;
}
.list-item-name
{
float
:
left
;
position
:
relative
;
top
:
3px
;
}
p
{
p
{
padding-top
:
1px
;
padding-top
:
1px
;
margin
:
0
;
margin
:
0
;
...
...
app/views/admin/groups/show.html.haml
View file @
ce857b7c
...
@@ -70,8 +70,9 @@
...
@@ -70,8 +70,9 @@
-
@group
.
users_groups
.
order
(
'group_access DESC'
).
each
do
|
member
|
-
@group
.
users_groups
.
order
(
'group_access DESC'
).
each
do
|
member
|
-
user
=
member
.
user
-
user
=
member
.
user
%li
{
class:
dom_class
(
user
)}
%li
{
class:
dom_class
(
user
)}
%strong
.list-item-name
=
link_to
user
.
name
,
admin_user_path
(
user
)
%strong
=
link_to
user
.
name
,
admin_user_path
(
user
)
%span
.pull-right.light
%span
.pull-right.light
=
member
.
human_access
=
member
.
human_access
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
...
...
app/views/admin/hooks/index.html.haml
View file @
ce857b7c
...
@@ -28,8 +28,10 @@
...
@@ -28,8 +28,10 @@
%ul
.well-list
%ul
.well-list
-
@hooks
.
each
do
|
hook
|
-
@hooks
.
each
do
|
hook
|
%li
%li
.list-item-name
=
link_to
admin_hook_path
(
hook
)
do
%strong
=
hook
.
url
.pull-right
.pull-right
=
link_to
'Test Hook'
,
admin_hook_test_path
(
hook
),
class:
"btn btn-small"
=
link_to
'Test Hook'
,
admin_hook_test_path
(
hook
),
class:
"btn btn-small"
=
link_to
'Remove'
,
admin_hook_path
(
hook
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-small"
=
link_to
'Remove'
,
admin_hook_path
(
hook
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-small"
=
link_to
admin_hook_path
(
hook
)
do
%strong
=
hook
.
url
app/views/admin/projects/index.html.haml
View file @
ce857b7c
...
@@ -44,9 +44,10 @@
...
@@ -44,9 +44,10 @@
%ul
.well-list
%ul
.well-list
-
@projects
.
each
do
|
project
|
-
@projects
.
each
do
|
project
|
%li
%li
%span
{
class:
visibility_level_color
(
project
.
visibility_level
)
}
.list-item-name
=
visibility_level_icon
(
project
.
visibility_level
)
%span
{
class:
visibility_level_color
(
project
.
visibility_level
)
}
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
]
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
]
.pull-right
.pull-right
%span
.label.label-gray
%span
.label.label-gray
=
repository_size
(
project
)
=
repository_size
(
project
)
...
...
app/views/admin/projects/show.html.haml
View file @
ce857b7c
...
@@ -116,8 +116,9 @@
...
@@ -116,8 +116,9 @@
-
@project
.
users_projects
.
each
do
|
users_project
|
-
@project
.
users_projects
.
each
do
|
users_project
|
-
user
=
users_project
.
user
-
user
=
users_project
.
user
%li
.users_project
%li
.users_project
%strong
.list-item-name
=
link_to
user
.
name
,
admin_user_path
(
user
)
%strong
=
link_to
user
.
name
,
admin_user_path
(
user
)
.pull-right
.pull-right
-
if
users_project
.
owner?
-
if
users_project
.
owner?
%span
.light
Owner
%span
.light
Owner
...
...
app/views/admin/users/index.html.haml
View file @
ce857b7c
...
@@ -36,15 +36,16 @@
...
@@ -36,15 +36,16 @@
%ul
.well-list
%ul
.well-list
-
@users
.
each
do
|
user
|
-
@users
.
each
do
|
user
|
%li
%li
-
if
user
.
blocked?
.list-item-name
%i
.icon-lock.cred
-
if
user
.
blocked?
-
else
%i
.icon-lock.cred
%i
.icon-user.cgreen
-
else
=
link_to
user
.
name
,
[
:admin
,
user
]
%i
.icon-user.cgreen
-
if
user
.
admin?
=
link_to
user
.
name
,
[
:admin
,
user
]
%strong
.cred
(Admin)
-
if
user
.
admin?
-
if
user
==
current_user
%strong
.cred
(Admin)
%span
.cred
It's you!
-
if
user
==
current_user
%span
.cred
It's you!
.pull-right
.pull-right
%span
.light
%span
.light
%i
.icon-envelope
%i
.icon-envelope
...
...
app/views/admin/users/show.html.haml
View file @
ce857b7c
...
@@ -124,7 +124,8 @@
...
@@ -124,7 +124,8 @@
-
@user
.
users_groups
.
each
do
|
user_group
|
-
@user
.
users_groups
.
each
do
|
user_group
|
-
group
=
user_group
.
group
-
group
=
user_group
.
group
%li
.users_group
%li
.users_group
%strong
=
link_to
group
.
name
,
admin_group_path
(
group
)
%span
{
class:
(
"list-item-name"
unless
user_group
.
owner?
)}
%strong
=
link_to
group
.
name
,
admin_group_path
(
group
)
.pull-right
.pull-right
%span
.light
=
user_group
.
human_access
%span
.light
=
user_group
.
human_access
-
unless
user_group
.
owner?
-
unless
user_group
.
owner?
...
...
app/views/groups/edit.html.haml
View file @
ce857b7c
...
@@ -73,8 +73,9 @@
...
@@ -73,8 +73,9 @@
%ul
.well-list
%ul
.well-list
-
@group
.
projects
.
each
do
|
project
|
-
@group
.
projects
.
each
do
|
project
|
%li
%li
=
visibility_level_icon
(
project
.
visibility_level
)
.list-item-name
=
link_to
project
.
name_with_namespace
,
project
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project
.
name_with_namespace
,
project
.pull-right
.pull-right
=
link_to
'Members'
,
project_team_index_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Members'
,
project_team_index_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
=
link_to
'Edit'
,
edit_project_path
(
project
),
id:
"edit_
#{
dom_id
(
project
)
}
"
,
class:
"btn btn-small"
...
...
app/views/users_groups/_users_group.html.haml
View file @
ce857b7c
...
@@ -2,11 +2,12 @@
...
@@ -2,11 +2,12 @@
-
return
unless
user
-
return
unless
user
-
show_roles
=
true
if
show_roles
.
nil?
-
show_roles
=
true
if
show_roles
.
nil?
%li
{
class:
"#{dom_class(member)} js-toggle-container"
,
id:
dom_id
(
member
)}
%li
{
class:
"#{dom_class(member)} js-toggle-container"
,
id:
dom_id
(
member
)}
=
image_tag
avatar_icon
(
user
.
email
,
16
),
class:
"avatar s16"
%span
{
class:
(
"list-item-name"
if
show_controls
)}
%strong
=
user
.
name
=
image_tag
avatar_icon
(
user
.
email
,
16
),
class:
"avatar s16"
%span
.cgray
=
user
.
username
%strong
=
user
.
name
-
if
user
==
current_user
%span
.cgray
=
user
.
username
%span
.label.label-success
It's you
-
if
user
==
current_user
%span
.label.label-success
It's you
-
if
show_roles
-
if
show_roles
%span
.pull-right
%span
.pull-right
...
@@ -22,7 +23,7 @@
...
@@ -22,7 +23,7 @@
-
else
-
else
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
%i
.icon-minus.icon-white
%i
.icon-minus.icon-white
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
.alert.prepend-top-20
.alert.prepend-top-20
...
...
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