FEATURE #1522: add orbit slider
Had to change some things in global widgets management and also in html code widget. Sorry for this ugly commit..
This commit is contained in:
@@ -38,9 +38,9 @@ class WidgetRegistrator
|
||||
'name' => $widgetName,
|
||||
'description' => $widgetDescription
|
||||
]);
|
||||
}
|
||||
|
||||
// install widget (if neccessary)
|
||||
call_user_func($classname . '::install');
|
||||
// install widget (if neccessary)
|
||||
call_user_func($classname . '::install');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ class EditUploadedFile extends Controller
|
||||
}
|
||||
|
||||
// set values from form
|
||||
$file->name = $request->name;
|
||||
$file->keywords = $request->keywords;
|
||||
$file->description = $request->description;
|
||||
$file->save();
|
||||
|
||||
@@ -12,12 +12,6 @@ class EditWidget extends Controller
|
||||
{
|
||||
$widget = Widget::findOrFail($id);
|
||||
|
||||
// decompose widget settings
|
||||
$settings = json_decode($widget->settings);
|
||||
|
||||
$widget->containerClass = $settings->containerClass;
|
||||
$widget->code = $settings->code;
|
||||
|
||||
$presenter = call_user_func([$widget->widget_type_handler, 'getPresenter']);
|
||||
|
||||
return call_user_func([$presenter, 'renderEditForm'], $widget);
|
||||
|
||||
+1
-1
@@ -104,7 +104,7 @@ class File extends Model
|
||||
$newFile->file_size = $file->getSize();
|
||||
|
||||
// save optional fields
|
||||
$optionalFields = ['description', 'keywords', 'directoryId'];
|
||||
$optionalFields = ['name', 'description', 'keywords', 'directoryId'];
|
||||
foreach ($optionalFields as $field) {
|
||||
if ($request->has($field)) {
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ use App\Handlers\Search\Presenters\AdminContent as AdminContentPresenter;
|
||||
use App\Handlers\Search\Presenters\AdminFiles;
|
||||
use App\Models\Template;
|
||||
use App\Widgets\HtmlCode\HtmlCode;
|
||||
use App\Widgets\OrbitSlider\OrbitSlider;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
@@ -83,6 +84,7 @@ class AppServiceProvider extends ServiceProvider
|
||||
|
||||
// register all available widgets
|
||||
$registrator->register(HtmlCode::class);
|
||||
$registrator->register(OrbitSlider::class);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
namespace App\Widgets\Exceptions;
|
||||
|
||||
use Exception;
|
||||
|
||||
class WidgetExistsException extends \Exception
|
||||
{
|
||||
public function __construct($message = "", $code = 0, Exception $previous = null)
|
||||
{
|
||||
$message = trans('admin/widgets.widgetExists', ['id' => $message]);
|
||||
|
||||
parent::__construct($message, $code, $previous);
|
||||
}
|
||||
}
|
||||
@@ -47,6 +47,7 @@ class HtmlCode implements WidgetRenderer
|
||||
*/
|
||||
public static function renderEditForm(Widget $widget)
|
||||
{
|
||||
return view('admin.widgets.htmlCode.edit', ['widget' => $widget]);
|
||||
$settings = json_decode($widget->settings);
|
||||
return view('admin.widgets.htmlCode.edit', ['widget' => $widget, 'settings' => $settings]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
<?php
|
||||
namespace App\Widgets\OrbitSlider;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
use App\Models\Directory;
|
||||
use App\Models\Widget;
|
||||
use App\Widgets\Contracts\PublicWidget;
|
||||
use App\Widgets\Contracts\WidgetRenderer;
|
||||
use App\Widgets\Exceptions\WidgetExistsException;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
class OrbitSlider implements PublicWidget
|
||||
{
|
||||
const DIRECTORY_NAME = 'orbit-slider-data';
|
||||
const CONFIG_FILENAME = 'orbit-slider-directory-id';
|
||||
|
||||
/**
|
||||
* Name getter
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getName()
|
||||
{
|
||||
return 'widgets/orbitSlider.widgetName';
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for description
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getDescription()
|
||||
{
|
||||
return 'widgets/orbitSlider.widgetDescription';
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Widget $widget
|
||||
* @param Request $request
|
||||
*
|
||||
* @throws WidgetExistsException
|
||||
*
|
||||
* @return Widget
|
||||
*/
|
||||
public static function save(Widget $widget, Request $request)
|
||||
{
|
||||
$settings = json_decode($widget->settings);
|
||||
$parentDirectoryId = Storage::get(self::CONFIG_FILENAME);
|
||||
$directoryId = isset($settings->directoryId) ? $settings->directoryId : null;
|
||||
$edit = false;
|
||||
|
||||
// check if directory does not exists
|
||||
$exists = Directory::where('name', $request->name)
|
||||
->where('parent_id', $parentDirectoryId);
|
||||
|
||||
if ($directoryId) {
|
||||
$edit = true;
|
||||
$exists = $exists->where('id', '!=', $directoryId);
|
||||
}
|
||||
|
||||
$exists = $exists->exists();
|
||||
|
||||
if ($exists) {
|
||||
throw new WidgetExistsException($request->name);
|
||||
}
|
||||
|
||||
$directory = new Directory;
|
||||
|
||||
if ($edit) {
|
||||
$directory = Directory::find($directoryId);
|
||||
}
|
||||
|
||||
// setup some information about directory
|
||||
$directory->user_id = Auth::user()->id;
|
||||
$directory->parent_id = $parentDirectoryId;
|
||||
$directory->name = $request->name;
|
||||
$directory->description = $request->description;
|
||||
$directory->save();
|
||||
|
||||
$settings = [
|
||||
'directoryId' => $directory->id,
|
||||
'sliderClass' => isset($request->containerClass) ? $request->containerClass : '',
|
||||
'code' => $request->code
|
||||
];
|
||||
|
||||
$widget->settings = json_encode($settings);
|
||||
|
||||
return $widget;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for presenter/renderer of this widget
|
||||
*
|
||||
* @return WidgetRenderer
|
||||
*/
|
||||
public static function getPresenter()
|
||||
{
|
||||
return Presenters\OrbitSlider::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function for installing given widget
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public static function install()
|
||||
{
|
||||
$directory = Directory::where('name', self::DIRECTORY_NAME)
|
||||
->first();
|
||||
|
||||
if (!count($directory)) {
|
||||
$directory = Directory::create([
|
||||
'name' => self::DIRECTORY_NAME,
|
||||
'hidden' => true
|
||||
]);
|
||||
}
|
||||
|
||||
Storage::put(self::CONFIG_FILENAME, $directory->id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function for uninstalling widget
|
||||
*/
|
||||
public static function uninstall()
|
||||
{
|
||||
// TODO: Implement uninstall() method.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
namespace App\Widgets\OrbitSlider\Presenters;
|
||||
|
||||
use App\Models\File;
|
||||
use App\Models\Widget;
|
||||
use App\Models\WidgetType;
|
||||
use App\Widgets\Contracts\WidgetRenderer;
|
||||
|
||||
class OrbitSlider implements WidgetRenderer
|
||||
{
|
||||
/**
|
||||
* Method used for displaying widget.
|
||||
*
|
||||
* This method renders some HTML code for displaying.
|
||||
*
|
||||
* @param object $settings
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public static function render($settings)
|
||||
{
|
||||
$directoryId = $settings->directoryId;
|
||||
|
||||
$images = File::where('directory_id', $directoryId)
|
||||
->where('mime_type', 'LIKE', 'image%')
|
||||
->get();
|
||||
|
||||
return view('widgets.orbitSlider.element', ['images' => $images, 'settings' => $settings]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display form for creating new instance of widget
|
||||
*
|
||||
* @param WidgetType $type
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public static function renderAddForm(WidgetType $type)
|
||||
{
|
||||
return view('admin.widgets.orbitSlider.new', ['type' => $type]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display form for editing already existing widget
|
||||
*
|
||||
* @param Widget $widget
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public static function renderEditForm(Widget $widget)
|
||||
{
|
||||
$settings = json_decode($widget->settings);
|
||||
|
||||
return view('admin.widgets.orbitSlider.edit', ['widget' => $widget, 'settings' => $settings]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class MakeUserIdNotMandatoryInDirectories extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('directories', function (Blueprint $table) {
|
||||
$table->integer('user_id', false)
|
||||
->nullable()
|
||||
->default(null)
|
||||
->change();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('directories', function (Blueprint $table) {
|
||||
$table->integer('user_id', false)
|
||||
->nullable(false)
|
||||
->change();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class AddNameForFiles extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('files', function (Blueprint $table) {
|
||||
$table->string('name')
|
||||
->after('file_size')
|
||||
->comment('Some human readable name of file. May be used in different ways');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('files', function (Blueprint $table) {
|
||||
$table->dropColumn('name');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ return [
|
||||
'noFileSpecified' => 'You have not specified any file for upload',
|
||||
'uploadSuccessfull' => 'Your file was successfully uploaded',
|
||||
'selectFile' => 'Select file for upload',
|
||||
'name' => 'Name',
|
||||
'keywords' => 'Keywords (comma separated)',
|
||||
'description' => 'File description',
|
||||
'noFiles' => 'No files were found. Try to upload some.',
|
||||
|
||||
@@ -21,5 +21,6 @@ return [
|
||||
'successfullyAssociated' => 'Association successfull',
|
||||
'associationDoesNotExists' => 'This association does not exist',
|
||||
'successfullyDeassociated' => 'Successfully removed from widget area',
|
||||
'widgetExists' => 'Widget :id already exists.'
|
||||
|
||||
];
|
||||
@@ -0,0 +1,15 @@
|
||||
<?php
|
||||
return [
|
||||
'widgetName' => 'Orbit slider',
|
||||
'widgetDescription' => 'Slider for images. Uses Foundation framework.',
|
||||
'name' => 'Slider name',
|
||||
'description' => 'Slider description',
|
||||
'containerClass' => 'Extra HTML class for slider',
|
||||
'createNew' => 'Create new',
|
||||
'new' => 'Create new orbit slider',
|
||||
'edit' => 'Edit slider :name',
|
||||
'editExisting' => 'Save',
|
||||
'preview' => 'Slider preview',
|
||||
'upload' => 'Add photos into slider',
|
||||
'code' => 'Some extra HTML/JS code for slider'
|
||||
];
|
||||
@@ -14,6 +14,18 @@
|
||||
<form method="POST" action="{{route('upload.postEdit', ['id' => $file->id])}}" enctype="multipart/form-data">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<label>
|
||||
@lang('admin/fileManager.name')
|
||||
|
||||
<input type="text" name="name" id="name" value="{{$file->name}}"/>
|
||||
|
||||
@if (isset($errors) && $errors->has('name'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('name') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('admin/fileManager.keywords')
|
||||
|
||||
|
||||
@@ -18,6 +18,19 @@
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('admin/fileManager.name')
|
||||
|
||||
<input type="text" name="name" id="name" value="{{old('name')}}"/>
|
||||
|
||||
@if (isset($errors) && $errors->has('name'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('name') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('admin/fileManager.keywords')
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
@lang('widgets/htmlCode.containerClass')
|
||||
|
||||
<input type="text" name="containerClass" placeholder="@lang('widgets/htmlCode.containerClass')"
|
||||
value="{{$widget->containerClass}}" />
|
||||
value="{{$settings->containerClass}}" />
|
||||
|
||||
@if (isset($errors) && $errors->has('containerClass'))
|
||||
<div class="callout alert">
|
||||
@@ -55,7 +55,7 @@
|
||||
<label>
|
||||
@lang('widgets/htmlCode.code')
|
||||
|
||||
<textarea rows="4" name="code" placeholder="@lang('widgets/htmlCode.code')">{{$widget->code}}</textarea>
|
||||
<textarea rows="4" name="code" placeholder="@lang('widgets/htmlCode.code')">{{$settings->code}}</textarea>
|
||||
|
||||
@if (isset($errors) && $errors->has('code'))
|
||||
<div class="callout alert">
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
@extends('admin.layout')
|
||||
|
||||
@section('pageName', @trans('widgets/orbitSlider.edit', ['name' => $widget->name]))
|
||||
|
||||
@section('content')
|
||||
<h1>@lang('widgets/orbitSlider.edit', ['name' => $widget->name])</h1>
|
||||
|
||||
<div class="row">
|
||||
<div class="column large-8">
|
||||
@include('admin.widgets.orbitSlider.editForm')
|
||||
|
||||
</div>
|
||||
<div class="column large-4">
|
||||
<h3>@lang('widgets/orbitSlider.preview')</h3>
|
||||
|
||||
@widgetPreview($widget)
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
@if (!isset($hideMessages))
|
||||
@if (session('success'))
|
||||
<div class="callout success">
|
||||
{{ session('success') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (session('error'))
|
||||
<div class="callout alert">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<form action="{{route('widgets.postEdit', ['id' => $widget->id])}}" method="POST">
|
||||
{!! csrf_field() !!}
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.name')
|
||||
|
||||
<input type="text" name="name" value="{{$widget->name}}" placeholder="@lang('widgets/orbitSlider.name')" />
|
||||
|
||||
@if (isset($errors) && $errors->has('name'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('name') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.description')
|
||||
|
||||
<input type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
|
||||
value="{{$widget->description}}" />
|
||||
|
||||
@if (isset($errors) && $errors->has('description'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('description') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.containerClass')
|
||||
|
||||
<input type="text" name="containerClass" placeholder="@lang('widgets/orbitSlider.containerClass')"
|
||||
value="{{$settings->sliderClass}}" />
|
||||
|
||||
@if (isset($errors) && $errors->has('containerClass'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('description') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.code')
|
||||
|
||||
<textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{$settings->code}}</textarea>
|
||||
|
||||
@if (isset($errors) && $errors->has('code'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('code') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<div class="row column text-center">
|
||||
<a href="{{route('upload.overview', ['id' => $settings->directoryId])}}"
|
||||
class="button expanded large success">@lang('widgets/orbitSlider.upload')</a>
|
||||
</div>
|
||||
|
||||
|
||||
<button type="submit" class="button success">@lang('widgets/orbitSlider.editExisting')</button>
|
||||
</form>
|
||||
@@ -0,0 +1,10 @@
|
||||
@extends('admin.layout')
|
||||
|
||||
@section('pageName', @trans('widgets/htmlCode.new'))
|
||||
|
||||
@section('content')
|
||||
<h1>@lang('widgets/orbitSlider.new')</h1>
|
||||
|
||||
@include('admin.widgets.orbitSlider.newForm')
|
||||
@stop
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
@if (!isset($hideMessages))
|
||||
@if (session('success'))
|
||||
<div class="callout success">
|
||||
{{ session('success') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (session('error'))
|
||||
<div class="callout alert">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<form action="{{route('widgets.postNew', ['type' => $type])}}" method="POST">
|
||||
{!! csrf_field() !!}
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.name')
|
||||
|
||||
<input type="text" name="name" value="{{old("name")}}" placeholder="@lang('widgets/orbitSlider.name')" />
|
||||
|
||||
@if (isset($errors) && $errors->has('name'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('name') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.description')
|
||||
|
||||
<input type="text" name="description" placeholder="@lang('widgets/orbitSlider.description')"
|
||||
value="{{old("description")}}" />
|
||||
|
||||
@if (isset($errors) && $errors->has('description'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('description') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.containerClass')
|
||||
|
||||
<input type="text" name="containerClass" placeholder="@lang('widgets/orbitSlider.containerClass')"
|
||||
value="{{old("containerClass")}}" />
|
||||
|
||||
@if (isset($errors) && $errors->has('containerClass'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('description') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
|
||||
<label>
|
||||
@lang('widgets/orbitSlider.code')
|
||||
|
||||
<textarea rows="4" name="code" placeholder="@lang('widgets/orbitSlider.code')">{{old('code')}}</textarea>
|
||||
|
||||
@if (isset($errors) && $errors->has('code'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('code') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
<button type="submit" class="button success">@lang('widgets/orbitSlider.createNew')</button>
|
||||
</form>
|
||||
@@ -0,0 +1,20 @@
|
||||
<div class="orbit header {{$settings->sliderClass}}" role="region" data-orbit>
|
||||
<ul class="orbit-container">
|
||||
<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></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></button>
|
||||
|
||||
@foreach($images as $i => $image)
|
||||
@include('widgets.orbitSlider.image', ['image' => $image, 'order' => $i])
|
||||
@endforeach
|
||||
</ul>
|
||||
<nav class="orbit-bullets">
|
||||
@foreach($images as $i => $image)
|
||||
<button @if($i == 0) class="is-active" @endif data-slide="{{$i}}"></button>
|
||||
|
||||
@endforeach
|
||||
</nav>
|
||||
|
||||
{!! $settings->code !!}
|
||||
</div>
|
||||
@@ -0,0 +1,5 @@
|
||||
<li class="orbit-slide @if($order == 0)is-active @endif">
|
||||
<h2>{{$image->name}}</h2>
|
||||
<h3>{{$image->description}}</h3>
|
||||
<div class="img" style="background-image: url({{config('app.upload_url')}}/{{$image->filename}})"></div>
|
||||
</li>
|
||||
Reference in New Issue
Block a user