Commit b1eb3d4670d3a36eeeac0027aea20524673d8bfc
Exists in
master
and in
4 other branches
Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq
Showing
2 changed files
with
11 additions
and
18 deletions
Show diff stats
app/views/admin/hooks/index.html.haml
| 1 | %h3.page-title | 1 | %h3.page-title |
| 2 | - System Hooks | 2 | + System hooks |
| 3 | 3 | ||
| 4 | %p.light | 4 | %p.light |
| 5 | #{link_to "System hooks ", help_system_hooks_path, class: "vlink"} can be | 5 | #{link_to "System hooks ", help_system_hooks_path, class: "vlink"} can be |
| @@ -22,21 +22,14 @@ | @@ -22,21 +22,14 @@ | ||
| 22 | %hr | 22 | %hr |
| 23 | 23 | ||
| 24 | -if @hooks.any? | 24 | -if @hooks.any? |
| 25 | - %h3 | ||
| 26 | - Hooks | ||
| 27 | - %small (#{@hooks.count}) | ||
| 28 | - %br | ||
| 29 | - %table | ||
| 30 | - %tr | ||
| 31 | - %th URL | ||
| 32 | - %th Method | ||
| 33 | - %th | ||
| 34 | - - @hooks.each do |hook| | ||
| 35 | - %tr | ||
| 36 | - %td | 25 | + .ui-box |
| 26 | + .title | ||
| 27 | + System hooks (#{@hooks.count}) | ||
| 28 | + %ul.well-list | ||
| 29 | + - @hooks.each do |hook| | ||
| 30 | + %li | ||
| 31 | + .pull-right | ||
| 32 | + = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small" | ||
| 33 | + = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small" | ||
| 37 | = link_to admin_hook_path(hook) do | 34 | = link_to admin_hook_path(hook) do |
| 38 | %strong= hook.url | 35 | %strong= hook.url |
| 39 | - = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right" | ||
| 40 | - %td POST | ||
| 41 | - %td | ||
| 42 | - = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small pull-right" |
app/views/projects/hooks/index.html.haml