diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-04-14 19:54:06 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-04-21 19:28:17 +0300 |
| commit | b3c2b5f0f7ea5b0279000bd555d7344d786488fb (patch) | |
| tree | 3aa9fc3c9be486457e4518de3875ba8e518f5c37 /app | |
| parent | c01de7e5e896d39cd461d555aa974ba04fa05eaf (diff) | |
| download | gitlab-ci-b3c2b5f0f7ea5b0279000bd555d7344d786488fb.tar.gz | |
runners page: UI improvements
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 5 | ||||
| -rw-r--r-- | app/views/runners/_runner.html.haml | 17 | ||||
| -rw-r--r-- | app/views/runners/_shared_runners.html.haml | 2 | ||||
| -rw-r--r-- | app/views/runners/_specific_runners.html.haml | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 721d931..0c3d058 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -101,3 +101,8 @@ ul.bordered-list { } } } + +.underlined-title { + border-bottom: 1px solid #ccc; + padding: 0 0 3px 3px; +} diff --git a/app/views/runners/_runner.html.haml b/app/views/runners/_runner.html.haml index 5262953..9ac847d 100644 --- a/app/views/runners/_runner.html.haml +++ b/app/views/runners/_runner.html.haml @@ -3,18 +3,15 @@ = runner_status_icon(runner) %span.monospace = runner.short_sha + - if @runners.include?(runner) + %small + =link_to edit_project_runner_path(@project, runner) do + %i.fa.icon-edit.btn + .pull-right - if @runners.include?(runner) - = link_to 'Edit', edit_project_runner_path(@project, runner), class: 'btn btn-small' - - if runner.active? - = link_to 'Pause', [:pause, @project, runner], data: { confirm: "Are you sure?" }, method: :get, class: 'btn btn-danger btn-small' - - else - = link_to 'Resume', [:resume, @project, runner], method: :get, class: 'btn btn-success btn-small' - - if runner.only_for?(@project) - = link_to 'Remove', [@project, runner], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-small' - - else - - runner_project = @project.runner_projects.find_by(runner_id: runner) - = link_to 'Disable for this project', [@project, runner_project], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-small' + - runner_project = @project.runner_projects.find_by(runner_id: runner) + = link_to 'Disable for this project', [@project, runner_project], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-small' - elsif runner.specific? = form_for [@project, @project.runner_projects.new] do |f| = f.hidden_field :runner_id, value: runner.id diff --git a/app/views/runners/_shared_runners.html.haml b/app/views/runners/_shared_runners.html.haml index 642e3f6..7cd365f 100644 --- a/app/views/runners/_shared_runners.html.haml +++ b/app/views/runners/_shared_runners.html.haml @@ -15,7 +15,7 @@ This application has no shared runners yet. Please use specific runners or ask administrator to create one - else - %h4 Available shared runners - #{@shared_runners_count} + %h4.underlined-title Available shared runners - #{@shared_runners_count} %ul.bordered-list = render @shared_runners.first(10) - if @shared_runners_count > 10 diff --git a/app/views/runners/_specific_runners.html.haml b/app/views/runners/_specific_runners.html.haml index 055071c..2e47b1b 100644 --- a/app/views/runners/_specific_runners.html.haml +++ b/app/views/runners/_specific_runners.html.haml @@ -18,12 +18,12 @@ - if @runners.any? - %h4 Runners activated for this project + %h4.underlined-title Runners activated for this project %ul.bordered-list = render @runners - if @specific_runners.any? - %h4 Available specific runners + %h4.underlined-title Available specific runners %ul.bordered-list = render @specific_runners = paginate @specific_runners |