Merge branch 'dev' into test.customwristbands.cz

app/Models/Content.php

@@ -30,6 +30,8 @@ class Content extends Model
         'status'
     ];
     protected $guarded = [];
+    protected $subpages = [];
+    protected $subpagesInit = false;
     const STATUS_DELETED = 'deleted';
     const STATUS_DRAFT = 'draft';
     const STATUS_PROTECTED = 'protected';
@@ -76,9 +78,14 @@ class Content extends Model
      */
     public function subpages()
     {
-        return $this->getPageQuery()
-                    ->where('parent_id', $this->id)
-                    ->get();
+        if (!$this->subpagesInit) {
+            $this->subpages = $this->getPageQuery()
+                                   ->where('parent_id', $this->id)
+                                   ->get();
+            $this->subpagesInit = true;
+        }
+
+        return $this->subpages;
     }
 
     /**

app/Models/Widget.php

@@ -10,9 +10,7 @@ use Illuminate\Support\Facades\Event;
  */
 class Widget extends Model
 {
-
     public $timestamps = true;
-
     protected $fillable = [
         'widget_type_handler',
         'user_id',
@@ -20,18 +18,24 @@ class Widget extends Model
         'settings',
         'description'
     ];
-
     protected $guarded = [];
 
     /**
      * Create new widget of given type
-     * 
+     *
      * @param WidgetType $widgetType
      * @param            $data
      *
      * @return Widget
      */
-    public function createNew(WidgetType $widgetType, $data) {
+    public function createNew(WidgetType $widgetType, $data)
+    {
+
+        // convert array or whatever into object
+        if (!is_object($data)) {
+            $data = (object)$data;
+        }
+
         // create new widget
         $widget = new Widget();
         $widget->widget_type_handler = $widgetType->handler;
@@ -53,6 +57,4 @@ class Widget extends Model
 
         return $widget;
     }
-
-        
 }

resources/views/admin/widgets/orbitSlider/form.blade.php

@@ -31,7 +31,7 @@
         @lang('widgets/orbitSlider.description')
 
         <input type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
-               value="{{$widget->description}}" />
+               value="{{old('description', $widget->description)}}" />
 
         @if (isset($errors) && $errors->has('description'))
             <div class="callout alert">
@@ -76,7 +76,7 @@
         @lang('widgets/orbitSlider.containerClass')
 
         <input type="text" name="containerClass" placeholder="@lang('widgets/orbitSlider.containerClass')"
-               value="{{old('sliderClass', $settings->sliderClass)}}" />
+               value="{{old('containerClass', $settings->sliderClass)}}" />
 
         @if (isset($errors) && $errors->has('containerClass'))
             <div class="callout alert">
@@ -101,7 +101,7 @@
     <label>
         @lang('widgets/orbitSlider.code')
 
-        <textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{$settings->code}}</textarea>
+        <textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{old('code', $settings->code)}}</textarea>
 
         @if (isset($errors) && $errors->has('code'))
             <div class="callout alert">

resources/views/widgets/orbitSlider/element.blade.php

@@ -1,14 +1,14 @@
 @if (!empty($images))
     <div class="orbit {{$settings->sliderClass}}" role="region" data-orbit>
         <ul class="orbit-container">
-            <p class="orbit-previous" aria-label="previous">
+            <button class="orbit-previous" aria-label="previous">
                 <span class="show-for-sr">Previous Slide</span>
                 <i class="fa fa-fw fa-2x fa-chevron-left"></i>
-            </p>
-            <p class="orbit-next" aria-label="next">
+            </button>
+            <button class="orbit-next" aria-label="next">
                 <span class="show-for-sr">Next Slide</span>
                 <i class="fa fa-fw fa-2x fa-chevron-right"></i>
-            </p>
+            </button>
 
             @if ($settings->imagePerSlide == 'fullscreen')
                 @foreach($images as $i => $image)
@@ -45,4 +45,4 @@
 
         {!! $settings->code !!}
     </div>
-@endif
+@endif