sidekiq-cron 1.12.0 → 2.1.0

data/lib/sidekiq/cron/launcher.rb

@@ -1,21 +1,18 @@
-require 'sidekiq/cron/poller'
-
 # For Cron we need to add some methods to Launcher
-# so look at the code bellow.
+# so look at the code below.
 #
 # We are creating new cron poller instance and
 # adding start and stop commands to launcher.
 module Sidekiq
   module Cron
     module Launcher
-      DEFAULT_POLL_INTERVAL = 30
 
       # Add cron poller to launcher.
       attr_reader :cron_poller
 
       # Add cron poller and execute normal initialize of Sidekiq launcher.
       def initialize(config, **kwargs)
-        config[:cron_poll_interval] = DEFAULT_POLL_INTERVAL if config[:cron_poll_interval].nil?
+        config[:cron_poll_interval] = Sidekiq::Cron.configuration.cron_poll_interval.to_i
 
         @cron_poller = Sidekiq::Cron::Poller.new(config) if config[:cron_poll_interval] > 0
         super

data/lib/sidekiq/cron/locales/de.yml

@@ -1,13 +1,22 @@
 de:
-  Job: Job
+  AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
+  AreYouSureDeleteCronJobs: Sind Sie sicher, dass Sie ALLE Cron-Jobs löschen möchten?
+  AreYouSureEnqueueCronJob: Sind Sie sicher, dass Sie den %{job} Cron-Job einreihen möchten?
+  AreYouSureEnqueueCronJobs: Sind Sie sicher, dass Sie ALLE Cron-Jobs einreihen möchten?
   Cron: Cron
   CronJobs: Cronjobs
+  CronString: Cron
+  DeleteAll: Alle löschen
+  Description: Beschreibung
+  Disable: Deaktivieren
+  DisableAll: Alle deaktivieren
+  Enable: Aktivieren
+  EnableAll: Alle aktivieren
+  EnqueueAll: Alle einreihen
   EnqueueNow: In Warteschlange
-  'Cron string': Cron
-  AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
+  Job: Job
+  LastEnqueued: Eingereiht
   NoCronJobsWereFound: Keine Cronjobs gefunden
-  Enable: Aktivieren
-  Disable: Deaktivieren
-  'Last enqueued': Eingereiht
+  NoHistoryWereFound: Keine Historie gefunden
   disabled: deaktiviert
   enabled: aktiviert

data/lib/sidekiq/cron/locales/en.yml

@@ -1,22 +1,22 @@
 en:
-  Job: Job
+  AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
+  AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
+  AreYouSureEnqueueCronJob: Are you sure you want to enqueue the %{job} cron job?
+  AreYouSureEnqueueCronJobs: Are you sure you want to enqueue ALL cron jobs?
   Cron: Cron
   CronJobs: Cron Jobs
-  EnqueueNow: Enqueue Now
-  EnableAll: Enable All
+  CronString: Cron
+  DeleteAll: Delete All
+  Description: Description
+  Disable: Disable
   DisableAll: Disable All
+  Enable: Enable
+  EnableAll: Enable All
   EnqueueAll: Enqueue All
-  DeleteAll: Delete All
-  'Cron string': Cron
-  AreYouSureEnqueueCronJobs: Are you sure you want to enqueue ALL cron jobs?
-  AreYouSureEnqueueCronJob: Are you sure you want to enqueue the %{job} cron job?
-  AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
-  AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
+  EnqueueNow: Enqueue Now
+  Job: Job
+  LastEnqueued: Last enqueued
   NoCronJobsWereFound: No cron jobs were found
-  Enable: Enable
-  Disable: Disable
-  'Last enqueued': Last enqueued
+  NoHistoryWereFound: No history were found
   disabled: disabled
   enabled: enabled
-  NoHistoryWereFound: No history were found
-  Description: Description

data/lib/sidekiq/cron/locales/es.yml

@@ -0,0 +1,22 @@
+es:
+  AreYouSureDeleteCronJob: ¿Estás seguro de que quieres borrar el trabajo cron %{job}?
+  AreYouSureDeleteCronJobs: ¿Estás seguro de que quieres borrar TODOS los trabajos cron?
+  AreYouSureEnqueueCronJob: ¿Estás seguro de que quieres poner en cola el trabajo cron %{job}?
+  AreYouSureEnqueueCronJobs: ¿Estás seguro de que quieres poner en cola TODOS los trabajos cron?
+  Cron: Cron
+  CronJobs: Trabajos cron programados
+  CronString: Cron
+  DeleteAll: Borrar todo
+  Description: Descripción
+  Disable: Desactivar
+  DisableAll: Desactivar todos
+  Enable: Activar
+  EnableAll: Activar todos
+  EnqueueAll: Poner todos en cola
+  EnqueueNow: Poner en cola ahora
+  Job: Trabajo
+  LastEnqueued: Último trabajo en cola
+  NoCronJobsWereFound: No se encontraron trabajos
+  NoHistoryWereFound: No se encontró histórico de trabajos
+  disabled: activo
+  enabled: inactivo

