From ce058ae8243903e13ec1afeb98b4e5e07afd771c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Tue, 11 Oct 2016 16:24:16 +0200
Subject: [PATCH] FEATURE: include commont parts of widget forms

---
 app/Http/Requests/EditWidgetRequest.php       |  3 +-
 app/Http/Requests/NewWidgetRequest.php        |  3 +-
 app/Models/Widget.php                         |  2 ++
 app/Providers/AppServiceProvider.php          |  2 +-
 resources/lang/en/widgets/common.php          | 10 ++++++
 .../admin/widgets/htmlCode/form.blade.php     | 22 +------------
 .../views/admin/widgets/menu/form.blade.php   | 23 +------------
 .../widgets/snippets/commonForm.blade.php     | 33 +++++++++++++++++++
 8 files changed, 52 insertions(+), 46 deletions(-)
 create mode 100644 resources/lang/en/widgets/common.php
 create mode 100644 resources/views/admin/widgets/snippets/commonForm.blade.php

diff --git a/app/Http/Requests/EditWidgetRequest.php b/app/Http/Requests/EditWidgetRequest.php
index 55b93954..0395eb1f 100644
--- a/app/Http/Requests/EditWidgetRequest.php
+++ b/app/Http/Requests/EditWidgetRequest.php
@@ -12,7 +12,8 @@ class EditWidgetRequest extends Request
     public function rules()
     {
         return [
-            'name' => 'required'
+            'name' => 'required',
+            'containerId' => 'unique:widgets,container_id,'.$this->containerId
         ];
     }
 }
diff --git a/app/Http/Requests/NewWidgetRequest.php b/app/Http/Requests/NewWidgetRequest.php
index 78ae08cd..968efad7 100644
--- a/app/Http/Requests/NewWidgetRequest.php
+++ b/app/Http/Requests/NewWidgetRequest.php
@@ -12,7 +12,8 @@ class NewWidgetRequest extends Request
     public function rules()
     {
         return [
-            'name' => 'required'
+            'name' => 'required',
+            'containerId' => 'unique:widgets,container_id'
         ];
     }
 }
diff --git a/app/Models/Widget.php b/app/Models/Widget.php
index dc0d14bf..5836ff4d 100644
--- a/app/Models/Widget.php
+++ b/app/Models/Widget.php
@@ -44,6 +44,8 @@ class Widget extends Model
         $widget->language = LaravelLocalization::getCurrentLocale();
         $widget->user_id = \Auth::user()->id;
         $widget->name = $data->name;
