From 5efaaa636829ca6abab9d646ba3487b4761b03fb Mon Sep 17 00:00:00 2001
From: Butschster <butschster@gmail.com>
Date: Sat, 20 Feb 2016 23:36:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=B5=D1=8E=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20select2=20=D0=94=D0=BB=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20flow.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets.php                                   | 5 ++++-
 resources/views/default/formitem/multiselect.blade.php | 2 +-
 resources/views/default/formitem/select.blade.php      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/assets.php b/resources/assets.php
index 05cb2e3c8..86e92dc8c 100644
--- a/resources/assets.php
+++ b/resources/assets.php
@@ -21,6 +21,9 @@ function resources_url($path)
     ->js(null, resources_url('js/datatables.min.js'), ['datatables'])
     ->with('datatables');
 
+PackageManager::add(\SleepingOwl\Admin\FormItems\Image::class)
+    ->with('flow.js');
+
 PackageManager::add('libraries')
     ->js(null, resources_url('js/libraries.js'), ['jquery']);
 
@@ -73,7 +76,7 @@ function resources_url($path)
     ->js(null, resources_url('libs/noty/js/jquery.noty.packaged.min.js'), ['jquery']);
 
 PackageManager::add('select2')
-    ->js(null, resources_url('libs/select2/js/select2.full.min.js'), ['jquery'])
+    ->js(null, resources_url('libs/select2/js/select2.full.min.js'), ['jquery', 'libraries'])
     ->css(null, resources_url('libs/select2/css/select2.min.css'));
 
 PackageManager::add('Sortable')
diff --git a/resources/views/default/formitem/multiselect.blade.php b/resources/views/default/formitem/multiselect.blade.php
index 55fa80834..d8970bc20 100644
--- a/resources/views/default/formitem/multiselect.blade.php
+++ b/resources/views/default/formitem/multiselect.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<div>
-		<select id="{{ $name }}" name="{{ $name }}[]" class="form-control multiselect" multiple="multiple">
+		<select id="{{ $name }}" name="{{ $name }}[]" class="form-control input-select" multiple="multiple">
 			@foreach ($options as $optionValue => $optionLabel)
 				<option value="{{ $optionValue }}" {!! isset($value) && in_array($optionValue, $value) ? 'selected="selected"' : '' !!}>{{ $optionLabel }}</option>
 			@endforeach
diff --git a/resources/views/default/formitem/select.blade.php b/resources/views/default/formitem/select.blade.php
index 2e5782136..b7002a2c1 100644
--- a/resources/views/default/formitem/select.blade.php
+++ b/resources/views/default/formitem/select.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<div>
-		<select id="{{ $name }}" name="{{ $name }}" class="form-control multiselect" size="2" data-select-type="single" {!! ($nullable) ? 'data-nullable="true"' : '' !!}>
+		<select id="{{ $name }}" name="{{ $name }}" class="form-control input-select" size="2" data-select-type="single" {!! ($nullable) ? 'data-nullable="true"' : '' !!}>
 			@if ($nullable)
 				<option value=""></option>
 			@endif