diff --git a/templates/Admin/Queue/index.php b/templates/Admin/Queue/index.php index 175c9e66..38508aa0 100644 --- a/templates/Admin/Queue/index.php +++ b/templates/Admin/Queue/index.php @@ -188,38 +188,44 @@ Queue->hasFailed($pendingJob)): ?> - Form->postLink( + Form->postButton( '', ['action' => 'resetJob', $pendingJob->id], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-primary', - 'confirm' => __d('queue', 'Sure?'), 'title' => __d('queue', 'Reset'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> - Form->postLink( + Form->postButton( '', ['action' => 'removeJob', $pendingJob->id], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-danger', - 'confirm' => __d('queue', 'Sure?'), 'title' => __d('queue', 'Remove'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> fetched): ?> - Form->postLink( + Form->postButton( '', ['action' => 'removeJob', $pendingJob->id], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-danger', - 'confirm' => __d('queue', 'Sure?'), 'title' => __d('queue', 'Remove'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> @@ -276,15 +282,17 @@ - Form->postLink( + Form->postButton( '', ['action' => 'removeJob', $scheduledJob->id], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-danger', - 'confirm' => __d('queue', 'Sure?'), 'title' => __d('queue', 'Remove'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> @@ -365,15 +373,17 @@ } ?> - Form->postLink( + Form->postButton( '' . h($task), ['action' => 'addJob', '?' => ['task' => $task]], [ 'escapeTitle' => false, - 'class' => 'btn btn-outline-primary btn-sm text-start', - 'confirm' => __d('queue', 'Sure?'), + 'class' => 'btn btn-outline-primary btn-sm text-start w-100', 'title' => $description, - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> @@ -402,15 +412,17 @@ continue; } ?> - Form->postLink( + Form->postButton( '' . h($task), ['action' => 'addJob', '?' => ['task' => $task]], [ 'escapeTitle' => false, - 'class' => 'btn btn-outline-secondary btn-sm text-start', - 'confirm' => __d('queue', 'Sure?'), + 'class' => 'btn btn-outline-secondary btn-sm text-start w-100', 'title' => $description, - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> diff --git a/templates/Admin/Queue/processes.php b/templates/Admin/Queue/processes.php index ba35f196..fbde9411 100644 --- a/templates/Admin/Queue/processes.php +++ b/templates/Admin/Queue/processes.php @@ -55,28 +55,32 @@
- Form->postLink( + Form->postButton( '' . __d('queue', 'Finish & End'), ['action' => 'processes', '?' => ['end' => $process->pid]], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-warning', - 'confirm' => __d('queue', 'Sure?'), 'title' => __d('queue', 'Finish current job and end worker'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure?'), + ], ] ) ?> workerkey === $key || !$this->Configure->read('Queue.multiserver')): ?> - Form->postLink( + Form->postButton( '' . __d('queue', 'Kill'), ['action' => 'processes', '?' => ['kill' => $process->pid]], [ 'escapeTitle' => false, 'class' => 'btn btn-sm btn-outline-danger', - 'confirm' => __d('queue', 'Sure? This sends SIGTERM to the process.'), 'title' => __d('queue', 'Send SIGTERM to terminate immediately'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure? This sends SIGTERM to the process.'), + ], ] ) ?> diff --git a/templates/Admin/QueueProcesses/index.php b/templates/Admin/QueueProcesses/index.php index f958caf0..109f201f 100644 --- a/templates/Admin/QueueProcesses/index.php +++ b/templates/Admin/QueueProcesses/index.php @@ -19,14 +19,16 @@ ['controller' => 'Queue', 'action' => 'processes'], ['class' => 'btn btn-outline-primary btn-sm', 'escapeTitle' => false], ) ?> - Form->postLink( + Form->postButton( '' . __d('queue', 'Cleanup'), ['action' => 'cleanup'], [ 'class' => 'btn btn-outline-warning btn-sm', 'escapeTitle' => false, - 'confirm' => __d('queue', 'Sure to remove all outdated ones (>{0}s)?', Config::defaultworkertimeout() * 2), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Sure to remove all outdated ones (>{0}s)?', Config::defaultworkertimeout() * 2), + ], ], ) ?>
@@ -101,16 +103,18 @@ ], ) ?> terminate) : ?> - Form->postLink( + Form->postButton( '', ['action' => 'terminate', $queueProcess->id], [ 'escapeTitle' => false, 'class' => 'btn btn-outline-warning', - 'confirm' => __d('queue', 'Are you sure you want to terminate # {0}?', $queueProcess->id), 'title' => __d('queue', 'Terminate'), 'aria-label' => __d('queue', 'Terminate'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Are you sure you want to terminate # {0}?', $queueProcess->id), + ], ], ) ?> diff --git a/templates/Admin/QueueProcesses/view.php b/templates/Admin/QueueProcesses/view.php index 480da6ef..664126fd 100644 --- a/templates/Admin/QueueProcesses/view.php +++ b/templates/Admin/QueueProcesses/view.php @@ -80,25 +80,29 @@ ['class' => 'list-group-item list-group-item-action', 'escapeTitle' => false] ) ?> terminate): ?> - Form->postLink( + Form->postButton( '' . __d('queue', 'Terminate (Graceful)'), ['action' => 'terminate', $queueProcess->id], [ - 'class' => 'list-group-item list-group-item-action text-warning', + 'class' => 'list-group-item list-group-item-action text-warning btn btn-link text-start w-100', 'escapeTitle' => false, - 'confirm' => __d('queue', 'Are you sure you want to terminate # {0}?', $queueProcess->id), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Are you sure you want to terminate # {0}?', $queueProcess->id), + ], ] ) ?> - Form->postLink( + Form->postButton( '' . __d('queue', 'Delete (Force)'), ['action' => 'delete', $queueProcess->id], [ - 'class' => 'list-group-item list-group-item-action text-danger', + 'class' => 'list-group-item list-group-item-action text-danger btn btn-link text-start w-100', 'escapeTitle' => false, - 'confirm' => __d('queue', 'Are you sure you want to delete # {0}?', $queueProcess->id), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Are you sure you want to delete # {0}?', $queueProcess->id), + ], ] ) ?> diff --git a/templates/Admin/QueuedJobs/edit.php b/templates/Admin/QueuedJobs/edit.php index 6b5b090e..914bc025 100644 --- a/templates/Admin/QueuedJobs/edit.php +++ b/templates/Admin/QueuedJobs/edit.php @@ -42,14 +42,16 @@ ['action' => 'data', $queuedJob->id], ['class' => 'list-group-item list-group-item-action', 'escapeTitle' => false] ) ?> - Form->postLink( + Form->postButton( '' . __d('queue', 'Delete Job'), ['action' => 'delete', $queuedJob->id], [ - 'class' => 'list-group-item list-group-item-action text-danger', + 'class' => 'list-group-item list-group-item-action text-danger btn btn-link text-start w-100', 'escapeTitle' => false, - 'confirm' => __d('queue', 'Are you sure you want to delete # {0}?', $queuedJob->id), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Are you sure you want to delete # {0}?', $queuedJob->id), + ], ] ) ?> diff --git a/templates/Admin/QueuedJobs/index.php b/templates/Admin/QueuedJobs/index.php index 531a7c7d..bbc2df60 100644 --- a/templates/Admin/QueuedJobs/index.php +++ b/templates/Admin/QueuedJobs/index.php @@ -216,16 +216,18 @@ ] ) ?> - Form->postLink( + Form->postButton( '', ['action' => 'delete', $queuedJob->id], [ 'escapeTitle' => false, 'class' => 'btn btn-outline-danger', - 'confirm' => __d('queue', 'Are you sure you want to delete # {0}?', $queuedJob->id), 'title' => __d('queue', 'Delete'), 'aria-label' => __d('queue', 'Delete'), - 'block' => true, + 'form' => [ + 'class' => 'd-inline', + 'data-confirm-message' => __d('queue', 'Are you sure you want to delete # {0}?', $queuedJob->id), + ], ] ) ?> diff --git a/templates/Admin/QueuedJobs/stats.php b/templates/Admin/QueuedJobs/stats.php index fad8cd38..f14e2e77 100644 --- a/templates/Admin/QueuedJobs/stats.php +++ b/templates/Admin/QueuedJobs/stats.php @@ -110,7 +110,8 @@ ?> append('script'); ?> - -