From c7bb3a1f726be189ccce51bdd631b26eb4f64db1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 9 Jan 2013 08:14:05 +0300
Subject: sidekiq

---
 app/views/admin/dashboard/index.html.haml | 25 +++----------------------
 app/views/admin/resque/show.html.haml     |  4 ++--
 app/views/layouts/admin.html.haml         |  2 +-
 3 files changed, 6 insertions(+), 25 deletions(-)

(limited to 'app/views')

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 672dad4377e..2e572aaba79 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,5 +1,5 @@
 .admin_dash.row
-  .span3
+  .span4
     .ui-box
       %h5.title Projects
       .data.padded
@@ -7,7 +7,7 @@
           %h1= Project.count
         %hr
         = link_to 'New Project', new_project_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Groups
       .data.padded
@@ -15,7 +15,7 @@
           %h1= Group.count
         %hr
         = link_to 'New Group', new_admin_group_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Users
       .data.padded
@@ -23,25 +23,6 @@
           %h1= User.count
         %hr
         = link_to 'New User', new_admin_user_path, class: "btn small"
-  .span3
-    .ui-box
-      %h5.title
-        Resque Workers
-      .data.padded
-        - if @resque_accessible
-          = link_to admin_resque_path do
-            %h1{class: @workers.present? ? "cgreen" : "cred"}
-              = @workers.count
-          %hr
-          %p
-            %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
-              #{@pending_jobs} post receive jobs waiting
-        - else
-          = link_to admin_resque_path do
-            %h1.cdark ?
-          %hr
-          %p
-            %strong Resque status unknown
 
 .row
   .span6
diff --git a/app/views/admin/resque/show.html.haml b/app/views/admin/resque/show.html.haml
index 41254a6b6c2..499738f9a06 100644
--- a/app/views/admin/resque/show.html.haml
+++ b/app/views/admin/resque/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Resque
+%h3.page_title Background Jobs
 %br
 .ui-box
-  %iframe{src: resque_path, width: '100%', height: 600, style: "border: none"}
+  %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 6b643ec8ccb..a60e7febe76 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -19,6 +19,6 @@
         = nav_link(controller: :hooks) do
           = link_to "Hooks", admin_hooks_path
         = nav_link(controller: :resque) do
-          = link_to "Resque", admin_resque_path
+          = link_to "Background Jobs", admin_resque_path
 
       .content= yield
-- 
cgit v1.2.3