Merge branch 'dev' into cwbs_template

.env.example

@@ -1,22 +1,18 @@
-APP_ENV=local
+APP_ENV=testing
 APP_DEBUG=true
-APP_KEY=SomeRandomString
+APP_KEY=
 
 DB_HOST=localhost
-DB_DATABASE=homestead
+DB_DATABASE=
-DB_USERNAME=homestead
+DB_USERNAME=
-DB_PASSWORD=secret
+DB_PASSWORD=
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-MAIL_DRIVER=smtp
+MAIL_USERNAME=@binarity.cz
-MAIL_HOST=mailtrap.io
+MAIL_PASSWORD=
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
 
 SITE_URL=/
 UPLOAD_URL=/public/uploads

app/Handlers/Handler.php

@@ -65,7 +65,7 @@ abstract class Handler implements AppHandler
 
         // create instance of main menu
         \Menu::create('mainMenu', function ($menu) {
-            $menu->route('admin.dashboard', trans('admin/mainMenu.dashboard'), [], 10, ['icon' => 'fa fa-dashboard']);
+//            $menu->route('admin.dashboard', trans('admin/mainMenu.dashboard'), [], 10, ['icon' => 'fa fa-dashboard']);
             $menu->dropdown(trans('admin/mainMenu.userManagement'), function ($sub) {
                 $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 10, ['icon' => 'fa fa-user-plus']);
                 $sub->route('users.detail', trans('admin/mainMenu.userDetail'), [], 20, ['icon' => 'fa fa-user']);
@@ -118,10 +118,10 @@ abstract class Handler implements AppHandler
                     }
                 }, 29, ['icon' => 'fa fa-folder-open']);
             }
-            $menu->dropdown(trans('admin/mainMenu.customFields'), function ($sub) {
+//            $menu->dropdown(trans('admin/mainMenu.customFields'), function ($sub) {
-                $sub->route('customfields.new', trans('admin/mainMenu.customFieldsNew'), [], 10, ['icon' => 'fa fa-code']);
+//                $sub->route('customfields.new', trans('admin/mainMenu.customFieldsNew'), [], 10, ['icon' => 'fa fa-code']);
-                $sub->route('customfields.overview', trans('admin/mainMenu.customFieldsOverview'), [], 50, ['icon' => 'fa fa-code-fork']);
+//                $sub->route('customfields.overview', trans('admin/mainMenu.customFieldsOverview'), [], 50, ['icon' => 'fa fa-code-fork']);
-            }, 30, ['icon' => 'fa fa-code']);
+//            }, 30, ['icon' => 'fa fa-code']);
             $menu->route('log.overview', trans('admin/mainMenu.actionLog'), [], 40, ['icon' => 'fa fa-history']);
             $menu->route('settings.overview', trans('admin/mainMenu.settings'), [], 50, ['icon' => 'fa fa-gear']);
         });

app/Handlers/Registrators/WidgetRegistrator.php

@@ -38,9 +38,9 @@ class WidgetRegistrator
                                    'name'        => $widgetName,
                                    'description' => $widgetDescription
                                ]);
-        }
 
             // install widget (if neccessary)
             call_user_func($classname . '::install');
         }
     }
+}

app/Http/Controllers/Admin/CreateNewContent.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 use App\Enumerations\ActiveContentStatuses;
 use App\Http\Requests\CreateNewContentRequest;
 use App\Models\Content;
+use App\Models\File;
 use App\Models\Module;
 use App\Models\Template;
 use Illuminate\Support\Str;
