Merge branch 'widget_orbit_slider' into dev

This commit is contained in:
Michal Kváček
2016-04-02 19:20:19 +02:00
2 changed files with 8 additions and 8 deletions
@@ -31,7 +31,7 @@
@lang('widgets/orbitSlider.description') @lang('widgets/orbitSlider.description')
<input type="text" name="description" placeholder="@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')) @if (isset($errors) && $errors->has('description'))
<div class="callout alert"> <div class="callout alert">
@@ -76,7 +76,7 @@
@lang('widgets/orbitSlider.containerClass') @lang('widgets/orbitSlider.containerClass')
<input type="text" name="containerClass" placeholder="@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')) @if (isset($errors) && $errors->has('containerClass'))
<div class="callout alert"> <div class="callout alert">
@@ -101,7 +101,7 @@
<label> <label>
@lang('widgets/orbitSlider.code') @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')) @if (isset($errors) && $errors->has('code'))
<div class="callout alert"> <div class="callout alert">
@@ -1,14 +1,14 @@
@if (!empty($images)) @if (!empty($images))
<div class="orbit {{$settings->sliderClass}}" role="region" data-orbit> <div class="orbit {{$settings->sliderClass}}" role="region" data-orbit>
<ul class="orbit-container"> <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> <span class="show-for-sr">Previous Slide</span>
<i class="fa fa-fw fa-2x fa-chevron-left"></i> <i class="fa fa-fw fa-2x fa-chevron-left"></i>
</p> </button>
<p class="orbit-next" aria-label="next"> <button class="orbit-next" aria-label="next">
<span class="show-for-sr">Next Slide</span> <span class="show-for-sr">Next Slide</span>
<i class="fa fa-fw fa-2x fa-chevron-right"></i> <i class="fa fa-fw fa-2x fa-chevron-right"></i>
</p> </button>
@if ($settings->imagePerSlide == 'fullscreen') @if ($settings->imagePerSlide == 'fullscreen')
@foreach($images as $i => $image) @foreach($images as $i => $image)
@@ -45,4 +45,4 @@
{!! $settings->code !!} {!! $settings->code !!}
</div> </div>
@endif @endif