Merge remote-tracking branch 'origin/development'

LaravelRUS · May 21, 2018 · 7289162 · 7289162
2 parents 5db8f63 + 41f2d52
commit 7289162
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 9 deletions.
diff --git a/resources/views/default/form/element/wysiwyg.blade.php b/resources/views/default/form/element/wysiwyg.blade.php
@@ -18,4 +18,4 @@
     {!! Form::textarea($name, $value, $attributes) !!}
 
     @include(app('sleeping_owl.template')->getViewPath('form.element.partials.errors'))
-</div>
+</div>
diff --git a/src/Display/Extension/ColumnsTotal.php b/src/Display/Extension/ColumnsTotal.php
@@ -5,9 +5,9 @@
 use Illuminate\Support\Collection;
 use SleepingOwl\Admin\Display\Element;
 use KodiComponents\Support\HtmlAttributes;
+use SleepingOwl\Admin\Traits\ElementViewTrait;
 use SleepingOwl\Admin\Contracts\Display\Placable;
 use SleepingOwl\Admin\Traits\ElementPlacementTrait;
-use SleepingOwl\Admin\Traits\ElementViewTrait;
 
 class ColumnsTotal extends Extension implements Placable
 {
@@ -33,7 +33,6 @@ public function __construct()
         $this->elements = new Collection();
     }
 
-
     public function set(array $elements, $columnsNumber = 0)
     {
         array_map(function ($element) {

diff --git a/src/Form/FormPanel.php b/src/Form/FormPanel.php
@@ -93,7 +93,7 @@ public function addBody($items)
         }
 
         $class = $this->getElements()->last();
-        if (is_object($class) and get_class($class) === Body::class) {
+        if (is_object($class) && get_class($class) === Body::class) {
             $this->addElement(new Html('<hr />'));
         }
 

diff --git a/src/Navigation/Page.php b/src/Navigation/Page.php
@@ -131,7 +131,7 @@ public function getAccessLogic()
      */
     public function render($view = null)
     {
-        if ($this->hasChild() and ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
+        if ($this->hasChild() && ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
             $this->setHtmlAttribute('class', $class);
         }
 

diff --git a/src/Traits/ElementPlacementTrait.php b/src/Traits/ElementPlacementTrait.php
@@ -4,7 +4,6 @@
 
 trait ElementPlacementTrait
 {
-
     /**
      * @return string
      */
@@ -44,6 +43,4 @@ public function setPosition($position)
     {
         return $this->setPlacement($position);
     }
-
-
 }
diff --git a/src/Traits/ElementViewTrait.php b/src/Traits/ElementViewTrait.php
@@ -4,7 +4,6 @@
 
 trait ElementViewTrait
 {
-
     /**
      * @return string|\Illuminate\View\View
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ @@
         {!! Form::textarea($name, $value, $attributes) !!}
         @include(app('sleeping_owl.template')->getViewPath('form.element.partials.errors'))
-    </div>
+    </div>