@@ -11,6 +12,22 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CreateNewContent extends Controller
 {
+    /**
+     * @var File
+     */
+    private $file;
+    /**
+     * @var Content
+     */
+    private $content;
+
+    public function __construct(File $file, Content $content)
+    {
+        parent::__construct();
+        $this->file = $file;
+        $this->content = $content;
+    }
+
     /**
      * Display form for new content page
      *
@@ -29,16 +46,15 @@ class CreateNewContent extends Controller
                              ->get();
 
         // create default content object
-        $page = new Content();
+        $this->content->status = Content::STATUS_DRAFT;
-        $page->status = Content::STATUS_DRAFT;
 
         // render view
         return view('admin.content.new', [
             'contentStatuses'  => $statuses,
             'templates'        => $templates,
             'moduleId'         => $moduleId,
-            'page'             => $page,
+            'page'             => $this->content,
-            'rootPages'        => $page->rootPages(),
+            'rootPages'        => $this->content->rootPages(),
             'moduleName'       => trans($module->name),
             'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
             'formSections'     => call_user_func([$module->handler, 'getExtendedFormInputsCreate']),
@@ -82,6 +98,13 @@ class CreateNewContent extends Controller
             $page->parent_id = $request->parentPage;
         }
 
+        // upload file - if provided
+        if ($request->hasFile('titlePhoto')) {
+            $file = $this->file->upload($request->file('titlePhoto'), $request);
+
+            $page->title_photo = $file['filename'];
+        }
+
         // save module-specific stuff
         call_user_func_array([$module->handler, 'createNew'], [&$page, $request]);
 

app/Http/Controllers/Admin/Dashboard.php

@@ -9,6 +9,9 @@ use Illuminate\Support\Facades\Session;
 class Dashboard extends Controller
 {
     public function getIndex(Request $request) {
-        return view('admin.dashboard');
+
+        return redirect()->route('content.overview');
+
+//        return view('admin.dashboard');
     }
 }

app/Http/Controllers/Admin/EditContent.php

@@ -6,9 +6,9 @@ use App\Enumerations\ModulesHandlerToId;
 use App\Http\Requests\EditContentRequest;
 use App\Models\Content;
 use App\Models\ContentHistory;
+use App\Models\File;
 use App\Models\Template;
 use Illuminate\Support\Str;
-use Modules\StaticPages\Http\Requests\EditStaticPageRequest;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditContent extends Controller
@@ -17,10 +17,15 @@ class EditContent extends Controller
      * @var ContentHistory
      */
     private $history;
+    /**
+     * @var File
+     */
+    private $file;
 
-    public function __construct(ContentHistory $history)
+    public function __construct(ContentHistory $history, File $file)
     {
         $this->history = $history;
+        $this->file = $file;
     }
 
     /**
@@ -36,11 +41,11 @@ class EditContent extends Controller
         $statuses = ContentStatuses::getWithTranslations();
 
         // try to find requested page
-        $page = Content::where('module_handler', config('staticpages.handler'))
+        $page = Content::findOrFail($id);
-                       ->findOrFail($id);
+        $page->module_settings = json_decode($page->module_settings);
 
         $allModules = ModulesHandlerToId::getWithTranslations();
-        $moduleId = $allModules[config('staticpages.handler')];
+        $moduleId = $allModules[$page->module_handler];
         $templates = Template::where('module_id', $moduleId)
                              ->select(['template_name', 'name', 'description'])
                              ->get();
@@ -81,6 +86,14 @@ class EditContent extends Controller
 
         $request->url = Str::slug($request->url);
         $request->parentPage = $request->parentPage ? $request->parentPage : null;
+        $request->titlePhotoFilename = $page->title_photo;
+
+        // upload file - if provided
+        if ($request->hasFile('titlePhoto')) {
+            $file = $this->file->upload($request->file('titlePhoto'), $request);
+
+            $request->titlePhotoFilename = $file['filename'];
+        }
 
         // array of fields in database and fields from request
         $fields = [
@@ -93,7 +106,8 @@ class EditContent extends Controller
             'meta_description' => 'metaDescription',
             'content'          => 'pageContent',
             'parent_id'        => 'parentPage',
-            'status'           => 'status'
+            'status'           => 'status',
+            'title_photo'      => 'titlePhotoFilename'
         ];
 
         // save new values with history

app/Http/Controllers/Admin/EditUploadedFile.php

@@ -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();

app/Http/Controllers/Admin/EditWidget.php

@@ -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);

app/Http/Controllers/Admin/Settings.php

@@ -44,17 +44,26 @@ class Settings extends Controller
         $settings = $this->settings->getAll();
         $updated = 0;
         foreach ($data as $key => $value) {
+            if (isset($settings->$key)) {
                 if ($settings->$key != $value) {
                     $updated++;
-                \App\Models\Settings::where('key', $key)->update(['value' => $value]);
+                    \App\Models\Settings::where('key', $key)
+                                        ->update(['value' => $value]);
+                }
+            } else {
+                \App\Models\Settings::create(['key' => $key, 'value' => $value]);
+                $updated++;
             }
         }
 
         if ($updated > 0) {
-            return redirect()->route('settings.overview')->with('success', trans('admin/settings.successfullySaved'));
+            return redirect()
+                ->route('settings.overview')
+                ->with('success', trans('admin/settings.successfullySaved'));
         } else {
-            return redirect()->route('settings.overview')->with('error', trans('admin/settings.nothingToSave'));
+            return redirect()
+                ->route('settings.overview')
+                ->with('error', trans('admin/settings.nothingToSave'));
         }
-
     }
 }

app/Http/Requests/CreateNewContentRequest.php

@@ -12,15 +12,15 @@ class CreateNewContentRequest extends Request
     public function rules()
     {
         return [
+            'titlePhoto'     => 'image',
             'title'          => 'required',
             'url'            => 'required|unique:contents,url',
             'template'       => 'required|exists:templates,template_name',
+            'status'         => 'required|in:draft,protected,public',
+            'title_photo'    => 'exists:files,id',
+            'parentPage'     => 'exists:contents,id',
             'published_from' => 'date',
             'published_to'   => 'date',
-            'title_photo'     => 'exists:files,id',
-            'module_settings' => 'json',
-            'status'          => 'required|in:draft,protected,public',
-            'parentPage'      => 'exists:contents,id'
         ];
     }
 }

app/Models/File.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Events\UploadFile;
-use App\Http\Requests\UploadRequest;
+use App\Http\Requests\Request;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
@@ -50,12 +50,12 @@ class File extends Model
      * Saves file into FS and creates new record in database
      *
      * @param UploadedFile $file
-     * @param UploadRequest $request
+     * @param Request      $request
      *
      * @return array associative array - key 'file' is type of SymphonyFile and contains info about real file, key 'id'
      *               is ID of row in files table
      */
-    public function upload(UploadedFile $file, UploadRequest $request)
+    public function upload(UploadedFile $file, Request $request)
     {
         $destination = config('app.upload_path');
         $filename = $this->getFilename($file);
@@ -70,6 +70,7 @@ class File extends Model
         Event::fire(new UploadFile($uploadedFile, $id));
 
         return [
+            'filename' => $filename,
             'file'     => $file,
             'id'       => $id
         ];
@@ -81,12 +82,12 @@ class File extends Model
      * This file saves new record into database. It also calculates hash of given file, obtains MIME type etc.
      *
      * @param SymphonyFile  $file
-     * @param UploadRequest $request
+     * @param Request       $request
      * @param               $originalFilename
      *
      * @return mixed
      */
-    protected function saveIntoDatabase(SymphonyFile $file, UploadRequest $request, $originalFilename)
+    protected function saveIntoDatabase(SymphonyFile $file, Request $request, $originalFilename)
     {
         // get path and hash of uploaded file
         $path = config('app.upload_path') . DIRECTORY_SEPARATOR . $file->getFilename();
@@ -101,13 +102,14 @@ class File extends Model
         $newFile->hash_algorithm = self::HASH_ALGORITHM;
         $newFile->mime_type = $file->getMimeType();
         $newFile->file_size = $file->getSize();
-        $newFile->directory_id = $request->directoryId;
 
         // save optional fields
-        $optionalFields = ['description', 'keywords'];
+        $optionalFields = ['name', 'description', 'keywords', 'directoryId'];
         foreach ($optionalFields as $field) {
             if ($request->has($field)) {
-                $newFile->$field = $request->$field;
+
+                $snakeField = snake_case($field);
+                $newFile->$snakeField = $request->$field;
             }
         }
 

app/Providers/AppServiceProvider.php

@@ -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);
     }
 
     /**

app/Providers/ModuleManager.php

@@ -56,7 +56,7 @@ class ModuleManager extends ServiceProvider
         $path = config('modules.paths.modules') . DIRECTORY_SEPARATOR . $config->staticName . DIRECTORY_SEPARATOR . 'module.json';
 
         // check if module config is writable
-        if (!is_writable($path)) {
+        if (!is_writable(dirname($path))) {
             return;
         }
 

app/Widgets/Exceptions/WidgetExistsException.php

@@ -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);
+    }
+}

app/Widgets/HtmlCode/Presenters/HtmlCode.php

@@ -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]);
     }
 }

app/Widgets/OrbitSlider/OrbitSlider.php

@@ -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.
+    }
+}

app/Widgets/OrbitSlider/Presenters/OrbitSlider.php

@@ -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]);
+    }
+}

config/mail.php

@@ -28,7 +28,7 @@ return [
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'host' => env('MAIL_HOST', 'mail.binarity.cz'),
 
     /*
     |--------------------------------------------------------------------------
@@ -41,7 +41,7 @@ return [
     |
     */
 
-    'port' => env('MAIL_PORT', 587),
+    'port' => env('MAIL_PORT', 25),
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2016_03_31_192238_ChangeContentTitleImageIdForFilename.php

@@ -0,0 +1,86 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeContentTitleImageIdForFilename extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        try {
+            Schema::table('contents', function (Blueprint $table) {
+                $table->dropForeign('fk_content_file1');
+            });
+        } catch (\Illuminate\Database\QueryException $e) {
+            // probably foreign does not exist, try to remove one from migration
+
+            try {
+                Schema::table('contents', function (Blueprint $table) {
+                    $table->dropForeign('contents_title_photo_foreign');
+                });
+            } catch (\Illuminate\Database\QueryException $ex) {
+                // ignore this error
+            }
+        }
+
+        // force Doctrine to consider enum type as string
+        $platform = Schema::getConnection()
+                          ->getDoctrineSchemaManager()
+                          ->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
+        Schema::table('contents', function (Blueprint $table) {
+            $table->string('title_photo', 128)
+                  ->nullable()
+                  ->default(null)
+                  ->comment('This photo is supposed to be displayed e.g. on list of all pages.')
+                  ->change();
+
+            $table->foreign('title_photo')
+                  ->references('filename')
+                  ->on('files')
+                  ->onUpdate('cascade')
+                  ->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // force Doctrine to consider enum type as string
+        $platform = Schema::getConnection()
+                          ->getDoctrineSchemaManager()
+                          ->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
+        // delete all title photos
+        DB::statement('UPDATE contents SET title_photo = NULL');
+        
+        Schema::table('contents', function (Blueprint $table) {
+            $table->dropForeign('contents_title_photo_foreign');
+        });
+
+        Schema::table('contents', function (Blueprint $table) {
+            $table->integer('title_photo', false)
+                  ->change();
+        });
+
+        Schema::table('contents', function (Blueprint $table) {
+            $table->foreign('title_photo')
+                  ->references('id')
+                  ->on('files');
+        });
+    }
+}

database/migrations/2016_03_31_214730_MakeUserIdNotMandatoryInDirectories.php

@@ -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();
+        });
+    }
+}

