diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-13 17:28:55 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-13 17:28:55 +0400 |
| commit | b1eb3d4670d3a36eeeac0027aea20524673d8bfc (patch) | |
| tree | b0e51d512640ec7a0d8541461bac58a7be78296f /app | |
| parent | 2ca4e70894229d9a7920f7539b9390bc43159b73 (diff) | |
| parent | 4ec8eecb66968efeab228cd1ce45d34dc76d396d (diff) | |
Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/hooks/index.html.haml | 27 | ||||
| -rw-r--r-- | app/views/projects/hooks/index.html.haml | 2 |
2 files changed, 11 insertions, 18 deletions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index ece97282ada..84546a75142 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -1,5 +1,5 @@ %h3.page-title - System Hooks + System hooks %p.light #{link_to "System hooks ", help_system_hooks_path, class: "vlink"} can be @@ -22,21 +22,14 @@ %hr -if @hooks.any? - %h3 - Hooks - %small (#{@hooks.count}) - %br - %table - %tr - %th URL - %th Method - %th - - @hooks.each do |hook| - %tr - %td + .ui-box + .title + System hooks (#{@hooks.count}) + %ul.well-list + - @hooks.each do |hook| + %li + .pull-right + = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small" + = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small" = link_to admin_hook_path(hook) do %strong= hook.url - = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right" - %td POST - %td - = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-small pull-right" diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 6141a4f3bd8..2ac67140bd7 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -47,7 +47,7 @@ -if @hooks.any? .ui-box .title - Web Hooks (#{@hooks.count}) + Web hooks (#{@hooks.count}) %ul.well-list - @hooks.each do |hook| %li |