BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d3b6c185
Commit
d3b6c185
authored
Jun 15, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move builds tab to admin overview
parent
d1c3f3d8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
54 deletions
+59
-54
index.html.haml
app/views/admin/builds/index.html.haml
+54
-49
_head.html.haml
app/views/admin/dashboard/_head.html.haml
+4
-0
_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-5
No files found.
app/views/admin/builds/index.html.haml
View file @
d3b6c185
.top-area
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
admin_builds_path
do
All
%span
.badge.js-totalbuilds-count
=
@all_builds
.
count
(
:id
)
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
=
link_to
admin_builds_path
(
scope: :running
)
do
Running
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
running_or_pending
.
count
(
:id
))
%li
{
class:
(
'active'
if
@scope
==
'finished'
)}
=
link_to
admin_builds_path
(
scope: :finished
)
do
Finished
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
finished
.
count
(
:id
))
.nav-controls
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
.row-content-block.second-block
#{
(
@scope
||
'all'
).
capitalize
}
builds
%ul
.content-list
-
if
@builds
.
blank?
%li
.nothing-here-block
No builds to show
-
else
.table-holder
%table
.table.builds
%thead
%tr
%th
Status
%th
Build ID
%th
Project
%th
Commit
%th
Ref
%th
Runner
%th
Name
%th
Tags
%th
Duration
%th
Finished at
%th
-
@builds
.
each
do
|
build
|
=
render
"admin/builds/build"
,
build:
build
=
paginate
@builds
,
theme:
'gitlab'
-
@no_container
=
true
=
render
"admin/dashboard/head"
%div
{
class:
(
container_class
)
}
.top-area
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
admin_builds_path
do
All
%span
.badge.js-totalbuilds-count
=
@all_builds
.
count
(
:id
)
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
=
link_to
admin_builds_path
(
scope: :running
)
do
Running
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
running_or_pending
.
count
(
:id
))
%li
{
class:
(
'active'
if
@scope
==
'finished'
)}
=
link_to
admin_builds_path
(
scope: :finished
)
do
Finished
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
finished
.
count
(
:id
))
.nav-controls
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
.row-content-block.second-block
#{
(
@scope
||
'all'
).
capitalize
}
builds
%ul
.content-list
-
if
@builds
.
blank?
%li
.nothing-here-block
No builds to show
-
else
.table-holder
%table
.table.builds
%thead
%tr
%th
Status
%th
Build ID
%th
Project
%th
Commit
%th
Ref
%th
Runner
%th
Name
%th
Tags
%th
Duration
%th
Finished at
%th
-
@builds
.
each
do
|
build
|
=
render
"admin/builds/build"
,
build:
build
=
paginate
@builds
,
theme:
'gitlab'
app/views/admin/dashboard/_head.html.haml
View file @
d3b6c185
...
...
@@ -4,6 +4,10 @@
=
link_to
admin_root_path
,
title:
'Overview'
do
%span
Overview
=
nav_link
path:
'builds#index'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
Builds
=
nav_link
(
controller:
[
:admin
,
:projects
])
do
=
link_to
admin_namespaces_projects_path
,
title:
'Projects'
do
%span
...
...
app/views/layouts/nav/_admin.html.haml
View file @
d3b6c185
%ul
.nav-links.scrolling-tabs
.fade-left
=
nav_link
(
controller:
%w(dashboard admin projects users groups)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups
builds
)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
%span
Overview
...
...
@@ -12,10 +12,6 @@
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
Runners
=
nav_link
path:
'builds#index'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
Builds
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
=
link_to
admin_background_jobs_path
,
title:
'Monitoring'
do
%span
...
...
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