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
db961b8b
Commit
db961b8b
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve few admin pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1701144b
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
23 deletions
+18
-23
app/assets/stylesheets/themes/ui_color.scss
app/assets/stylesheets/themes/ui_color.scss
+1
-1
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+11
-16
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+6
-6
No files found.
app/assets/stylesheets/themes/ui_color.scss
View file @
db961b8b
...
@@ -38,6 +38,6 @@
...
@@ -38,6 +38,6 @@
}
}
.nav-pills
>
li
.active
>
a
,
.nav-pills
>
li
.active
>
a
:hover
,
.nav-pills
>
li
.active
>
a
:focus
{
.nav-pills
>
li
.active
>
a
,
.nav-pills
>
li
.active
>
a
:hover
,
.nav-pills
>
li
.active
>
a
:focus
{
background
:
#
658
;
background
:
#
769
;
}
}
}
}
This diff is collapsed.
Click to expand it.
app/views/admin/groups/index.html.haml
View file @
db961b8b
%h3
.page-title
%h3
.page-title
Groups (
#{
@groups
.
total_count
}
)
Groups (
#{
@groups
.
total_count
}
)
%small
allows you to keep projects organized.
Use groups for uniting related projects.
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new pull-right"
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new pull-right"
%br
%p
.light
Group allows you to keep projects organized.
Use groups for uniting related projects.
%hr
=
form_tag
admin_groups_path
,
method: :get
,
class:
'form-inline'
do
=
form_tag
admin_groups_path
,
method: :get
,
class:
'form-inline'
do
.form-group
.form-group
=
text_field_tag
:name
,
params
[
:name
],
class:
"form-control input-mn-300"
=
text_field_tag
:name
,
params
[
:name
],
class:
"form-control input-mn-300"
...
@@ -23,24 +24,18 @@
...
@@ -23,24 +24,18 @@
%h4
%h4
=
link_to
[
:admin
,
group
]
do
=
link_to
[
:admin
,
group
]
do
%i
.icon-folder-close
=
group
.
name
=
group
.
name
→
→
%span
.monospace
%span
.monospace
%i
.icon-folder-close
%strong
#{
group
.
path
}
/
%strong
#{
group
.
path
}
/
.clearfix.light.append-bottom-10
%span
%b
Members:
%span
.badge
=
group
.
members
.
size
\|
%span
%b
Projects:
%span
.badge
=
group
.
projects
.
count
.clearfix
.clearfix
%p
%p
=
truncate
group
.
description
,
length:
150
=
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"
This diff is collapsed.
Click to expand it.
app/views/admin/users/index.html.haml
View file @
db961b8b
.row
.row
.col-md-3
.col-md-3
.admin-filter
.admin-filter
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
.append-bottom-10
.form-group
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'form-control'
=
button_tag
type:
'submit'
,
class:
'btn btn-primary'
do
%i
.icon-search
%ul
.nav.nav-pills.nav-stacked
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
"#{'active' unless params[:filter]}"
}
%li
{
class:
"#{'active' unless params[:filter]}"
}
=
link_to
admin_users_path
do
=
link_to
admin_users_path
do
...
@@ -25,6 +19,12 @@
...
@@ -25,6 +19,12 @@
Without projects
Without projects
%small
.pull-right
=
User
.
without_projects
.
count
%small
.pull-right
=
User
.
without_projects
.
count
%hr
%hr
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
.form-group
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'form-control'
=
button_tag
type:
'submit'
,
class:
'btn btn-primary'
do
%i
.icon-search
%hr
=
link_to
'Reset'
,
admin_users_path
,
class:
"btn btn-cancel"
=
link_to
'Reset'
,
admin_users_path
,
class:
"btn btn-cancel"
.col-md-9
.col-md-9
...
...
This diff is collapsed.
Click to expand it.
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