database/migrations/2016_03_31_225203_AddNameForFiles.php

@@ -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');
+        });
+    }
+}

install

@@ -179,6 +179,10 @@ if [ ! -e $THEME_SET_FILE ]; then
    echo $THEME_NAME > $THEME_SET_FILE
 fi
 
+# publish assets and views
+php artisan vendor:publish --tag=module-views
+php artisan vendor:publish --tag=public-assets
+
 if [ ! -e $ADMIN_CREATED_FILE ]; then
    echo ""
    echo " ------------------------------ "

modules/ContactForm/Config/config.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'name'      => 'ContactForm',
+    'translatedName' => 'contactform::module.name',
+    'translatedDescription' => 'contactform::module.description',
+    'alias'     => 'contactform',
+    'handler'   => '\\Modules\\ContactForm\\Handlers\\ContactForm',
+    'providers' => [\Modules\ContactForm\Providers\ContactFormServiceProvider::class],
+    'files'     => ['start.php'],
+    'order'     => 0,
+];

modules/ContactForm/Database/Seeders/ContactFormDatabaseSeeder.php

@@ -0,0 +1,20 @@
+<?php namespace Modules\Contactform\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+
+class ContactFormDatabaseSeeder extends Seeder {
+
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Model::unguard();
+		
+		// $this->call("OthersTableSeeder");
+	}
+
+}