+        $widget->container_class = $data->containerClass;
+        $widget->container_id = $data->containerId;
 
         // save description if available
         if (isset($data->description)) {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index cb1c8fec..6b079574 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -96,7 +96,7 @@ class AppServiceProvider extends ServiceProvider
         // register all available widgets
         $registrator->register(HtmlCode::class);
         $registrator->register(Menu::class);
-        $registrator->register(OrbitSlider::class);
+//        $registrator->register(OrbitSlider::class);
     }
 
     /**
diff --git a/resources/lang/en/widgets/common.php b/resources/lang/en/widgets/common.php
new file mode 100644
index 00000000..67639999
--- /dev/null
+++ b/resources/lang/en/widgets/common.php
@@ -0,0 +1,10 @@
+<?php
+return [
+    'new'               => 'Create new HTML widget',
+    'edit'              => 'Editing widget :name',
+    'containerClass'    => 'HTML class used for container of this widget',
+    'widgetDescription' => 'Simple widget for inserting html code',
+    'name'              => 'Name',
+    'description'       => 'Description',
+    'containerId'       => 'Unique name used as ID of widget'
+];
\ No newline at end of file
diff --git a/resources/views/admin/widgets/htmlCode/form.blade.php b/resources/views/admin/widgets/htmlCode/form.blade.php
index 70068c59..38eccd2f 100644
--- a/resources/views/admin/widgets/htmlCode/form.blade.php
+++ b/resources/views/admin/widgets/htmlCode/form.blade.php
@@ -1,25 +1,5 @@
 <form action="{{$action}}" method="POST">
-    {!! csrf_field() !!}
-    <label class="label-control">
-        @lang('widgets/htmlCode.name')
-    </label>
-    <input class="form-control" type="text" name="name" value="{{old('name', $widget->name)}}"
-           placeholder="@lang('widgets/htmlCode.name')" />
-
-
-    <label class="label-control">
-        @lang('widgets/htmlCode.description')
-    </label>
-    <input class="form-control" type="text" name="description" placeholder="@lang('widgets/htmlCode.description')"
-           value="{{old('description', $widget->description)}}" />
-
-
-    <label class="label-control">
-        @lang('widgets/htmlCode.containerClass')
-    </label>
-
-    <input class="form-control" type="text" name="containerClass" placeholder="@lang('widgets/htmlCode.containerClass')"
-           value="{{old('containerClass', isset($settings->containerClass) ? $settings->containerClass : '')}}" />
+    @include('admin.widgets.snippets.commonForm')
 
     <label class="label-control">
         @lang('widgets/htmlCode.code')
diff --git a/resources/views/admin/widgets/menu/form.blade.php b/resources/views/admin/widgets/menu/form.blade.php
index 9b2be715..9a25dca3 100644
--- a/resources/views/admin/widgets/menu/form.blade.php
+++ b/resources/views/admin/widgets/menu/form.blade.php
@@ -1,28 +1,7 @@
 <form action="{{$formAction}}" id="widget-menu" method="POST">
-    {!! csrf_field() !!}
     <input type="hidden" name="settings" id="widgetSettings" value="{{json_encode($widget->settingsObj->links)}}" />
 
-    <label class="label-control">
-        @lang('widgets/menu.name')
-    </label>
-    <input class="form-control" required type="text" name="name" value="{{old("name", $widget->name)}}"
-           placeholder="@lang('widgets/menu.name')" />
-
-
-    <label class="label-control">
-        @lang('widgets/menu.description')
-    </label>
-
-    <input class="form-control" type="text" name="description" placeholder="@lang('widgets/menu.description')"
-           value="{{old("description", $widget->description)}}" />
-
-    <label class="label-control">
-        @lang('widgets/menu.containerClass')
-    </label>
-
-    <input class="form-control" type="text" name="containerClass" placeholder="@lang('widgets/menu.containerClass')"
-           value="{{old("containerClass", isset($widget->settingsObj->containerClass) ? $widget->settingsObj->containerClass : '')}}" />
-
+    @include('admin.widgets.snippets.commonForm')
 
     <div class="row">
         <div class="col-lg-6">
diff --git a/resources/views/admin/widgets/snippets/commonForm.blade.php b/resources/views/admin/widgets/snippets/commonForm.blade.php
new file mode 100644
index 00000000..7224649b
--- /dev/null
+++ b/resources/views/admin/widgets/snippets/commonForm.blade.php
@@ -0,0 +1,33 @@
+{!! csrf_field() !!}
+<label class="label-control">
+    @lang('widgets/common.name')
+</label>
+<input class="form-control" type="text" name="name" value="{{old('name', $widget->name)}}"
+       placeholder="@lang('widgets/common.name')" />
+
+
+<label class="label-control">
+    @lang('widgets/common.description')
+</label>
+<input class="form-control" type="text" name="description" placeholder="@lang('widgets/common.description')"
+       value="{{old('description', $widget->description)}}" />
+
+
+<div class="row">
+    <div class="col-md-6"><label class="label-control">
+            @lang('widgets/common.containerClass')
+        </label>
+
+        <input class="form-control" type="text" name="containerClass" placeholder="@lang('widgets/common.containerClass')"
+               value="{{old('containerClass', $widget->container_class)}}" />
+    </div>
+    <div class="col-md-6">
+        <label class="label-control">
+            @lang('widgets/common.containerId')
+        </label>
+
+        <input class="form-control" type="text" name="containerId" placeholder="@lang('widgets/common.containerId')"
+               value="{{old('containerId', $widget->container_id)}}" />
+    </div>
+</div>
+