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
ebd06d7e
Commit
ebd06d7e
authored
Sep 14, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make small ui fixes for CI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
910bf96e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
18 deletions
+20
-18
app/assets/stylesheets/ci/projects.scss
app/assets/stylesheets/ci/projects.scss
+6
-0
app/helpers/ci/commits_helper.rb
app/helpers/ci/commits_helper.rb
+1
-1
app/views/ci/charts/show.html.haml
app/views/ci/charts/show.html.haml
+1
-1
app/views/ci/projects/_search.html.haml
app/views/ci/projects/_search.html.haml
+7
-8
app/views/ci/projects/gitlab.html.haml
app/views/ci/projects/gitlab.html.haml
+0
-3
app/views/ci/projects/index.html.haml
app/views/ci/projects/index.html.haml
+3
-2
app/views/layouts/ci/_info.html.haml
app/views/layouts/ci/_info.html.haml
+2
-3
No files found.
app/assets/stylesheets/ci/projects.scss
View file @
ebd06d7e
...
@@ -47,4 +47,10 @@
...
@@ -47,4 +47,10 @@
.loading
{
.loading
{
font-size
:
20px
;
font-size
:
20px
;
}
}
.ci-charts
{
fieldset
{
margin-bottom
:
16px
;
}
}
}
}
app/helpers/ci/commits_helper.rb
View file @
ebd06d7e
module
Ci
module
Ci
module
CommitsHelper
module
CommitsHelper
def
commit_status_alert_class
(
commit
)
def
commit_status_alert_class
(
commit
)
return
unless
commit
return
'alert-info'
unless
commit
case
commit
.
status
case
commit
.
status
when
'success'
when
'success'
...
...
app/views/ci/charts/show.html.haml
View file @
ebd06d7e
#charts
#charts
.ci-charts
=
render
'builds'
=
render
'builds'
=
render
'build_times'
=
render
'build_times'
=
render
'overall'
=
render
'overall'
app/views/ci/projects/_search.html.haml
View file @
ebd06d7e
.search
.search
=
form_tag
"#"
,
method: :get
,
class:
'navbar-form'
do
|
f
|
=
form_tag
"#"
,
method: :get
,
class:
'ci-search-form'
do
|
f
|
.form-group
.input-group
.input-group
=
search_field_tag
"search"
,
params
[
:search
],
placeholder:
"Search"
,
class:
"search-input form-control"
=
search_field_tag
"search"
,
params
[
:search
],
placeholder:
"Search"
,
class:
"search-input form-control"
.input-group-addon
.input-group-addon
...
@@ -8,9 +7,9 @@
...
@@ -8,9 +7,9 @@
:coffeescript
:coffeescript
$('.
search .navbar
-form').submit ->
$('.
ci-search
-form').submit ->
NProgress.start()
NProgress.start()
query = $('.
search .navbar
-form .search-input').val()
query = $('.
ci-search
-form .search-input').val()
$.get '
#{
gitlab_ci_projects_path
}
', { search: query }, (data) ->
$.get '
#{
gitlab_ci_projects_path
}
', { search: query }, (data) ->
$(".projects").html data.html
$(".projects").html data.html
NProgress.done()
NProgress.done()
...
...
app/views/ci/projects/gitlab.html.haml
View file @
ebd06d7e
...
@@ -3,9 +3,6 @@
...
@@ -3,9 +3,6 @@
.pull-left.fetch-status
.pull-left.fetch-status
-
if
params
[
:search
].
present?
-
if
params
[
:search
].
present?
by keyword: "
#{
params
[
:search
]
}
",
by keyword: "
#{
params
[
:search
]
}
",
%br
.pull-right
#{
@total_count
}
projects,
#{
@projects
.
size
}
of them added to CI
#{
@total_count
}
projects,
#{
@projects
.
size
}
of them added to CI
%br
%br
...
...
app/views/ci/projects/index.html.haml
View file @
ebd06d7e
-
if
current_user
-
if
current_user
.gray-content-block.top-block
=
render
"search"
=
render
"search"
.projects
.projects
.prepend-top-default
%p
.fetch-status.light
%p
.fetch-status.light
%i
.fa.fa-refresh.fa-spin
%i
.fa.fa-refresh.fa-spin
:coffeescript
:coffeescript
...
...
app/views/layouts/ci/_info.html.haml
View file @
ebd06d7e
.container
-
if
current_user
&&
current_user
.
is_admin?
&&
Ci
::
Runner
.
count
.
zero?
-
if
current_user
&&
current_user
.
is_admin?
&&
Ci
::
Runner
.
count
.
zero?
=
render
'ci/shared/no_runners'
=
render
'ci/shared/no_runners'
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