data/lib/sidekiq/cron/locales/id.yml

@@ -0,0 +1,22 @@
+id:
+  AreYouSureDeleteCronJob: Apakah Anda yakin ingin menghapus cron job %{job}?
+  AreYouSureDeleteCronJobs: Apakah Anda yakin ingin menghapus SEMUA cron job?
+  AreYouSureEnqueueCronJob: Apakah Anda yakin ingin menambahkan cron job %{job} ke antrian?
+  AreYouSureEnqueueCronJobs: Apakah Anda yakin ingin menambahkan SEMUA cron job ke antrian?
+  Cron: Cron
+  CronJobs: Cron Jobs
+  CronString: Cron
+  DeleteAll: Hapus Semua
+  Description: Deskripsi
+  Disable: Nonaktifkan
+  DisableAll: Nonaktifkan Semua
+  Enable: Aktifkan
+  EnableAll: Aktifkan Semua
+  EnqueueAll: Tambahkan Semua ke Antrian
+  EnqueueNow: Tambahkan ke Antrian Sekarang
+  Job: Job
+  LastEnqueued: Terakhir kali ditambahkan ke antrian
+  NoCronJobsWereFound: Tidak ada cron job
+  NoHistoryWereFound: Tidak ada riwayat
+  disabled: dinonaktifkan
+  enabled: diaktifkan

data/lib/sidekiq/cron/locales/it.yml

@@ -1,23 +1,22 @@
 it:
-  Job: Job
+  AreYouSureDeleteCronJob: Vuoi cancellare il cron job '%{job}'?
+  AreYouSureDeleteCronJobs: Vuoi cancellare TUTTI i cron job?
+  AreYouSureEnqueueCronJob: Vuoi accodare il cron job '%{job}'?
+  AreYouSureEnqueueCronJobs: Vuoi accodare TUTTI i cron job?
   Cron: Cron
-  CronJobs: Cron job
-  EnqueueNow: Accoda
-  EnableAll: Attiva tutto
+  CronJobs: Cron Jobs
+  CronString: Cron
+  DeleteAll: Cancella tutto
+  Description: Descrizione
+  Disable: Disattiva
   DisableAll: Disattiva tutto
+  Enable: Attiva
+  EnableAll: Attiva tutto
   EnqueueAll: Accoda tutto
-  DeleteAll: Cancella tutto
-  "Cron string": Cron
-  AreYouSureEnqueueCronJobs: Vuoi accodare TUTTI i cron job?
-  AreYouSureEnqueueCronJob: "Vuoi accodare il cron job '%{job}'?"
-  AreYouSureDeleteCronJobs: Vuoi cancellare TUTTI i cron job?
-  AreYouSureDeleteCronJob: "Vuoi cancellare il cron job '%{job}'?"
+  EnqueueNow: Accoda
+  Job: Job
+  LastEnqueued: Ultimo accodamento
   NoCronJobsWereFound: Nessun cron job trovato
-  Enable: Attiva
-  Disable: Disattiva
-  "Last enqueued": Ultimo accodamento
+  NoHistoryWereFound: Nessun evento in cronologia
   disabled: disattivato
   enabled: attivato
-  NoHistoryWereFound: Nessun evento in cronologia
-  Description: Descrizione
-  Message: Payload

data/lib/sidekiq/cron/locales/ja.yml

@@ -1,18 +1,22 @@
 ja:
-  Job: ジョブ
+  AreYouSureDeleteCronJob: "本当に%{job}のcronジョブを削除しますか？"
+  AreYouSureDeleteCronJobs: "本当にすべてのcronジョブを削除しますか？"
+  AreYouSureEnqueueCronJob: "%{job} の cronジョブをキューに入れてもよろしいですか？"
+  AreYouSureEnqueueCronJobs: "すべての cronジョブをキューに入れてもよろしいですか？"
   Cron: Cron
   CronJobs: Cronジョブ
