From 36c84dbdd123dba0273768601d7783a34a99aba9 Mon Sep 17 00:00:00 2001 From: ADmad Date: Wed, 11 May 2016 19:40:55 +0530 Subject: [PATCH] Display fixes related to bulk actions. --- src/Template/Element/index/bulk_actions/form_end.ctp | 7 +++---- src/Template/Element/index/bulk_actions/record.ctp | 6 ++---- src/Template/Element/index/bulk_actions/table.ctp | 7 +------ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/Template/Element/index/bulk_actions/form_end.ctp b/src/Template/Element/index/bulk_actions/form_end.ctp index 51f4cf33..64090c85 100644 --- a/src/Template/Element/index/bulk_actions/form_end.ctp +++ b/src/Template/Element/index/bulk_actions/form_end.ctp @@ -3,10 +3,8 @@ if (empty($bulkActions)) { return; } -$submitButton = $this->Form->input(__d('crud', 'Apply'), [ - 'label' => false, - 'type' => 'submit', - 'class' => 'btn btn-success btn-bulk-apply form-control', +$submitButton = $this->Form->button(__d('crud', 'Apply'), [ + 'class' => 'btn btn-primary btn-bulk-apply', 'name' => '_bulk', ]); @@ -22,6 +20,7 @@ echo $this->Form->input('action', [ 'select' => '
' . $submitButton . '
', ], 'type' => 'select', + 'class' => 'no-selectize' ]); echo $this->Form->end(); ?> diff --git a/src/Template/Element/index/bulk_actions/record.ctp b/src/Template/Element/index/bulk_actions/record.ctp index c0f0223e..55528dc6 100644 --- a/src/Template/Element/index/bulk_actions/record.ctp +++ b/src/Template/Element/index/bulk_actions/record.ctp @@ -4,11 +4,9 @@ if (empty($bulkActions)) { } ?> - Form->input($primaryKey . '[' . $singularVar->id . ']', [ + Form->checkbox($primaryKey . '[' . $singularVar->id . ']', [ 'id' => $primaryKey . '-' . $singularVar->id, 'checked' => false, - 'label' => '', - 'type' => 'checkbox', 'value' => $singularVar->id, - ]); ?> + ]) ?> diff --git a/src/Template/Element/index/bulk_actions/table.ctp b/src/Template/Element/index/bulk_actions/table.ctp index 9c31fa15..10c7c9ee 100644 --- a/src/Template/Element/index/bulk_actions/table.ctp +++ b/src/Template/Element/index/bulk_actions/table.ctp @@ -4,10 +4,5 @@ if (empty($bulkActions)) { } ?> - Form->input($primaryKey . '[_all]', [ - 'checked' => false, - 'div' => false, - 'label' => '', - 'type' => 'checkbox', - ]); ?> + Form->checkbox($primaryKey . '[_all]') ?>