modules/ContactForm/Handlers/ContactForm.php

@@ -0,0 +1,153 @@
+<?php
+namespace Modules\ContactForm\Handlers;
+
+use App\Enumerations\ModulesHandlerToId;
+use App\Handlers\Handler;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Request;
+use App\Models\Content;
+use App\Models\User;
+
+class ContactForm extends Handler
+{
+    /**
+     * Render given module into visitor area.
+     *
+     * @param Content $content    DB model from table contents
+     * @param array   $parameters parameters used for modifications/custom settings of given model
+     *
+     * @return mixed
+     */
+    public function render(Content $content, $parameters)
+    {
+        $content->module_settings = json_decode($content->module_settings);
+
+        return Controller::VisitorsView($content->template, ['page' => $content]);
+    }
+
+    public static function getHistoryHandler()
+    {
+        return ContactFormHistory::class;
+    }
+
+    /**
+     * Save module-specific values into database
+     *
+     * @param Content $content
+     * @param Request $request
+     *
+     * @return mixed
+     * @internal param Widget $widget
+     */
+    public static function createNew(Content &$content, Request $request)
+    {
+
+        $settings = [
+            'phone'       => $request->phone,
+            'email'       => $request->email,
+            'companyName' => $request->companyName,
+            'address'     => $request->address,
+            'gpsLat'      => $request->gpsLat,
+            'gpsLng'      => $request->gpsLng,
+        ];
+
+        // save settings
+        $content->module_settings = json_encode($settings);
+    }
+
+    /**
+     * Method used for editing existing content page.
+     *
+     * Reason why it is separated from createNew() method is simple - we need to save history of changes.
+     *
+     * @param Content $content
+     * @param Request $request
+     *
+     * @param         $revisionID string ID of revision used
+     *
+     * @return int number of edited fields
+     */
+    public static function edit(Content &$content, Request $request, $revisionID)
+    {
+        // TODO: Implement edit() method.
+    }
+
+    public static function getModuleId()
+    {
+        $handler = config('contactform.handler');
+        $allModules = ModulesHandlerToId::getWithTranslations();
+        $moduleId = isset($allModules[$handler]) ? $allModules[$handler] : null;
+
+        return $moduleId;
+    }
+
+    /**
+     * Getter for section names in creating/editing content resource
+     *
+     * @return mixed
+     */
+    public static function getExtendedFormSections()
+    {
+        $sections = parent::getExtendedFormSections();
+        $sections['content'] = trans('contactform::admin/content.content');
+
+        return $sections;
+    }
+
+    /**
+     * Getter for views used in extended part of form for creating new content
+     *
+     * This method should return pairs <section, view-name>. View is returned only as name in plain text
+     *
+     * @return array of views/templates/html codes divided into section
+     */
+    public static function getExtendedFormInputsCreate()
+    {
+        return [
+            'basicInfo'   => 'contactform::admin.form.basicInfo',
+            'meta'        => 'admin.content.formParts.metaInformation',
+            'appearance'  => 'admin.content.formParts.appearance',
+            'publication' => 'admin.content.formParts.publicationSetup',
+            'content'     => 'contactform::admin.form.content',
+        ];
+    }
+
+    /**
+     * Register admin menu (or multiple ones)
+     *
+     * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
+     * starting any middleware..
+     *
+     * @param User $user model of logged user
+     */
+    public static function registerAdminMenu(User $user)
+    {
+        // register links in admin menu
+        $menu = \Menu::instance('mainMenu');
+        $menu->dropdown(trans('contactform::admin/adminMenu.contactForm'), function ($submenu) use ($user) {
+            $submenu->route('content.new', trans('contactform::admin/adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']);
+            $submenu->route('content.overview', trans('contactform::admin/adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']);
+            $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']);
+        }, 25, ['icon' => 'fa fa-envelope-o']);
+    }
+
+    /**
+     * Does given module manage content? Or is it just module with widgets/something internal/something absolutely else?
+     *
+     * @return bool
+     */
+    public static function managesContent()
+    {
+        return true;
+    }
+
+    /**
+     * Install module
+     *
+     * @return mixed
+     */
+    public static function install()
+    {
+        // TODO: Implement install() method.
+    }
+}

