media Datenbank

This commit is contained in:
Kevin Adametz 2019-11-14 20:29:01 +01:00
parent 70704be1ea
commit c11fc557bf
73 changed files with 2241 additions and 9655 deletions

95
.idea/workspace.xml generated
View file

@ -2,41 +2,49 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e1ac1cea-a1a5-4c16-b5f0-5908c7d368de" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/Models/Sym/CmsContent.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171716_create_i_q_content_folders_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171717_create_i_q_content_files_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171718_create_i_q_content_categories_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171719_create_i_q_content_tags_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171720_create_i_q_content_file_tags_table.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/ColorController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentCategory.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFile.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFileTag.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFolder.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentTag.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/fewo/invoices/2019/9538.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/09ce12d1-7f68-4ce4-9ab1-0229d6366fdb.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/09ce12d1-7f68-4ce4-9ab1-0229d6366fdb.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/f7aaeef3-b8e1-45ca-9f6a-b9476048d5dd.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/f7aaeef3-b8e1-45ca-9f6a-b9476048d5dd.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move-item.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/5095742f201612038.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/Datenblatt-BFX2019-01-15.xlsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/2.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/3.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/4.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/5.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/6.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/7.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/8.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/2.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/4.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/5.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/6.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/7.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/Bilder/thumbs/8.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/chartsflot.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/formsextras.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/logo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/storage/app/public/files/shares/root/thumbs/logo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/API/DraftController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentCountryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CMS/CMSContentCountryController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DraftController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TravelUserBookingFewoController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/CMSContent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CMSContent.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/DraftType.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/DraftType.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Sym/CmsContent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Sym/CmsContent.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Sym/TravelCountry.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelCountry.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/TravelUserBookingFewo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/helpers.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_19_114519_create_draft_types_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_29_193339_create_travel_country_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/ide-helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/ide-helper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/lfm.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/lfm.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171716_create_i_q_content_folders_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171716_create_i_q_content_folders_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171717_create_i_q_content_files_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/database/migrations/2019_08_05_171717_create_i_q_content_files_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/Controller.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/CropController.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/CropController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/DeleteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers/DeleteController.php" afterDir="false" />
@ -74,17 +82,43 @@
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/LfmStorageRepository.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/LfmStorageRepository.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Middlewares/CreateDefaultFolder.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Middlewares/CreateDefaultFolder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Middlewares/MultiUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Middlewares/MultiUser.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentCategory.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentCategory.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFile.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFileTag.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFileTag.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFolder.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentFolder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentTag.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models/IQContentTag.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/config/lfm.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/config/lfm.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/lang/de/lfm.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/lang/de/lfm.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/demo.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/demo.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views/move.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/de/_vorlagen.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/_vorlagen.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/booking/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/cms/content/country/detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/cms/content/country/detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/drafts/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/form.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/travel/user/booking/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/filemanager.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/filemanager.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/iq/content/assets/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/iq/content/assets/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/21.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/2110.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/381.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/3812-Konvertiert1.ai" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Bilder/001/21.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Bilder/6.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/Bildschirmfoto-2019-08-15-um-205143.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/20.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/21.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/6.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/Bildschirmfoto-2019-08-15-um-201357.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/thumbs/20.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/thumbs/6.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/001/thumbs/Bildschirmfoto-2019-08-15-um-201357.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/2556SR60.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/381.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/6.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/thumbs/381.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/PDFs/thumbs/6.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/21.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/2110.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/381.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/files/shares/thumbs/Bildschirmfoto-2019-08-15-um-205143.png" beforeDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -136,7 +170,7 @@
</commandsHistory>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager" />
</component>
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="MAMP PHP 7.1">
<include_path>
@ -275,17 +309,17 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="database.console.LAST_STATE" value="false" />
<property name="js.buildTools.grunt.grunt-cli.package" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/Models/Sym" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Controllers" />
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/views" />
<recent name="$PROJECT_DIR$/app/Models/Sym" />
<recent name="$PROJECT_DIR$/resources/views/drafts" />
<recent name="$PROJECT_DIR$/resources/views/cms/content/country" />
<recent name="$PROJECT_DIR$/app/Http/Controllers/CMS" />
<recent name="$PROJECT_DIR$/packages/iqcontent/laravel-filemanager/src/Models" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/views/booking" />
@ -525,6 +559,11 @@
<workItem from="1573130776386" duration="3387000" />
<workItem from="1573140295137" duration="437000" />
<workItem from="1573141708026" duration="989000" />
<workItem from="1573549876887" duration="4560000" />
<workItem from="1573561008488" duration="5016000" />
<workItem from="1573569593295" duration="13441000" />
<workItem from="1573729220562" duration="5745000" />
<workItem from="1573756863803" duration="2170000" />
</task>
<servers />
</component>

View file

