Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq

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"

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