modules/ContactForm/Handlers/ContactFormHistory.php

@@ -0,0 +1,16 @@
+<?php
+namespace Modules\ContactForm\Handlers;
+
+use App\Handlers\History;
+
+class ContactFormHistory extends History
+{
+    public static function parseChangedValue($changeset)
+    {
+        switch ($changeset->column) {
+            default:
+                return parent::parseChangedValue($changeset);
+                break;
+        }
+    }
+}

modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php

@@ -0,0 +1,50 @@
+<?php
+namespace Modules\ContactForm\Http\Controllers\Visitor;
+
+use App\Helpers\Template;
+use App\Models\Content;
+use Illuminate\Mail\Message;
+use Illuminate\Support\Facades\Mail;
+use Modules\ContactForm\Http\Requests\SendNewEmailRequest;
+use Pingpong\Modules\Routing\Controller;
+
+class CreateNewMessage extends Controller
+{
+    /**
+     * Method for sending emails via contact form
+     * 
+     * @param SendNewEmailRequest $request
+     * @param                     $formId
+     *
+     * @return mixed
+     */
+    public function postMessage(SendNewEmailRequest $request, $formId)
+    {
+        // load form settings
+        $form = Content::where('module_handler', config('contactform.handler'))
+                       ->findOrFail($formId);
+
+        $form->module_settings = json_decode($form->module_settings);
+
+        // select template
+        $template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
+
+        // send email
+        $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
+            $message->from($request->email, $request->name);
+            $message->to($form->module_settings->email)
+                    ->subject('Your Reminder!');
+        });
+
+        // inform user about success or failure
+        if ($status) {
+            return redirect()
+                ->route('page.content', ['url' => $form->url])
+                ->with('success', '');
+        } else {
+            return redirect()
+                ->route('page.content', ['url' => $form->url])
+                ->with('error', '');
+        }
+    }
+}

modules/ContactForm/Http/Requests/SendNewEmailRequest.php

@@ -0,0 +1,20 @@
+<?php namespace Modules\ContactForm\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class SendNewEmailRequest extends Request
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'    => 'required',
+            'email'   => 'required|email',
+            'message' => 'required',
+        ];
+    }
+}

modules/ContactForm/Http/routes.php

@@ -0,0 +1,24 @@
+<?php
+use App\Http\Requests\Request;
+
+Route::group([
+                 'middleware' => ['web', 'auth', 'adminMenu'],
+                 'namespace'  => '\Modules\ContactForm\Http\Controllers\Admin',
+                 'prefix'     => 'admin/contactform'
+             ], function () {
+    Route::get('messsages/sent', 'SentMessagesOverview@getList')
+         ->name('emails.sent');
+});
+
+Route::group([
+                 'middleware' => ['web'],
+                 'namespace'  => '\Modules\ContactForm\Http\Controllers\Visitor',
+                 'prefix' => 'contactform'
+             ], function () {
+    
+    
+    // method for sending new message
+    
+    Route::post('/message/{formId}', 'CreateNewMessage@postMessage')
+         ->name('email.send');
+});

modules/ContactForm/Providers/ContactFormServiceProvider.php

@@ -0,0 +1,108 @@
+<?php namespace Modules\ContactForm\Providers;
+
+use App\Handlers\Registrators\TemplateRegistrator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
+use InvalidArgumentException;
+
+class ContactFormServiceProvider extends ServiceProvider
+{
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = false;
+
+    /**
+     * Boot the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $registrator = $this->app->make('registerSettingsExtension');
+        $registrator->register('contactForm', 'contactform::module.name', 'contactform::admin.settings.form');
+    }
+
+    /**
+     * Register config.
+     *
+     * @return void
+     */
+    protected function registerConfig()
+    {
+        $this->publishes([
+                             __DIR__ . '/../Config/config.php' => config_path('contactform.php'),
+                         ]);
+        $this->mergeConfigFrom(__DIR__ . '/../Config/config.php', 'contactform');
+    }
+
+    /**
+     * Register views.
+     *
+     * @return void
+     */
+    public function registerViews()
+    {
+        $viewPath = base_path('resources/views/modules/contactform');
+
+        $sourcePath = __DIR__ . '/../Resources/views';
+
+        $this->publishes([
+                             $sourcePath => $viewPath
+                         ]);
+
+        $this->loadViewsFrom(array_merge(array_map(function ($path) {
+            return $path . '/modules/contactform';
+        }, \Config::get('view.paths')), [$sourcePath]), 'contactform');
+
+        /**
+         * @var $registrator TemplateRegistrator
+         */
+        $registrator = $this->app->make('registerTemplateDir');
+        try {
+            // setup some global variables
+            $registrator->setBaseDirectory('resources/views/modules/contactform/visitor');
+            $registrator->setNamespace('contactform');
+            $registrator->setModuleId(call_user_func([config('contactform.handler'), 'getModuleId']));
+
+            // register path with current template name
+            $registrator->register(config('app.theme'), 'contactform::admin.templatePath');
+        } catch (InvalidArgumentException $e) {
+            // ignore this exception
+        }
+    }
+
+    /**
+     * Register translations.
+     *
+     * @return void
+     */
+    public function registerTranslations()
+    {
+        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'contactform');
+    }
+
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return array ();
+    }
+}

modules/ContactForm/Resources/lang/en/admin/adminMenu.php

@@ -0,0 +1,7 @@
+<?php
+return [
+    'contactForm' => 'Contact form',
+    'new' => 'New',
+    'overview' => 'All contact forms',
+    'sentMessages' => 'Messages'
+];

modules/ContactForm/Resources/lang/en/admin/content.php

@@ -0,0 +1,12 @@
+<?php
+return [
+    'content'            => 'Contact form content',
+    'address'            => 'Address',
+    'emailList'          => 'Send emails to these addresses',
+    'gpsLat'             => 'GPS latitude',
+    'gpsLng'             => 'GPS longitude',
+    'compName'           => 'Name displayed above address',
+    'phone'              => 'Contact phone',
+    'contactEmail'       => 'E-mail, where messages from this form will be delivered',
+    'contactInformation' => 'Contact information'
+];

modules/ContactForm/Resources/lang/en/admin/settings.php

@@ -0,0 +1,5 @@
+<?php
+return [
+    'recaptchaSiteKey' => 'reCAPTCHA site key',
+    'recaptchaSecret' => 'reCAPTCHA application secret key',
+];

modules/ContactForm/Resources/lang/en/module.php

@@ -0,0 +1,5 @@
+<?php
+return [
+    'name'        => 'Contact form',
+    'description' => 'Simple contact form'
+];

modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php

@@ -0,0 +1,113 @@
+<div class="row">
+    <div class="columns large-6">
+        <label>
+            @lang('admin/contents.field_title')
+
+            <input type="text" name="title" placeholder="@lang('admin/contents.field_title')"
+                   value="{{old('title', $page->title)}}" />
+        </label>
+    </div>
+    <div class="columns large-6">
+        <label>
+            @lang('admin/contents.field_url')
+
+            <input type="text" name="url" placeholder="@lang('admin/contents.field_url')"
+                   value="{{old('url', $page->url)}}" />
+
+            @if (isset($errors) && $errors->has('url'))
+                <div class="callout alert">
+                    {{ $errors->first('url') }}
+                </div>
+            @endif
+        </label>
+    </div>
+</div>
+
+<div class="row">
+    <div class="columns large-6">
+        <label>
+            <select name="status">
+                @foreach($contentStatuses as $status => $translation)
+                    <option value="{{$status}}" @if(old('status', $page->status) == $status) selected @endif>
+                        {{$translation}}
+                    </option>
+                @endforeach
+            </select>
+        </label>
+
+        @if (isset($errors) && $errors->has('status'))
+            <div class="callout alert">
+                {{ $errors->first('status') }}
+            </div>
+        @endif
+    </div>
+    <div class="column large-6">
+        <label>
+            <select name="parentPage">
+                <option value="">@lang('admin/contents.noParentPage')</option>
+
+                @foreach($rootPages as $rootPage)
+                    <option value="{{$rootPage->id}}"
+                            @if(old('parent_page', $page->parent_id) == $rootPage->id) selected @endif>
+                        {{$rootPage->title}}
+                    </option>
+                @endforeach
+            </select>
+        </label>
+
+        @if (isset($errors) && $errors->has('parentPage'))
+            <div class="callout alert">
+                {{ $errors->first('parentPage') }}
+            </div>
+        @endif
+    </div>
+</div>
+
+<h2>@lang('contactform::admin/content.contactInformation')</h2>
+
+<div class="row">
+    <div class="column large-6">
+        <label>
+            @lang('contactform::admin/content.phone')
+
+            <input type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" />
+        </label>
+    </div>
+
+    <div class="column large-6">
+        <label>
+            @lang('contactform::admin/content.contactEmail')
+
+            <input type="email" name="email" value="{{$page->module_settings->email or \Auth::user()->email}}" />
+        </label>
+    </div>
+</div>
+
+<div class="row">
+    <div class="column large-6">
+
+        <label>
+            @lang('contactform::admin/content.compName')
+
+            <input type="text" name="companyName" value="{{$page->module_settings->companyName or ""}}" />
+        </label>
+
+        <label>
+            @lang('contactform::admin/content.address')
+
+            <textarea rows="3" name="address">{{$page->module_settings->address or ""}}</textarea>
+        </label>
+    </div>
+    <div class="column large-6">
+        <label>
+            @lang('contactform::admin/content.gpsLat')
+
+            <input type="text" value="{{$page->module_settings->gpsLat or ""}}" name="gpsLat" />
+        </label>
+        <label>
+            @lang('contactform::admin/content.gpsLng')
+
+            <input type="text" value="{{$page->module_settings->gpsLng or ""}}" name="gpsLng" />
+        </label>
+    </div>
+</div>

