Merge pull request #921 from HenryVolkmer/920-configurable-toolbarcon…

…tainer Make the css class of Toolbarcontainer configurable fix #746 fix #920
kartik-v · Aug 23, 2019 · 48c2027 · 48c2027
2 parents 9cdf9c2 + 48ca205
commit 48c2027
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/GridView.php b/src/GridView.php
@@ -2084,7 +2084,18 @@ protected function renderToolbar()
     protected function renderToolbarContainer()
     {
         $tag = ArrayHelper::remove($this->toolbarContainerOptions, 'tag', 'div');
-        $this->addCssClass($this->toolbarContainerOptions, self::BS_PULL_RIGHT);
+
+        /**
+         * allow to override the float declaration:
+         * forcing float-right only if no float is defined in toolbarContainerOptions
+         */
+        if (
+            !strpos($this->toolbarContainerOptions['class'],$this->getCssClass(self::BS_PULL_RIGHT))
+            && !strpos($this->toolbarContainerOptions['class'],$this->getCssClass(self::BS_PULL_LEFT))
+        ) {
+            $this->addCssClass($this->toolbarContainerOptions, self::BS_PULL_RIGHT);
+        }
+
         return Html::tag($tag, $this->renderToolbar(), $this->toolbarContainerOptions);
     }