Merge pull request #1018 from glebm/master

Resque Authentication + iFrame view

app/controllers/admin/resque_controller.rb

@@ -0,0 +1,5 @@
+class Admin::ResqueController < ApplicationController
+  layout 'admin'
+  def show
+  end
+end

app/views/admin/dashboard/index.html.haml

@@ -4,7 +4,7 @@
       %h5
         Resque Workers
       .data.padded
-        = link_to "/info/resque" do
+        = link_to admin_resque_path do
           %h1{:class => @workers.present? ? "cgreen" : "cred"}
             = @workers.count
         %hr

app/views/admin/resque/show.html.haml

@@ -0,0 +1,2 @@
+%h3 Resque
+%iframe{:src => "/info/resque", :width => 1168, :height => 600, :style => "border: none"}

app/views/layouts/admin.html.haml

@@ -6,10 +6,10 @@
     = render "layouts/head_panel", :title => "Admin area"
     .container
       %nav.main_menu
-        = link_to "Stats", admin_root_path, :class => "home #{controller.controller_name == "dashboard" ? "current" : nil}"
-        = link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
-        = link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
-        = link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
-        = link_to "Resque", "/info/resque"
+        = link_to "Stats", admin_root_path, :class => "home #{'current' if controller.controller_name == "dashboard"}"
+        = link_to "Projects", admin_projects_path, :class => ('current' if controller.controller_name == "projects")
+        = link_to "Users", admin_users_path, :class => ('current' if controller.controller_name == 'users')
+        = link_to "Emails", admin_emails_path, :class => ('current' if controller.controller_name == 'mailer')
+        = link_to "Resque", admin_resque_path, :class => ('current' if controller.controller_name == 'resque')
 
       .content= yield