modules/ContactForm/Resources/views/admin/form/content.blade.php

@@ -0,0 +1,10 @@
+<div class="row">
+    <div class="columns large-12">
+        <label>
+                <textarea name="pageContent" id="pageContent" class="wysiwyg-editor">
+                    {{old('pageContent', $page->content)}}
+                </textarea>
+
+        </label>
+    </div>
+</div>

modules/ContactForm/Resources/views/admin/settings/form.blade.php

@@ -0,0 +1,13 @@
+<label>
+    @lang('contactform::admin/settings.recaptchaSiteKey')
+
+    <input type="text" name="recaptchaSiteKey" value="{{old('recaptchaSiteKey', isset($settings->recaptchaSiteKey) ? $settings->recaptchaSiteKey : null)}}" />
+</label>
+
+<label>
+    @lang('contactform::admin/settings.recaptchaSecret')
+
+    <input type="text" name="recaptchaSecret" value="{{old('recaptchaSecret', isset($settings->recaptchaSecret) ? $settings->recaptchaSecret : null)}}" />
+</label>
+
+<em><a href="https://www.google.com/recaptcha/admin#list" target="_blank">reCAPTCHA</a></em>

modules/ContactForm/Resources/views/visitor/emails/default.blade.php

@@ -0,0 +1,4 @@
+<p>
+<strong>Ahoj {{$data->name}}</strong>
+</p>
+<p>Diky za zpravu: <em>{{$data->message}}</em></p>

modules/ContactForm/composer.json

@@ -0,0 +1,15 @@
+{
+	"name": "pingpong-modules/contactform",
+	"description": "",
+	"authors": [
+		{
+			"name": "Pingpong Labs",
+			"email": "pingpong.labs@gmail.com"
+		}
+	],
+	"autoload": {
+		"psr-4": {
+			"Modules\\ContactForm\\": ""
+		}
+	}
+}

modules/ContactForm/start.php

@@ -0,0 +1,15 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Register Namespaces And Routes
+|--------------------------------------------------------------------------
+|
+| When a module starting, this file will executed automatically. This helps
+| to register some namespaces like translator or view. Also this file
+| will load the routes file for each module. You may also modify
+| this file as you want.
+|
+*/
+
+require __DIR__ . '/Http/routes.php';

resources/assets/css/admin.css

@@ -127,6 +127,10 @@ code {
 	font-size: 80%;
 }
 
+#appearance .title-photo img {
+	max-height: 10em;
+}
+
 .red {
 	color: red;
 }

resources/lang/en/admin/contents.php

@@ -36,5 +36,6 @@ return [
     'overview'               => 'List of all content pages',
     'homepageSetup'          => 'Homepage successfully set up.',
     'setHomepage'            => 'Set page as homepage',
-    'noParentPage'           => ' -- No parent page -- '
+    'noParentPage'           => ' -- No parent page -- ',
+    'uploadTitleImage'       => 'Upload title image'
 ];

resources/lang/en/admin/fileManager.php

@@ -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.',

resources/lang/en/admin/history.php

@@ -10,6 +10,7 @@ return [
     'columnTemplate'           => 'Template',
     'columnIs_homepage'        => 'Homepage',
     'columnParentPage'         => 'Parent page',
+    'columnTitlePhotoFilename' => 'Title photo',
     'emptyValue'               => '<em>none</em>',
     'changedFromTo'            => 'Changed from <del>:from</del> to <ins>:to</ins>',
     'numOfChanges'             => 'One change|:count changes',

resources/lang/en/admin/widgets.php

@@ -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.'
 
 ];

resources/lang/en/widgets/orbitSlider.php

@@ -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'
+];

resources/views/admin/content/editForm.blade.php

@@ -10,7 +10,7 @@
     </div>
 @endif
 
-<form method="POST" action="{{route('content.editPost', ['pageId' => $page->id])}}">
+<form method="POST" enctype="multipart/form-data" action="{{route('content.editPost', ['pageId' => $page->id])}}">
     {!! csrf_field() !!}
 
     @include('admin.content.formInputs')

resources/views/admin/content/formParts/appearance.blade.php

@@ -1,3 +1,26 @@
+@if($page->title_photo)
+    <div class="row">
+        <div class="column large-12 title-photo text-center">
+            <img src="{{config('app.upload_url')}}/{{$page->title_photo}}" alt="" />
+        </div>
+    </div>
+@endif
+
+
+<div class="row">
+    <div class="column large-12">
+        <label>
+            @lang('admin/contents.uploadTitleImage')
+            <input type="file" id="titlePhoto" name="titlePhoto" />
+        </label>
+        @if (isset($errors) && $errors->has('titlePhoto'))
+            <div class="callout alert">
+                {{ $errors->first('titlePhoto') }}
+            </div>
+        @endif
+    </div>
+</div>
+
 <div class="row">
     <div class="columns large-12">
         <label>

resources/views/admin/content/formParts/basicInformation.blade.php

@@ -55,13 +55,12 @@
             </select>
         </label>
 
-        @if (isset($errors) && $errors->has('status'))
+        @if (isset($errors) && $errors->has('parentPage'))
             <div class="callout alert">
