Merge pull request #12 from silverleague/bugfix/bootstrap-button-and-…

…pagination FIX Bootstrap style for clear all button, and add paginator for LogViewerAdmin
silverleague · Jan 20, 2017 · caf2b31 · caf2b31
2 parents e8c0870 + b47f286
commit caf2b31
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/Admin/LogViewerAdmin.php b/src/Admin/LogViewerAdmin.php
@@ -6,6 +6,7 @@
 use SilverLeague\LogViewer\Forms\GridField\GridFieldClearAllButton;
 use SilverStripe\Admin\ModelAdmin;
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
+use SilverStripe\Forms\GridField\GridFieldPaginator;
 use SilverStripe\View\Requirements;
 
 /**
@@ -65,6 +66,7 @@ public function getEditForm($id = null, $fields = null)
         $config = $gridField->getConfig();
         $config->removeComponentsByType($config->getComponentByType(GridFieldAddNewButton::class));
         $config->addComponent(new GridFieldClearAllButton('buttons-before-left'));
+        $config->addComponent(new GridFieldPaginator);
 
         return $form;
     }

diff --git a/src/Forms/GridField/GridFieldClearAllButton.php b/src/Forms/GridField/GridFieldClearAllButton.php
@@ -41,10 +41,12 @@ public function getHTMLFragments($gridField)
     {
         $button = GridField_FormAction::create($gridField, 'clear', 'Clear all', 'clear', null);
         $button->setAttribute('data-icon', 'clear-all-logs');
-        $button->addExtraClass('font-icon-trash-bin action_clear action action-delete');
+        $button->addExtraClass('font-icon-trash-bin action_clear action action-delete btn btn-secondary');
         $button->setForm($gridField->getForm());
 
-        return [$this->targetFragment => '<p class="grid-clear-all-button">' . $button->Field() . '</p>'];
+        return [
+            $this->targetFragment => '<p class="grid-clear-all-button grid-print-button">' . $button->Field() . '</p>'
+        ];
     }
 
     /**

diff --git a/tests/Admin/LogViewerAdminTest.php b/tests/Admin/LogViewerAdminTest.php
@@ -6,6 +6,7 @@
 use SilverLeague\LogViewer\Forms\GridField\GridFieldClearAllButton;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Forms\GridField\GridFieldAddNewButton;
+use SilverStripe\Forms\GridField\GridFieldPaginator;
 use SilverStripe\Forms\ReadonlyField;
 
 /**
@@ -66,6 +67,17 @@ public function testHasClearAllButton()
         );
     }
 
+    /**
+     * Test that the GridField has a Paginator component
+     */
+    public function testHasPagination()
+    {
+        $this->assertInstanceOf(
+            GridFieldPaginator::class,
+            $this->getConfig()->getComponentByType(GridFieldPaginator::class)
+        );
+    }
+
     /**
      * Test that the entry and level fields are displayed in the GridField, and can be exported
      */

diff --git a/tests/Forms/GridField/GridFieldClearAllButtonTest.php b/tests/Forms/GridField/GridFieldClearAllButtonTest.php
@@ -26,6 +26,9 @@ class GridFieldClearAllButtonTest extends SapphireTest
      */
     protected $usesDatabase = true;
 
+    /**
+     * @var GridField
+     */
     protected $gridField;
 
     /**
@@ -66,7 +69,7 @@ public function testGetHtmlFragments()
         $this->assertContains('Clear all', $fragments['before']);
         $this->assertContains('clear-all-logs', $fragments['before']);
         $this->assertContains('font-icon-trash-bin action_clear', $fragments['before']);
-        $this->assertContains('<p class="grid-clear-all-button">', $fragments['before']);
+        $this->assertContains('<p class="grid-clear-all-button grid-print-button">', $fragments['before']);
     }
 
     /**