@ -5,7 +5,7 @@ namespace PHPSTORM_META {
/**
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
* Generated on 2019-11-05 14:44:36.
* Generated on 2019-11-12 11:07:51.
*
* @author Barry vd. Heuvel <barryvdh@gmail.com>
* @see https://github.com/barryvdh/laravel-ide-helper

View file

@ -3,7 +3,7 @@
/**
* A helper file for Laravel 5, to provide autocomplete information to your IDE
* Generated for Laravel 5.8.32 on 2019-11-05 14:44:35.
* Generated for Laravel 5.8.32 on 2019-11-12 11:07:51.
*
* This file should not be included in your code, only analyzed by your IDE!
*

View file

@ -104,6 +104,8 @@ namespace App\Models\Sym{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText2($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText3($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText4($value)
* @property array|null $contact_lands
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactLands($value)
*/
class TravelCountry extends \Eloquent {}
}
@ -135,6 +137,8 @@ namespace App\Models\Sym{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereText($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereUpdatedAt($value)
* @mixin \Eloquent
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent findSimilarSlugs($attribute, $config, $slug)
*/
class CmsContent extends \Eloquent {}
}
@ -884,6 +888,8 @@ namespace App\Models{
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextAfter($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextBefore($value)
* @property array|null $contact_lands
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactLands($value)
*/
class TravelCountry extends \Eloquent {}
}
@ -1878,3 +1884,164 @@ namespace App\Models{
class Draft extends \Eloquent {}
}
namespace IqContent\LaravelFilemanager\Models{
/**
* IqContent\LaravelFilemanager\Models\IQContentFile
*
* @property int $id
* @property int|null $folder_id
* @property string $name
* @property string|null $identifier
* @property string $slug
* @property string|null $ext
* @property string|null $mine
* @property int $size
* @property string|null $dimensions
* @property string|null $content
* @property int $color
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFileTag[] $file_tags
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFolder|null $folder
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereColor($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereContent($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereDimensions($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereExt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereFolderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereMine($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereUpdatedAt($value)
*/
class IQContentFile extends \Eloquent {}
}
namespace IqContent\LaravelFilemanager\Models{
/**
* IqContent\LaravelFilemanager\Models\IQContentTag
*
* @property int $id
* @property int $category_id
* @property string $name
* @property string $slug
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \IqContent\LaravelFilemanager\Models\IQContentCategory $category
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFileTag[] $file_tags
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereCategoryId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereUpdatedAt($value)
*/
class IQContentTag extends \Eloquent {}
}
namespace IqContent\LaravelFilemanager\Models{
/**
* IqContent\LaravelFilemanager\Models\IQContentCategory
*
* @property int $id
* @property string $name
* @property string $slug
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentTag[] $tags
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereUpdatedAt($value)
*/
class IQContentCategory extends \Eloquent {}
}
namespace IqContent\LaravelFilemanager\Models{
/**
* IqContent\LaravelFilemanager\Models\IQContentFolder
*
* @property int $id
* @property int|null $folder_id
* @property string $name
* @property string $slug
* @property string|null $identifier
* @property string|null $path
* @property int $color
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFile[] $files
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFolder|null $folder
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFolder[] $folders
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereColor($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereFolderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder wherePath($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereUpdatedAt($value)
*/
class IQContentFolder extends \Eloquent {}
}
namespace IqContent\LaravelFilemanager\Models{
/**
* IqContent\LaravelFilemanager\Models\IQContentFileTag
*
* @property int $id
* @property int $file_id
* @property int $tag_id
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFile $file
* @property-read \IqContent\LaravelFilemanager\Models\IQContentTag $tag
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereFileId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereTagId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereUpdatedAt($value)
*/
class IQContentFileTag extends \Eloquent {}
}

View file

@ -33,6 +33,7 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereText($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent whereUpdatedAt($value)
* @mixin \Eloquent
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\CmsContent findSimilarSlugs($attribute, $config, $slug)
*/
class CmsContent extends Model
{

View file

@ -32,6 +32,8 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText2($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText3($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactText4($value)
* @property array|null $contact_lands
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sym\TravelCountry whereContactLands($value)
*/
class TravelCountry extends Model
{

View file

@ -55,6 +55,8 @@ use Illuminate\Support\Str;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextAfter($value)
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereTextBefore($value)
* @property array|null $contact_lands
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TravelCountry whereContactLands($value)
*/
class TravelCountry extends Model
{

View file

@ -66,6 +66,7 @@ return array(
'model_locations' => array(
'app',
'packages'
),

View file

@ -136,6 +136,8 @@ return [
'thumb_img_height' => 200,
'default_color' => '#ffc926',
/*
|--------------------------------------------------------------------------
| jQuery UI options

View file

@ -22,10 +22,9 @@ class CreateIQContentFoldersTable extends Migration
$table->string('name')->index();
$table->string('slug')->unique()->index();
$table->string('identifier')->nullable();
$table->string('path')->nullable();
$table->string('color', 7)->nullable();
$table->unsignedTinyInteger('color')->default(0);
$table->unsignedTinyInteger('pos')->default(0);
$table->boolean('active')->default(true);

View file

@ -29,7 +29,7 @@ class CreateIQContentFilesTable extends Migration
$table->text('content')->nullable();
$table->unsignedTinyInteger('color')->default(0);
$table->string('color', 7)->nullable();
$table->unsignedTinyInteger('pos')->default(0);
$table->boolean('active')->default(true);

View file

@ -0,0 +1,29 @@
<?php
namespace IqContent\LaravelFilemanager\Controllers;
use IqContent\LaravelFilemanager\Events\ImageIsRenaming;
use IqContent\LaravelFilemanager\Events\ImageWasRenamed;
use IqContent\LaravelFilemanager\Events\FolderIsRenaming;
use IqContent\LaravelFilemanager\Events\FolderWasRenamed;
class ColorController extends LfmController
{
public function getColor()
{
$file_name = $this->helper->input('file');
$new_color = $this->helper->input('new_color');
$file = $this->lfm->pretty($file_name);
$is_directory = $file->isDirectory();
$model = $file->model();
if($model && $model->id){
$model->color = $new_color;
$model->save();
}
return parent::$success_response;
}
}

View file

@ -43,7 +43,11 @@ class DeleteController extends LfmController
$this->lfm->setName($name_to_delete)->thumb()->delete();
}
}
$file_to_delete->deleteModel();
$model = $file_to_delete->model();
if($model && $model->id){
$model->delete();
}
$this->lfm->setName($name_to_delete)->delete();
event(new ImageWasDeleted($file_path));

View file

@ -38,7 +38,6 @@ class FolderController extends LfmController
public function getAddfolder()
{
$folder_name = $this->helper->input('name');
if(config('lfm.alphanumeric_directory')){
$folder_name = $this->helper->sanitize($folder_name);
}

View file

@ -27,6 +27,7 @@ class ItemsController extends LfmController
public function move()
{
$items = request('items');
$folder_types = array_filter(['user', 'share'], function ($type) {
return $this->helper->allowFolderType($type);
@ -35,11 +36,10 @@ class ItemsController extends LfmController
->with([
'root_folders' => array_map(function ($type) use ($folder_types) {
$path = $this->lfm->dir($this->helper->getRootFolder($type));
return (object) [
'name' => trans('laravel-filemanager::lfm.title-' . $type),
'url' => $path->path('working_dir'),
'children' => $path->folders(),
'children' => $path->recrusiveFolders($this->helper->getRootFolder($type)),
'has_next' => ! ($type == end($folder_types)),
];
}, $folder_types),
@ -49,29 +49,60 @@ class ItemsController extends LfmController
public function domove()
{
//target path
$target = $this->helper->input('goToFolder');
$items = $this->helper->input('items');
// return $this->response('error', parent::getError('folder-name'));
foreach ($items as $item) {
$old_file = $this->lfm->pretty($item);
$is_directory = $old_file->isDirectory();
if ($old_file->hasThumb()) {
$new_file = $this->lfm->setName($item)->thumb()->dir($target);
if ($is_directory) {
event(new FolderIsMoving($old_file->path(), $new_file->path()));
} else {
event(new FileIsMoving($old_file->path(), $new_file->path()));
}
$this->lfm->setName($item)->thumb()->move($new_file);
if($old_file->path('working_dir') == $target){
return $this->response('error', parent::getError('move-same'));
}
$lfm = $this->lfm->dir($target);
foreach ($lfm->folders() as $folder){
if($folder->name() == $old_file->name()){
return $this->response('error', parent::getError('move-exist'));
}
}
if($is_directory){
if(strpos($target."/", $old_file->path('working_dir')."/") === 0){
return $this->response('error', parent::getError('move-parent'));
}
}
if ($old_file->hasThumb()) {
$new_file_thmub = $this->lfm->setName($item)->thumb()->dir($target);
/* if ($is_directory) {
event(new FolderIsMoving($old_file->path(), $new_file_thmub->path()));
} else {
event(new FileIsMoving($old_file->path(), $new_file_thmub->path()));
}*/
$this->lfm->setName($item)->thumb()->move($new_file_thmub);
}
$new_file = $this->lfm->setName($item)->dir($target);
$this->lfm->setName($item)->move($new_file);
if ($is_directory) {
event(new FolderWasMoving($old_file->path(), $new_file->path()));
} else {
event(new FileWasMoving($old_file->path(), $new_file->path()));
$model = $old_file->model();
if($model){
$model->folder_id = $new_file->getModelParentFolderId();
$model->save();
}
/* if ($is_directory) {
event(new FolderWasMoving($old_file->path(), $new_file->path()));
} else {
event(new FileWasMoving($old_file->path(), $new_file->path()));
}*/
};
return parent::$success_response;

View file

@ -4,6 +4,7 @@ namespace IqContent\LaravelFilemanager\Controllers;
use IqContent\LaravelFilemanager\Lfm;
use IqContent\LaravelFilemanager\LfmPath;
use IqContent\LaravelFilemanager\Models\IQContentFolder;
class LfmController extends Controller
{
@ -12,6 +13,7 @@ class LfmController extends Controller
public function __construct()
{
$this->applyIniOverrides();
$this->checkRootFolder();
}
/**
@ -105,4 +107,17 @@ class LfmController extends Controller
}
}
}
public function checkRootFolder()
{
$shared_folder_name = config('lfm.shared_folder_name');
$shared_folder = IQContentFolder::where('name', $shared_folder_name)->where('folder_id', null)->first();
if(!$shared_folder){
IQContentFolder::create([
'folder_id' => null,
'name' => $shared_folder_name,
'identifier' => $shared_folder_name,
]);
}
}
}

View file

@ -15,12 +15,7 @@ class RenameController extends LfmController
$new_name = $this->helper->input('new_name');
$old_file = $this->lfm->pretty($old_name);
return $old_file->path('working_dir');
$is_directory = $old_file->isDirectory();
if (empty($new_name)) {
@ -31,7 +26,6 @@ class RenameController extends LfmController
}
}
if ($is_directory) {
if(config('lfm.alphanumeric_directory')){
$new_name = $this->helper->sanitize($new_name);
@ -62,11 +56,11 @@ class RenameController extends LfmController
$new_file = $this->lfm->setName($new_name)->path('absolute');
if ($is_directory) {
/*if ($is_directory) {
event(new FolderIsRenaming($old_file->path(), $new_file));
} else {
event(new ImageIsRenaming($old_file->path(), $new_file));
}
}*/
if ($old_file->hasThumb()) {
$this->lfm->setName($old_name)->thumb()
@ -76,15 +70,20 @@ class RenameController extends LfmController
$this->lfm->setName($old_name)
->move($this->lfm->setName($new_name));
//->renameModel($new_name)
$model = $old_file->model();
if($model && $model->id){
$model->slug = "";
$model->name = $new_name;
$model->identifier = $new_name;
$model->save();
}
if ($is_directory) {
/*if ($is_directory) {
event(new FolderWasRenamed($old_file->path(), $new_file));
} else {
event(new ImageWasRenamed($old_file->path(), $new_file));
}
}*/
return parent::$success_response;
}

View file

@ -352,6 +352,12 @@ class Lfm
'as' => 'getRename',
]);
// colorshue
Route::get('/colorshue', [
'uses' => 'ColorController@getColor',
'as' => 'getColor',
]);
// scale/resize
Route::get('/resize', [
'uses' => 'ResizeController@getResize',

View file

@ -9,7 +9,7 @@ class LfmItem
private $lfm;
private $helper;
private $columns = ['name', 'url', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'];
private $columns = ['name', 'url', 'time', 'icon', 'color', 'is_file', 'is_image', 'thumb_url'];
public $attributes = [];
public function __construct(LfmPath $lfm, Lfm $helper)
@ -47,11 +47,6 @@ class LfmItem
return $this->lfm->getModel();
}
public function deleteModel()
{
return $this->lfm->deleteModel();
}
public function path($type = 'absolute')
{
return $this->lfm->path($type);
@ -157,6 +152,17 @@ class LfmItem
//return $this->extension();
}
public function color()
{
$model = $this->model();
if($model && $model->color){
return $this->model()->color;
}
return '#';
}
public function type()
{
if ($this->isDirectory()) {
@ -205,6 +211,11 @@ class LfmItem
return $this->lfm->get();
}
public function getLfm()
{
return $this->lfm;
}
/**
* Make file size readable.
*

View file

@ -20,6 +20,7 @@ class LfmPath
private $is_thumb = false;
private $image_dimensions = "";
private $isDirectory = null;
private $parent_dir = "";
private $helper;
@ -57,45 +58,27 @@ class LfmPath
public function setName($item_name)
{
$this->item_name = $item_name;
return $this;
}
public function setModel()
{
$working_dir = $this->path('url');
$parent_dir = substr($working_dir, 0, strrpos($working_dir, '/'));
$parent_folder = IQContentFolder::where('path', $parent_dir)->first();
$parent_folder_id = $this->getModelParentFolderId();
if ($this->isDirectory()) {
if($this->folder_model == null){
$this->folder_model = new IQContentFolder();
if($parent_folder_id){
$this->folder_model = IQContentFolder::where('name', $this->item_name)->where('folder_id', $parent_folder_id)->first();
} else{
$this->folder_model = new IQContentFolder();
}
}
}else{
if($this->file_model == null){
$this->file_model = new IQContentFile();
$this->file_model = IQContentFile::where('name', $this->item_name)->where('folder_id', $parent_folder->id)->first();
}
}
//
return $this;
}
public function renameModel($new_name)
{
if ($this->isDirectory()) {
if($this->folder_model != null){
$this->folder_model->name = $new_name;
$this->folder_mode->save();
}
}else{
if($this->file_model != null){
$this->file_model->name = $new_name;
$this->file_model->save();
if($parent_folder_id){
$this->file_model = IQContentFile::where('name', $this->item_name)->where('folder_id', $parent_folder_id)->first();
}else{
$this->file_model = new IQContentFile();
}
}
}
return $this;
@ -111,12 +94,35 @@ class LfmPath
{
if ($this->isDirectory()) {
return $this->folder_model;
}else{
return $this->file_model;
}
}
public function getModelParentFolderId(){
$parent_folder = $this->getModelFolderByPath();
if($parent_folder) {
return $parent_folder->id;
}
return null;
}
public function getModelFolderByPath($parent = false){
$working_dir = $this->path('working_dir');
$working_dir = substr($working_dir, 0, strrpos($working_dir, '/'));
$dirs = explode( "/", $working_dir);
$folder_id = null;
$folder = null;
foreach ($dirs as $dir){
$folder = IQContentFolder::where('name', $dir)->where('folder_id', $folder_id)->first();
if($folder){
$folder_id = $folder->id;
$this->parent_dir = $folder;
}
}
return $this->parent_dir;
}
public function path($type = 'storage')
{
if ($type == 'working_dir') {
@ -158,7 +164,6 @@ class LfmPath
$all_folders = array_map(function ($directory_path) {
return $this->pretty($directory_path);
}, $this->storage->directories());
$folders = array_filter($all_folders, function ($directory) {
return $directory->name !== $this->helper->getThumbFolderName();
});
@ -166,6 +171,20 @@ class LfmPath
return $this->sortByColumn($folders);
}
public function recrusiveFolders($parent){
$folders = $this->folders();
$b = [];
foreach ($folders as $folder){
$b[$folder->name()] = $folder;
$lfm = $folder->getLfm();
$lfm->dir($parent);
$a = $lfm->recrusiveFolders($folder->url());
$b[$folder->name()."-childs"] = $a;
}
return $b;
}
public function files()
{
$files = array_map(function ($file_path) {
@ -195,24 +214,6 @@ class LfmPath
}
}
public function deleteModel(){
if ($this->isDirectory()) {
if($this->folder_model){
$this->folder_model->delete();
return true;
}
}else{
if($this->file_model){
$this->file_model->delete();
return true;
}
}
return false;
}
/**
* Create folder if not exist.
@ -225,19 +226,13 @@ class LfmPath
if ($this->storage->exists($this)) {
return false;
}
$working_dir = $this->path('url');
$parent_dir = substr($working_dir, 0, strrpos($working_dir, '/'));
$parent_folder = IQContentFolder::where('path', $parent_dir)->first();
$parent_folder_id = $this->getModelParentFolderId();
$this->storage->makeDirectory(0777, true, true);
IQContentFolder::create([
'folder_id' => $parent_folder->id,
'folder_id' => $parent_folder_id,
'name' => $this->item_name,
'identifier' => $this->item_name,
'path' => $this->path('url'),
]);
}
@ -320,13 +315,9 @@ class LfmPath
$new_file_path = $this->setName($new_file_name)->path('absolute');
$working_url = $this->path('url');
$working_dir = substr($working_url, 0, strrpos($working_url, '/'));
$working_folder_id = $this->getModelParentFolderId();
$working_folder = IQContentFolder::where('path', $working_dir)->first();
event(new ImageIsUploading($new_file_path));
//event(new ImageIsUploading($new_file_path));
try {
$new_file_name = $this->saveFile($file, $new_file_name);
} catch (\Exception $e) {
@ -334,17 +325,17 @@ class LfmPath
return $this->error('invalid');
}
IQContentFile::create([
'folder_id' => $working_folder->id,
'folder_id' => $working_folder_id,
'name' => $new_file_name,
'identifier' => $new_file_name,
'ext' => $file->guessClientExtension(),
'mine' => $file->getMimeType(),
'size' => $file->getSize() / 1000,
'dimensions' => $this->image_dimensions,
'content' => $working_dir,
'content' => '',
]);
// TODO should be "FileWasUploaded"
event(new ImageWasUploaded($new_file_path));
// event(new ImageWasUploaded($new_file_path));
return $new_file_name;
}

View file

@ -5,6 +5,30 @@ namespace IqContent\LaravelFilemanager\Models;
use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Model;
/**
* IqContent\LaravelFilemanager\Models\IQContentCategory
*
* @property int $id
* @property string $name
* @property string $slug
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentTag[] $tags
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentCategory whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IQContentCategory extends Model
{
use Sluggable;

View file

@ -6,6 +6,47 @@ use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
/**
* IqContent\LaravelFilemanager\Models\IQContentFile
*
* @property int $id
* @property int|null $folder_id
* @property string $name
* @property string|null $identifier
* @property string $slug
* @property string|null $ext
* @property string|null $mine
* @property int $size
* @property string|null $dimensions
* @property string|null $content
* @property int $color
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFileTag[] $file_tags
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFolder|null $folder
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereColor($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereContent($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereDimensions($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereExt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereFolderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereMine($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereSize($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFile whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IQContentFile extends Model
{

View file

@ -4,6 +4,26 @@ namespace IqContent\LaravelFilemanager\Models;
use Illuminate\Database\Eloquent\Model;
/**
* IqContent\LaravelFilemanager\Models\IQContentFileTag
*
* @property int $id
* @property int $file_id
* @property int $tag_id
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFile $file
* @property-read \IqContent\LaravelFilemanager\Models\IQContentTag $tag
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereFileId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereTagId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFileTag whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IQContentFileTag extends Model
{

View file

@ -6,6 +6,40 @@ use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
/**
* IqContent\LaravelFilemanager\Models\IQContentFolder
*
* @property int $id
* @property int|null $folder_id
* @property string $name
* @property string $slug
* @property string|null $identifier
* @property string|null $path
* @property int $color
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFile[] $files
* @property-read \IqContent\LaravelFilemanager\Models\IQContentFolder|null $folder
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFolder[] $folders
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereColor($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereFolderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereIdentifier($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder wherePath($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentFolder whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IQContentFolder extends Model
{
@ -17,7 +51,7 @@ class IQContentFolder extends Model
protected $table = 'i_q_content_folders';
protected $fillable = [
'folder_id', 'name', 'slug', 'identifier', 'path', 'color', 'pos', 'active'
'folder_id', 'name', 'slug', 'identifier', 'color', 'pos', 'active'
];

View file

@ -5,6 +5,33 @@ namespace IqContent\LaravelFilemanager\Models;
use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Model;
/**
* IqContent\LaravelFilemanager\Models\IQContentTag
*
* @property int $id
* @property int $category_id
* @property string $name
* @property string $slug
* @property int $pos
* @property int $active
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \IqContent\LaravelFilemanager\Models\IQContentCategory $category
* @property-read \Illuminate\Database\Eloquent\Collection|\IqContent\LaravelFilemanager\Models\IQContentFileTag[] $file_tags
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag findSimilarSlugs($attribute, $config, $slug)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag query()
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereActive($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereCategoryId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag wherePos($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereSlug($value)
* @method static \Illuminate\Database\Eloquent\Builder|\IqContent\LaravelFilemanager\Models\IQContentTag whereUpdatedAt($value)
* @mixin \Eloquent
*/
class IQContentTag extends Model
{
use Sluggable;

View file

@ -128,6 +128,8 @@ return [
'thumb_img_height' => 200,
'default_color' => '#ffc926',
/*
|--------------------------------------------------------------------------
| jQuery UI options

View file

@ -36,9 +36,10 @@ return [
'message-empty' => 'Ordner ist leer.',
'message-choose' => 'Datei wählen',
'message-delete' => 'Sind Sie sicher, dass Sie dieses Einzelteil löschen möchten?',
'message-delete' => 'Sind Sie sicher, dass Sie dieses Datei/Ordner löschen möchten?',
'message-name' => 'Ordnernamen:',
'message-rename' => 'Umbenennen in:',
'message-color' => 'Farbe ändern',
'message-extension_not_found' => 'Installieren Sie gd oder imagick Erweiterung um Bilder zuzuschneiden, Größe ändern und Thumbnails zu erstellen.',
'message-drop' => 'Or drop files here to upload',
@ -63,6 +64,11 @@ return [
'error-cannotresize' => 'Sie sind nicht berechtigt, die Dateigröße zu ändern',
'error-folder-not-found'=> 'Folder not found! (:folder)',
'error-size' => 'Over limit size:',
'error-move-exist' => 'Datei existiert bereits.',
'error-move-same' => 'Datei und Ziel sind gleich.',
'error-move-parent' => 'Unterordner kann nicht verschoben werden.',
'btn-upload' => 'Datei hochladen',
'btn-uploading' => 'Hochladen...',

View file

@ -0,0 +1,20 @@
@foreach($children as $name => $value)
@if(strpos($name, 'child') === false)
<li class="nav-item sub-item">
<a class="nav-link" href="#" data-type="0" onclick="moveToNewFolder(`{{$value->url}}`)" style="padding-left: {{$deep*2}}rem;">
<i class="fa fa-folder fa-fw"></i> {{ $value->name }}
<input type="hidden" id="goToFolder" name="goToFolder" value="{{ $value->url }}">
<div id="items">
@foreach($items as $i)
<input type="hidden" id="{{ $i }}" name="items[]" value="{{ $i }}">
@endforeach
</div>
</a>
</li>
@endif
@if(strpos($name, 'child') !== false)
@include('laravel-filemanager::move-item', array('children'=>$value, 'deep'=>$deep+0.5))
@endif
@endforeach

View file

@ -11,20 +11,8 @@
</div>
</a>
</li>
@foreach($root_folder->children as $directory)
<li class="nav-item sub-item">
<a class="nav-link" href="#" data-type="0" onclick="moveToNewFolder(`{{$directory->url}}`)">
<i class="fa fa-folder fa-fw"></i> {{ $directory->name }}
<input type="hidden" id="goToFolder" name="goToFolder" value="{{ $directory->url }}">
<div id="items">
@foreach($items as $i)
<input type="hidden" id="{{ $i }}" name="items[]" value="{{ $i }}">
@endforeach
</div>
</a>
</li>
@include('laravel-filemanager::move-item', array('children'=>$root_folder->children, 'deep'=>1))
@endforeach
@endforeach
</ul>
<script>

View file

@ -166,12 +166,16 @@ function toggleActions() {
rename(item);
});
$('a[data-action=item_move]').on('click', function () {
$('a[data-action=item_move]').on('click', function (e) {
var items = [];
items.push(getOneSelectedElement($(this).parents('.file-item').data('id')));
move(items);
});
$('a[data-action=item_color]').on('click', function (e) {
item = getOneSelectedElement($(this).parents('.file-item').data('id'));
colors(item);
});
$('a[data-action=item_trash]').on('click', function () {
var items = [];
@ -236,8 +240,10 @@ function toggleActions() {
function goTo(new_dir) {
$('#working_dir').val(new_dir);
loadItems();
if(!$('.dropdown-menu').hasClass('show')){
$('#working_dir').val(new_dir);
loadItems();
}
}
function getPreviousDir() {
@ -256,7 +262,11 @@ function performLfmRequest(url, parameter, type) {
$.each(parameter, function (key, value) {
data[key] = value;
});
}return $.ajax({
}
// console.log(lfm_route + '/' + url);
// console.log(type);
// console.log(data);
return $.ajax({
type: 'GET',
beforeSend: function(request) {
var token = getUrlParam('token');
@ -269,7 +279,7 @@ function performLfmRequest(url, parameter, type) {
data: data,
cache: false
}).done(function (data) {
console.log(data);
// console.log(data);
/* if(data !== "OK"){
var response = JSON.parse(data);
console.log("done");
@ -289,6 +299,7 @@ function performLfmRequest(url, parameter, type) {
console.log(textStatus);
console.log(errorThrown);
displayErrorResponse(jqXHR);
refreshFoldersAndItems();
});
}
@ -341,7 +352,7 @@ function loadItems() {
loading(true);
performLfmRequest('jsonitems', {show_list: lfm_show_list, sort_type: lfm_sort_type}, 'html')
.done(function (data) {
//console.log(data);
console.log(data);
lfm_selected = [];
var response = JSON.parse(data);
var working_dir = response.working_dir;
@ -364,6 +375,7 @@ function loadItems() {
.attr('data-id', index)
//.click(toggleSelected)
.click(function (e) {
console.log($(e.target));
if(!$(e.target).hasClass('lfm-click-disable') && !$(e.target).hasClass('dropdown-item')){
if (item.is_file) {
if($(e.target).hasClass('file-item-img') || $(e.target).hasClass('file-item-icon')){
@ -395,7 +407,11 @@ function loadItems() {
if (item.thumb_url) {
var image = $('<div>').addClass('file-item-img').css('background-image', 'url("' + item.thumb_url + '?timestamp=' + item.time + '")');
} else {
var image = $('<div>').addClass('file-item-icon text-secondary fa ' + item.icon);
var image = $('<div>').addClass('file-item-icon fa ' + item.icon).css({"color":item.color});
}
if(!item.is_file){
template.find('.link-item-download').remove();
}
template.find('.file-item-name').before(image);
template.find('.file-item-name').text(item.name);
@ -472,6 +488,15 @@ function rename(item) {
});
}
function colors(item) {
colorshue(lang['message-color'], item.color, function (color) {
performLfmRequest('colorshue', {
file: item.name,
new_color: color
}).done(refreshFoldersAndItems);
});
}
function trash(items) {
notify(lang['message-delete'], function () {
var d = performLfmRequest('delete', {
@ -530,7 +555,14 @@ function preview(item) {
var media = $('#previewTemplate').clone().attr('id', 'previewMedia').removeClass('d-none');
media.find('.media-preview').attr('src', item.url + '?timestamp=' + item.time);
if(item.icon == "fa-image" || item.icon == "fa-file-pdf"){
media.find('.media-preview').attr('src', item.url + '?timestamp=' + item.time).removeClass('d-none');
}else{
var icon = $('<div>').addClass('file-item-icon fa ' + item.icon).css('color', item.color);
media.find('.file-manager-col-view').html(icon).removeClass('d-none');
}
media.find('.media-name').html(item.name);
media.find('.media-url').val(item.url);
media.find('.media-download').attr('target', '_blank').attr('href', item.url);
@ -759,8 +791,35 @@ function dialog(title, value, callback) {
$('#dialog').on('shown.bs.modal', function () {
$('#dialog').find('input').focus();
});
$('#dialog').find('.btn-primary').unbind().click(function (e) {
$('#dialog').find('.btn-primary').unbind('click').click(function (e) {
callback($('#dialog').find('input').val());
});
$('#dialog').find('input').unbind('keypress.key13').bind('keypress.key13', function (e) {
if (e.which === 13) {
$('#dialog').find('.btn-primary').click();
}
});
$('#dialog').modal('show').find('.modal-title').text(title);
}
function colorshue(title, color, callback) {
console.log(color);
$('#minicolors-hue').minicolors('value', color);
$('#colorhue').on('shown.bs.modal', function () {
//$('#colorhue').find('input').focus();
});
$('#colorhue').find('.btn-primary').unbind('click').click(function (e) {
callback($('#colorhue').find('input').val());
});
$('#colorhue').find('input').unbind('keypress.key13').bind('keypress.key13', function (e) {
if (e.which === 13) {
$('#colorhue').find('.btn-primary').click();
}
});
$('#colorhue').modal('show').find('.modal-title').text(title);
}
$('#minicolors-hue').minicolors({
control: 'hue',
position: 'bottom ' + 'left',
});

View file

@ -60,6 +60,12 @@
margin: 0;
padding: 3rem 0;
}
#lfm_empty {
padding-bottom: 0.8em;
}
.messages-card {
overflow: visible;
}
</style>
@ -134,7 +140,8 @@
<div class="dropdown-menu">
<a class="dropdown-item" href="javascript:void(0)" data-action="item_rename"><i class="fa fa-sync-alt"></i> umbenennen</a>
<a class="dropdown-item" href="javascript:void(0)" data-action="item_move"><i class="fa fa-reply"></i> verschieben</a>
<a class="dropdown-item" href="javascript:void(0)" data-action="item_download"><i class="fa fa-download"></i> download</a>
<a class="dropdown-item link-item-download" href="javascript:void(0)" data-action="item_download"><i class="fa fa-download"></i> download</a>
<a class="dropdown-item" href="javascript:void(0)" data-action="item_color"><i class="fa fa-paint-brush"></i> Farbe</a>
<a class="dropdown-item" href="javascript:void(0)" data-action="item_trash"><i class="fa fa-trash"></i> löschen</a>
</div>
</div>
@ -190,8 +197,6 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aia-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
{!! Form::open([ 'url' => route('iqcontent.lfm.upload'), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'uploadForm' ]) !!}
<div class="form-group" id="attachment">
<div class="controls text-center">
@ -244,9 +249,27 @@
</div>
</div>
<div class="modal fade" id="colorhue" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<input type="text" name="color" id="minicolors-hue" class="form-control" value="#fff">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary w-100" data-dismiss="modal">{{ trans('laravel-filemanager::lfm.btn-close') }}</button>
<button type="button" class="btn btn-primary w-100" data-dismiss="modal">{{ trans('laravel-filemanager::lfm.btn-confirm') }}</button>
</div>
</div>
</div>
</div>
<div id="previewTemplate" class="d-none bg-light text-center">
<div class="ui-bordered">
<img src="#" alt="" class="img-fluid media-preview" style="background-color: #fff;">
<img src="#" alt="" class="img-fluid media-preview d-none" style="background-color: #fff;">
<div class="file-manager-col-view d-none"></div>
<div class="p-3">
<span class="float-right"><a href="#" class="media-download"><i class="fas fa-external-link-alt"></i></a></span>
<h5 class="media-name"> </h5>

View file

@ -120,10 +120,9 @@
<li class="sidenav-divider mb-1"></li>
<li class="sidenav-header small font-weight-semibold">ADMIN CMS</li>
@if(Auth::user()->isPermission('cms-iq-assets'))
<!-- <li class="sidenav-item{{ Request::is('iq/content/assets') ? ' active' : '' }}">
<li class="sidenav-item{{ Request::is('iq/content/assets') ? ' active' : '' }}">
<a href="{{ route('iq_content_assets') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-images"></i><div>Medien</div></a>
</li>
-->
@endif
@if(Auth::user()->isPermission('cms-tg'))

View file

@ -141,10 +141,6 @@ Route::group(['middleware' => ['admin']], function()
Route::post('/iq/content/tree/detail/{id}/{node_id?}/{area_section_id?}', 'IQ\ContentTreeController@store')->name('iq_content_tree_detail');
Route::get('/iq/content/tree/detail/remove_site/{id}/{node_id}/{travel_guide_id}/{r?}', 'IQ\ContentTreeController@removeSite')->name('iq_content_tree_detail_remove_site');
Route::get('/iq/content/tree/repair/{id}', 'IQ\ContentTreeController@repair')->name('iq_content_tree_repair');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 MiB

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 794 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

View file

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 9 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -0,0 +1,181 @@
$(function() {
var gridColor = '#aaaaaa';
var gridBorder = '#eeeeee';
$.plot($('#flot-graph'), [
{
label: 'Visits',
data: [
[ 6, 196 ], [ 7, 175 ], [ 8, 212 ], [ 9, 247 ], [ 10, 152 ], [ 11, 225 ], [ 12, 155 ], [ 13, 203 ], [ 14, 166 ], [ 15, 151 ]
]
},
{
label: 'Returning visits',
data: [
[ 6, 49 ], [ 7, 56 ], [ 8, 30 ], [ 9, 29 ], [ 10, 66 ], [ 11, 2 ], [ 12, 2 ], [ 13, 8 ], [ 14, 34 ], [ 15, 63 ]
]
}
], {
series: {
lines: {
show: true,
lineWidth: 2
},
points: {
show: true,
radius: 4
}
},
grid: {
color: gridColor,
borderColor: gridBorder,
borderWidth: 1,
hoverable: true,
clickable: true
},
xaxis: { tickColor: gridBorder, },
yaxis: { tickColor: gridBorder, },
legend: {
show: true,
position: 'ne'
},
tooltip: { show: true },
colors: ["#607D8B", "#4CAF50"]
});
$.plot($('#flot-bars'), [
{
label: 'Visits',
data: [
[ 6, 156 ], [ 7, 195 ], [ 8, 171 ], [ 9, 211 ], [ 10, 150 ], [ 11, 169 ], [ 12, 173 ], [ 13, 200 ], [ 14, 233 ], [ 15, 161 ]
]
},
{
label: 'Returning visits',
data: [
[ 6, 24 ], [ 7, 20 ], [ 8, 31 ], [ 9, 4 ], [ 10, 92 ], [ 11, 87 ], [ 12, 28 ], [ 13, 21 ], [ 14, 80 ], [ 15, 76 ]
]
}
], {
series: {
bars: {
show: true,
barWidth: .6,
align: 'center',
lineWidth: 1,
fill: 0.25
}
},
grid: {
color: gridColor,
borderColor: gridBorder,
borderWidth: 1,
hoverable: true,
clickable: true
},
xaxis: { tickDecimals: 2, tickColor: gridBorder },
yaxis: { tickColor: gridBorder },
legend: {
show: true,
position: 'ne'
},
tooltip: { show: true },
colors: ['#FF5722', '#0288D1']
});
$.plot($('#flot-categories'), [
{
label: 'iPhone',
data: [
[ "2010.Q1", 35 ], [ '2010.Q2', 67 ], [ '2010.Q3', 13 ], [ '2010.Q4', 75 ]
]
},
{
label: 'iPad',
data: [
[ "2010.Q1", 18 ], [ '2010.Q2', 80 ], [ '2010.Q3', 72 ], [ '2010.Q4', 33 ]
]
},
{
label: 'iTouch',
data: [
[ '2010.Q1', 32 ], [ '2010.Q2', 49 ], [ '2010.Q3', 25 ], [ '2010.Q4', 87 ]
]
}
], {
series: {
lines: {
show: true,
fill: 0.1,
lineWidth: 1
}
},
grid: {
color: gridColor,
borderColor: gridBorder,
borderWidth: 1,
hoverable: true,
clickable: true
},
xaxis: { mode: 'categories', tickColor: gridBorder },
yaxis: { tickColor: gridBorder },
legend: {
show: true,
position: 'ne'
},
tooltip: {
show: true,
content: '%s: %y'
},
colors: ['#E040FB', '#E91E63', '#00BCD4']
});
$.plot($('#flot-pie'), [
{ label: 'Series1', data: 77 },
{ label: 'Series2', data: 81 },
{ label: 'Series3', data: 46 },
{ label: 'Series4', data: 35 },
{ label: 'Series5', data: 79 },
{ label: 'Series6', data: 84 },
{ label: 'Series7', data: 51 }
], {
series: {
pie: {
show: true,
radius: 1,
innerRadius: 0.5,
label: {
show: true,
radius: 3 / 4,
background: { opacity: 0 },
formatter: function(label, series) {
return '<div style="font-size:11px;text-align:center;color:white;">' + Math.round(series.percent) + '%</div>';
}
}
}
},
grid: {
color: gridColor,
borderColor: gridBorder,
borderWidth: 1,
hoverable: true,
clickable: true
},
xaxis: { tickColor: gridBorder },
yaxis: { tickColor: gridBorder },
colors: ['#4CAF50', '#FF5722', '#607D8B', '#009688', '#E91E63', '#795548', '#0288D1']
});
});

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB