Display fixes related to bulk actions.

FriendsOfCake · May 11, 2016 · 36c84db · 36c84db
1 parent 2014b0f
commit 36c84db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git 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' => '<div class="col-sm-10"><select name="{{name}}"{{attrs}}>{{content}}</select>' . $submitButton . '</div>',
     ],
     '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
@@ -4,11 +4,9 @@ if (empty($bulkActions)) {
 }
 ?>
 <td class="bulk-action">
-    <?= $this->Form->input($primaryKey . '[' . $singularVar->id . ']', [
+    <?= $this->Form->checkbox($primaryKey . '[' . $singularVar->id . ']', [
         'id' => $primaryKey . '-' . $singularVar->id,
         'checked' => false,
-        'label' => '',
-        'type' => 'checkbox',
         'value' => $singularVar->id,
-    ]); ?>
+    ]) ?>
 </td>
diff --git 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)) {
 }
 ?>
 <th class="bulk-action">
-    <?= $this->Form->input($primaryKey . '[_all]', [
-        'checked' => false,
-        'div' => false,
-        'label' => '',
-        'type' => 'checkbox',
-    ]); ?>
+    <?= $this->Form->checkbox($primaryKey . '[_all]') ?>
 </th>