-  EnqueueNow: すぐにキューに入れる
-  EnableAll: すべて有効にする
+  CronString: Cron
+  DeleteAll: すべて削除
+  Description: 説明
+  Disable: 無効にする
   DisableAll: すべて無効にする
+  Enable: 有効にする
+  EnableAll: すべて有効にする
   EnqueueAll: すべてキューに入れる
-  DeleteAll: すべて削除
-  'Cron string': Cron
-  AreYouSureDeleteCronJobs: 本当にすべてのcronジョブを削除しますか？
-  AreYouSureDeleteCronJob: 本当に%{job}のcronジョブを削除しますか？
+  EnqueueNow: すぐにキューに入れる
+  Job: ジョブ
+  LastEnqueued: 最後のキュー
   NoCronJobsWereFound: Cronジョブが見つかりませんでした
-  Enable: 有効にする
-  Disable: 無効にする
-  'Last enqueued': 最後のキュー
+  NoHistoryWereFound: 履歴が見つかりませんでした
   disabled: 無効
   enabled: 有効

data/lib/sidekiq/cron/locales/pt.yml

@@ -1,22 +1,22 @@
 pt:
-  Job: Tarefa
+  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
+  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
+  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
   Cron: Cron
   CronJobs: Tarefas do Cron
-  EnqueueNow: Enfileirar agora
-  EnableAll: Habilitar todos
+  CronString: Cron
+  DeleteAll: Excluir todos
+  Description: Descrição
+  Disable: Desabilitar
   DisableAll: Desabilitar todos
+  Enable: Habilitar
+  EnableAll: Habilitar todos
   EnqueueAll: Enfileirar todos
-  DeleteAll: Excluir todos
-  'Cron string': Cron
-  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
-  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
-  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
-  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  EnqueueNow: Enfileirar agora
+  Job: Tarefa
+  LastEnqueued: Último enfileirado
   NoCronJobsWereFound: Nenhuma tarefa foi encontrada
-  Enable: Habilitar
-  Disable: Desabilitar
-  'Last enqueued': Último enfileirado
+  NoHistoryWereFound: Nenhum histórico foi encontrado
   disabled: desabilitado
   enabled: habilitado
-  NoHistoryWereFound: Nenhum histórico foi encontrado
-  Description: Descrição

data/lib/sidekiq/cron/locales/ru.yml

@@ -1,14 +1,22 @@
 ru:
-  Job: Задача
+  AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
+  AreYouSureDeleteCronJobs: Вы уверены, что хотите удалить ВСЕ cron-задачи?
+  AreYouSureEnqueueCronJob: Вы уверены, что хотите добавить в очередь cron-задачу %{job}?
+  AreYouSureEnqueueCronJobs: Вы уверены, что хотите добавить в очередь ВСЕ cron-задачи?
   Cron: Cron
   CronJobs: Периодические задачи
-  Name: Название
-  'Cron string': Периодичность (синтаксис Cron)
+  CronString: Периодичность (синтаксис Cron)
+  DeleteAll: Удалить все
+  Description: Описание
+  Disable: Отключить
+  DisableAll: Отключить все
+  Enable: Включить
+  EnableAll: Включить все
+  EnqueueAll: Добавить все в очередь
   EnqueueNow: Запустить
-  AreYouSureDeleteCronJob: Вы действительно хотите удалить задачу «%{job}»?
+  Job: Задача
+  LastEnqueued: Последний запуск
   NoCronJobsWereFound: Не найдено периодических задач
-  Enable: Включить
-  Disable: Отключить
-  'Last enqueued': Последний запуск
+  NoHistoryWereFound: История не найдена
   disabled: отключено
   enabled: включено

data/lib/sidekiq/cron/locales/zh-CN.yml

@@ -1,19 +1,22 @@
 zh-CN:
-  Job: 任务
+  AreYouSureDeleteCronJob: 你确定删除定时任务（%{job}）吗？
+  AreYouSureDeleteCronJobs: 你确定删除所有的定时任务吗？
+  AreYouSureEnqueueCronJob: 您确定要将 %{job} 的 定时任务 任务加入队列吗？
+  AreYouSureEnqueueCronJobs: 您确定要将所有 定时任务 任务加入队列吗？
   Cron: 定时任务
   CronJobs: 定时任务列表
-  EnqueueNow: 立刻执行
-  EnableAll: 启用所有
+  CronString: 定时策略
+  DeleteAll: 删除所有
+  Description: 描述
+  Disable: 禁用
   DisableAll: 禁用所有
+  Enable: 启用
+  EnableAll: 启用所有
   EnqueueAll: 执行所有
