Laravel 5.2

README.md

@@ -3,7 +3,7 @@
 [![Latest Stable Version](https://poser.pugx.org/sleeping-owl/admin/v/stable.svg)](https://packagist.org/packages/sleeping-owl/admin)
 [![License](https://poser.pugx.org/sleeping-owl/admin/license.svg)](https://packagist.org/packages/sleeping-owl/admin)
 
-*Note: if you are looking for the version for Laravel 4.2 check out [laravel-4.2 branch](https://github.com/sleeping-owl/admin/tree/laravel-4.2).*
+*Note: this is development version. If you are looking for stable version check out [master branch](https://github.com/sleeping-owl/admin).*
 
 SleepingOwl Admin is administrative interface builder for Laravel.
 
@@ -12,57 +12,56 @@ It includes:
  - [sb-admin-2 template](http://startbootstrap.com/template-overviews/sb-admin-2/)
  - [jQuery 1.11.0](http://jquery.org)
  - [Bootstrap v3.2.0](http://getbootstrap.com)
- - [Bootstrap Multiselect v0.9.8](https://github.com/davidstutz/bootstrap-multiselect)
+ - [Chosen v1.4.2](http://harvesthq.github.io/chosen/)
  - [DataTables 1.10.0-dev](http://www.sprymedia.co.uk)
+ - [Nestable jQuery Plugin](http://dbushell.github.io/Nestable/)
  - [Lightbox for Bootstrap 3](https://github.com/ashleydw/lightbox)
  - [Font Awesome 4.1.0](http://fontawesome.io)
  - [Metismenu 1.0.3](https://github.com/onokumus/metisMenu)
  - [morris.js v0.5.0]()
  - [bootbox.js v4.3.0](http://bootboxjs.com)
  - [Bootstrap datetimepicker](http://eonasdan.github.io/bootstrap-datetimepicker/)
  - [CKEditor](http://ckeditor.com)
+ - [flow.js](https://github.com/flowjs/flow.js)
 
 ## Installation
 
- 1. Require this package in your composer.json and run composer update (or run `composer require sleeping-owl/admin:dev-laravel-5` directly):
+ 1. Require this package in your composer.json and run composer update:
 
-		"sleeping-owl/admin": "2.*"
+		"sleeping-owl/admin": "dev-development"
 
  2. After composer update, add service providers to the `config/app.php`
 
 	    'SleepingOwl\Admin\AdminServiceProvider',
-	    'Illuminate\Html\HtmlServiceProvider',
 
  3. Add this to the facades in `config/app.php`:
 
-		'Admin'				=> 'SleepingOwl\Admin\Admin',
-		'AdminAuth'			=> 'SleepingOwl\AdminAuth\Facades\AdminAuth',
-		'AdminRouter'       => 'SleepingOwl\Admin\Facades\AdminRouter',
-		'AssetManager' 		=> 'SleepingOwl\Admin\AssetManager\AssetManager',
-		'Column'   			=> 'SleepingOwl\Admin\Columns\Column',
-		'FormItem' 			=> 'SleepingOwl\Admin\Models\Form\FormItem',
-		'ModelItem'			=> 'SleepingOwl\Admin\Models\ModelItem',
-
-		'Form'      => 'Illuminate\Html\FormFacade',
-		'Html'      => 'Illuminate\Html\HtmlFacade',
+		'Admin'         => 'SleepingOwl\Admin\Admin',
+		'AdminAuth'     => 'SleepingOwl\AdminAuth\Facades\AdminAuth',
+		'Column'        => 'SleepingOwl\Admin\Columns\Column',
+		'ColumnFilter'  => 'SleepingOwl\Admin\ColumnFilters\ColumnFilter',
+		'Filter'        => 'SleepingOwl\Admin\Filter\Filter',
+		'AdminDisplay'  => 'SleepingOwl\Admin\Display\AdminDisplay',
+		'AdminForm'     => 'SleepingOwl\Admin\Form\AdminForm',
+		'AdminTemplate' => 'SleepingOwl\Admin\Templates\Facade\AdminTemplate',
+		'FormItem'      => 'SleepingOwl\Admin\FormItems\FormItem',
 
  4. Run this command in terminal (if you want to know what exactly this command makes, see [install command documentation](http://sleeping-owl.github.io/en/Commands/Install.html)):
 
 		$ php artisan admin:install
 
 ## Documentation
 
-Documentation can be found at [sleeping owl documentation](http://sleeping-owl.github.io).
-You can also find it in the `/src/docs` directory.
+Documentation can be found at [sleeping owl documentation](http://sleeping-owl.github.io/v3).
 
 ## Demo Application
 
-View [live demo](http://sleepingowladmindemo.cloudcontrolled.com).
+View [live demo](http://sleepingowladmindemo2.cloudcontrolled.com).
 
 ## Support Library
 
-You can donate via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AXJMWMRPCBGVA) or in BTC: 13k36pym383rEmsBSLyWfT3TxCQMN2Lekd
+You can donate via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AXJMWMRPCBGVA), Yandex money (410012943296949) or in BTC: 13k36pym383rEmsBSLyWfT3TxCQMN2Lekd
 
 ## Copyright and License
 
-Admin was written by Sleeping Owl for the Laravel framework and is released under the MIT License. See the LICENSE file for details.
+Admin was written by Sleeping Owl for the Laravel framework and is released under the MIT License. See the LICENSE file for details.

composer.json

@@ -2,7 +2,12 @@
 	"name": "sleeping-owl/admin",
 	"description": "Aministrative interface builder for Laravel.",
 	"homepage": "http://sleeping-owl.github.io",
-	"keywords": ["laravel", "admin", "administrator"],
+	"keywords": [
+		"laravel",
+		"admin",
+		"administrator",
+		"crud"
+	],
 	"license": "MIT",
 	"authors": [
 		{
@@ -13,23 +18,21 @@
 	"require": {
 		"php": ">=5.4.0",
 		"illuminate/support": "5.*",
-		"intervention/image": "2.*",
-		"intervention/imagecache": "2.*",
-		"doctrine/dbal": "~2.3",
-		"sleeping-owl/with-join": "1.*",
-		"illuminate/html": "~5.0"
+		"doctrine/dbal": "~2.3"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "4.*",
-		"mockery/mockery": "0.9.*"
+		"orchestra/testbench": "3.*"
 	},
 	"autoload": {
 		"psr-0": {
-			"SleepingOwl\\Admin": "src/",
-			"SleepingOwl\\DateFormatter": "src/",
-			"SleepingOwl\\Html": "src/",
-			"SleepingOwl\\Models": "src/",
-			"SleepingOwl\\RandomFilenamer": "src/"
+			"SleepingOwl\\Admin": "src/"
 		}
+	},
+	"autoload-dev": {
+		"classmap": [
+			"tests/TestBase.php",
+			"tests/models"
+		]
 	}
 }

phpunit.xml

@@ -15,9 +15,4 @@
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener
-                class='Mockery\Adapter\Phpunit\TestListener'
-                file='./vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php'/>
-    </listeners>
 </phpunit>

resources/css/dataTables.bootstrap.css → public/default/css/dataTables.bootstrap.css

@@ -1,3 +1,7 @@
+.dataTables_wrapper {
+	margin-top: 15px;
+}
+
 div.dataTables_length label {
     float: left;
     text-align: left;
@@ -210,4 +214,11 @@ div.DTFC_LeftBodyWrapper tbody tr:first-child td {
 div.DTFC_RightFootWrapper table,
 div.DTFC_LeftFootWrapper table {
     border-top: none;
+}
+
+.dataTables_processing {
+	position: absolute;
+	left: 50%;
+	top: 140px;
+	margin-left: -35px;
 }

public/default/css/formitems/datetime/style.css

@@ -0,0 +1,7 @@
+.input-group-addon .fa-calendar, .input-group-addon .fa-clock-o {
+	cursor: pointer;
+}
+
+.form-group.datepicker, .form-group.timepicker {
+	width: 250px;
+}

public/default/css/formitems/image/images.css

@@ -0,0 +1,3 @@
+.images-group .imageThumbnail {
+	cursor: move;
+}