Merge branch 'master' of https://github.com/KaleidoscopeSrl/factotum

.gitignore

@@ -1,2 +1,5 @@
+.DS_Store
+
 .idea/
-node_modules/
+node_modules/
+vendor/

src/app/Helpers/PrintFieldHelper.php

@@ -529,6 +529,7 @@ private static function print_multiple_linked_content()
 
 			<div class="col col-xs-12 col-sm-6">
 				<p><?php echo Lang::get('factotum::content.select_content'); ?></p>
+				<input id="filter_sortable_source" style="width: 100%" placeholder="filter..">
 				<ul id="sortable1_<?php echo self::$field->id; ?>" class="connectedSortable source"
 					data-field_id="<?php echo self::$field->id; ?>">
 					<?php if ( isset(self::$field->options) ) { ?>
@@ -543,7 +544,8 @@ private static function print_multiple_linked_content()
 
 			<div class="col col-xs-12 col-sm-6">
 				<p><?php echo Lang::get('factotum::content.to_content'); ?></p>
-				<ul id="sortable2_<?php echo self::$field->id; ?>" class="connectedSortable"
+                <input id="filter_sortable_destination" style="width: 100%" placeholder="filter..">
+				<ul id="sortable2_<?php echo self::$field->id; ?>" class="connectedSortable destination"
 					data-field_id="<?php echo self::$field->id; ?>">
 					<?php if ( count($tmp) > 0 ) { ?>
 						<?php foreach ( $tmp as $opt ) { ?>

src/app/Http/Controllers/FrontController.php

@@ -76,6 +76,7 @@ public function __construct()
 	protected function _getContentByURI($uri)
 	{
 		$contentSearch = new ContentSearch( $this->pageContentType );
+
 		$content = $contentSearch->addWhereCondition( 'abs_url', '=', url('') . '/' . $uri )
 								 ->onlyPublished()
 								 ->addLimit(1)
@@ -84,6 +85,7 @@ protected function _getContentByURI($uri)
 		$content =  ( $content && $content->count() > 0 ? $content[0] : null );
 
 		if ( !$content ) {
+
 			$uriParts = explode( '/' , $uri );
 			$uri = $uriParts[ count($uriParts) - 1 ];
 

src/app/Setting.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Kaleidoscope\Factotum;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Setting extends Model
+{
+	protected $fillable = [
+		'setting_key', 'setting_value'
+	];
+}