-  DeleteAll: 删除所有
-  'Cron string': 定时策略
-  AreYouSureDeleteCronJobs: 你确定删除所有的定时任务吗？
-  AreYouSureDeleteCronJob: 你确定删除定时任务（%{job}）吗？
+  EnqueueNow: 立刻执行
+  Job: 任务
+  LastEnqueued: 放入队列时间
   NoCronJobsWereFound: 没有定时任务
-  Enable: 启用
-  Disable: 禁用
-  'Last enqueued': 放入队列时间
+  NoHistoryWereFound: 未找到历史记录
   disabled: 已禁用
   enabled: 已启用
-

data/lib/sidekiq/cron/namespace.rb

@@ -0,0 +1,48 @@
+module Sidekiq
+  module Cron
+    class Namespace
+      def self.all
+        namespaces = Sidekiq::Cron.configuration.available_namespaces
+        return namespaces if namespaces
+
+        Sidekiq.redis do |conn|
+          namespaces = conn.keys('cron_jobs:*').collect do |key|
+            key.split(':').last
+          end
+        end
+
+        # Adds the default namespace if not present
+        has_default = namespaces.detect do |name|
+          name == Sidekiq::Cron.configuration.default_namespace
+        end
+
+        unless has_default
+          namespaces << Sidekiq::Cron.configuration.default_namespace
+        end
+
+        namespaces
+      end
+
+      def self.all_with_count
+        all.map do |namespace_name|
+          {
+            count: count(namespace_name),
+            name: namespace_name
+          }
+        end
+      end
+
+      def self.count(name = Sidekiq::Cron.configuration.default_namespace)
+        out = 0
+        Sidekiq.redis do |conn|
+          out = conn.scard("cron_jobs:#{name}")
+        end
+        out
+      end
+
+      def self.available_namespaces_provided?
+        !!Sidekiq::Cron.configuration.available_namespaces
+      end
+    end
+  end
+end

data/lib/sidekiq/cron/poller.rb

@@ -1,25 +1,24 @@
-require 'sidekiq'
-require 'sidekiq/cron'
+# frozen_string_literal: true
+
 require 'sidekiq/scheduled'
-require 'sidekiq/options'
 
 module Sidekiq
   module Cron
-    # The Poller checks Redis every N seconds for sheduled cron jobs.
+    # The Poller checks Redis every N seconds for scheduled cron jobs.
     class Poller < Sidekiq::Scheduled::Poller
       def initialize(config = nil)
-        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
-          super
-        else
-          # Old version of Sidekiq does not accept a config argument.
-          @config = config
-          super()
-        end
+        super
+      end
+
+      def start
+        Sidekiq::Cron::Job.migrate_old_jobs_if_needed!
+
+        super
       end
 
       def enqueue
         time = Time.now.utc
-        Sidekiq::Cron::Job.all.each do |job|
+        Sidekiq::Cron::Job.all('*').each do |job|
           enqueue_job(job, time)
         end
       rescue => ex
@@ -33,7 +32,7 @@ module Sidekiq
       private
 
       def enqueue_job(job, time = Time.now.utc)
-        job.test_and_enque_for_time! time if job && job.valid?
+        job.test_and_enqueue_for_time! time if job && job.valid?
       rescue => ex
         # Problem somewhere in one job.
         Sidekiq.logger.error "CRON JOB: #{ex.message}"

data/lib/sidekiq/cron/schedule_loader.rb

@@ -1,9 +1,5 @@
-require 'sidekiq'
-require 'sidekiq/cron/job'
-require 'sidekiq/options'
-
 Sidekiq.configure_server do |config|
-  schedule_file = Sidekiq::Options[:cron_schedule_file] || 'config/schedule.yml'
+  schedule_file = Sidekiq::Cron.configuration.cron_schedule_file
 
   if File.exist?(schedule_file)
     config.on(:startup) do

data/lib/sidekiq/cron/support.rb

@@ -1,8 +1,7 @@
-# https://github.com/rails/rails/blob/352865d0f835c24daa9a2e9863dcc9dde9e5371a/activesupport/lib/active_support/inflector/methods.rb#L270
-
 module Sidekiq
   module Cron
     module Support
+      # Inspired by Active Support Inflector
       def self.constantize(camel_cased_word)
         names = camel_cased_word.split("::".freeze)
 

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "1.12.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/sidekiq/cron/views/cron.erb

@@ -1,90 +1,105 @@
 <header class='row'>
   <div class='col-sm-5 pull-left'>