-                {{ $errors->first('status') }}
+                {{ $errors->first('parentPage') }}
             </div>
         @endif
     </div>
-
 </div>
 
 <div class="row">

resources/views/admin/content/newForm.blade.php

@@ -10,7 +10,7 @@
     </div>
 @endif
 
-<form method="POST" action="{{route('content.newPost', ['moduleId' => $moduleId])}}">
+<form method="POST" enctype="multipart/form-data" action="{{route('content.newPost', ['moduleId' => $moduleId])}}">
     {!! csrf_field() !!}
 
     @include('admin.content.formInputs')

resources/views/admin/content/overviewTiles.blade.php

@@ -1,7 +1,12 @@
-<div class="row" id="static-page-overview" data-equalizer>
+<div class="row" id="static-page-overview" data-equalizer data-equalize-by-row="true">
     @forelse($pages as $page)
         <div class="columns @if(!isset($tileClass)) large-3 @else {{$tileClass}} @endif">
             <div class="page callout" data-equalizer-watch>
+                @if ($page->title_photo)
+                    <img src="{{config('app.upload_url')}}/{{$page->title_photo}}" alt="" />
+                @endif
+
+
                 <h4>{{$page->title}}</h4>
                 <span class="date">{{date('d.m.Y', strtotime($page->created_at))}}</span>
                 <span class="author">{{$page->author_name}}</span>
@@ -24,22 +29,36 @@
                     @if($page->is_homepage)
                         <a class="button tiny disabled"><i class="fa fa-home"></i></a>
                     @else
-                        <a href="{{route('content.setHomepage', ['id' => $page->id])}}" class="button tiny success has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.setHomepage', ['name' => $page->title])"><i class="fa fa-home"></i></a>
+                        <a href="{{route('content.setHomepage', ['id' => $page->id])}}"
+                           class="button tiny success has-tip" data-tooltip aria-haspopup="true"
+                           title="@lang('admin/contents.setHomepage', ['name' => $page->title])"><i
+                                    class="fa fa-home"></i></a>
                     @endif
 
-                    <a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.edit', ['name' => $page->title])"><i class="fa fa-edit"></i></a>
+                    <a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success has-tip"
+                       data-tooltip aria-haspopup="true"
+                       title="@lang('admin/contents.edit', ['name' => $page->title])"><i class="fa fa-edit"></i></a>
 
                     @if($page->status == \App\Models\Content::STATUS_DRAFT)
-                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}" class="button tiny success confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makePublic')"><i class="fa fa-eye"></i></a>
+                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
-                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}" class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makeProtected')"><i class="fa fa-lock"></i></a>
+                           class="button tiny success confirm has-tip" data-tooltip aria-haspopup="true"
+                           title="@lang('admin/contents.makePublic')"><i class="fa fa-eye"></i></a>
+                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
+                           class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
+                           title="@lang('admin/contents.makeProtected')"><i class="fa fa-lock"></i></a>
                     @else
-                        <a href="{{route('page.content', ['url' => $page->url])}}" target="_blank" class="button tiny secondary has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.viewPage')"><i class="fa fa-desktop"></i></a>
+                        <a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
-                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}" class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.makeDraft')"><i class="fa fa-eye-slash"></i></a>
+                           class="button tiny secondary has-tip" data-tooltip aria-haspopup="true"
+                           title="@lang('admin/contents.viewPage')"><i class="fa fa-desktop"></i></a>
+                        <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
+                           class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
+                           title="@lang('admin/contents.makeDraft')"><i class="fa fa-eye-slash"></i></a>
                     @endif
 
-                    <a href="{{route('content.delete', ['id' => $page->id])}}" class="button tiny alert confirm has-tip" data-tooltip aria-haspopup="true" title="@lang('admin/contents.deletePage')"><i class="fa fa-remove"></i></a>
+                    <a href="{{route('content.delete', ['id' => $page->id])}}"
+                       class="button tiny alert confirm has-tip" data-tooltip aria-haspopup="true"
+                       title="@lang('admin/contents.deletePage')"><i class="fa fa-remove"></i></a>
                 </p>
-
             </div>
         </div>
     @empty

resources/views/admin/fileManager/editForm.blade.php

@@ -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')
 

resources/views/admin/fileManager/newFileForm.blade.php

@@ -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')
 

resources/views/admin/userManagement/editForm.blade.php

@@ -24,7 +24,7 @@
         <input type="text" name="password" value="">
     </label>
 
-    @if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN)
+    @if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN && \Auth::user()->id != $user->id)
         <label>
             @lang('admin/userManagement.roles')
 

resources/views/admin/widgets/htmlCode/editForm.blade.php

@@ -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">

resources/views/admin/widgets/orbitSlider/edit.blade.php

@@ -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
+

resources/views/admin/widgets/orbitSlider/editForm.blade.php

@@ -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>

resources/views/admin/widgets/orbitSlider/new.blade.php

@@ -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
+

resources/views/admin/widgets/orbitSlider/newForm.blade.php

@@ -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>

resources/views/widgets/orbitSlider/element.blade.php

@@ -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>

resources/views/widgets/orbitSlider/image.blade.php

@@ -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>