-    <h3><%= t('CronJobs') %></h3>
+    <h3>
+      <%= t('CronJobs') %>
+      <small><%= @current_namespace %></small>
+    </h3>
   </div>
-  <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
+  <div class='col-sm-7 pull-right h2'>
     <% if @cron_jobs.size > 0 %>
-      <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/delete" method="post" class="pull-right">
+        <%= csrf_tag %>
         <input class="btn btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('DisableAll') %>" />
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/disable" method="post" class="pull-right">
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('DisableAll') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnableAll') %>" />
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enable" method="post" class="pull-right">
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnableAll') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enqueue" method="post" class="pull-right">
+        <%= csrf_tag %>
+        <input class="btn btn-warn" type="submit" name="enqueue" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
       </form>
     <% end %>
   </div>
 </header>
 
-<% if @cron_jobs.size > 0 %>
+<!-- Namespaces -->
+<div class='row'>
+  <div class="col-sm-12 summary_bar">
+    <ul class="list-unstyled summary row">
+      <% Sidekiq::Cron::Namespace.all_with_count.sort_by { |namespace| namespace[:name] }.each do |namespace| %>
+        <li class="col-sm-1">
+          <a href="<%= root_path %>cron/namespaces/<%= namespace[:name] %>">
+            <span class="count"><%= namespace[:count] %></span>
+            <span class="desc"><%= namespace[:name] %></span>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
+<!-- Namespaces -->
 
+<% if @cron_jobs.size > 0 %>
   <table class="table table-hover table-bordered table-striped table-white">
     <thead>
+    <tr>
       <th><%= t('Status') %></th>
-      <th><%= t('Name') %></th>
-      <th><%= t('Cron string') %></th>
-      <th><%= t('Last enqueued') %></th>
-      <th width="180"><%= t('Actions')%></th>
+      <th width="50%"><%= t('Name') %></th>
+      <th><%= t('CronString') %></th>
+      <th><%= t('LastEnqueued') %></th>
+      <th width="180"><%= t('Actions') %></th>
+    </tr>
     </thead>
 
     <tbody>
-      <% @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index| %>
-        <% style = "#{job.status == 'disabled' ? "background: #ecc; color: #585454;": ""}" %>
+      <% @cron_jobs.sort{ |a,b| a.sort_name <=> b.sort_name }.each do |job| %>
+        <% klass = (job.status == 'disabled') ? 'bg-danger text-muted' : '' %>
+        <% escaped_job_name = CGI.escape(job.name).gsub('+', '%20') %>
         <tr>
-          <td style="<%= style %>"><%= t job.status %></td>
-          <td style="<%= style %>">
-            <a href="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>">
-              <b style="<%= style %>"><%= job.name %></b>
+          <td class="<%= klass %>"><%= t job.status %></td>
+          <td class="<%= klass %>">
+            <a href="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>" title="<%= job.description %>">
+              <b class="<%= klass %>"><%= job.name %></b>
             </a>
-            <hr style="margin:3px;border:0;">
-            <small>
+            <br/>
             <% if job.message and job.message.to_s.size > 100 %>
-              <% if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.3.0") %>
-                <button data-toggle="job_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle" id="job_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle" id="job_<%= index %>_full" style="display: none;"><%= job.message %></div>
-              <% else %>
-                <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle worker_<%= index %>" style="display: none;"><%= job.message %></div>
-              <% end %>
+              <details>
+                <summary class="btn btn-warn btn-xs">Show message</summary>
+                <p><small><%= job.message %></small></p>
+              </details>
             <% else %>
-              <%= job.message %>
+              <small><%= job.message %></small>
             <% end %>
-            </small>
           </td>
-          <td style="<%= style %>"><b><%= job.cron.gsub(" ", "&nbsp;") %></b></td>
-          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
-          <td style="<%= style %>">
+          <td class="<%= klass %>"><b><%= job.human_cron %><br/><small><%= job.cron.gsub(" ", "&nbsp;") %></small></b></td>
+          <td class="<%= klass %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
+          <td class="<%= klass %>">
             <% if job.status == 'enabled' %>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enqueue" method="post">
+                <%= csrf_tag %>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enqueue" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/disable" method="post">
+                <%= csrf_tag %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
               </form>
             <% else %>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enqueue" method="post">
+                <%= csrf_tag %>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enqueue" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enable" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enable" method="post">
+                <%= csrf_tag %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/delete" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs btn-danger pull-left' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/delete" method="post">
+                <%= csrf_tag %>
+                <input class='btn btn-xs btn-danger pull-left help-block' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
               </form>
             <% end %>
           </td>