From d746d5b52bbe91f0f12c165fc4b3c0a6078ad537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 22 Aug 2016 23:29:04 +0200 Subject: [PATCH] FEATURE: add content page overview --- app/Helpers/Template.php | 13 ++ .../Controllers/Admin/ContentOverview.php | 8 +- app/Models/Content.php | 2 +- app/Providers/GlobalViewDataProvider.php | 9 +- config/app.php | 170 +++++++++--------- resources/assets/admin/css/vendor.css | 33 ++++ resources/assets/admin/img/placeholder.png | Bin 0 -> 4395 bytes resources/lang/en/admin/contents.php | 7 +- .../views/admin/content/overview.blade.php | 154 +++++++++++++++- resources/views/admin/layout.blade.php | 18 ++ .../admin/layoutWithNavigation.blade.php | 2 +- 11 files changed, 319 insertions(+), 97 deletions(-) create mode 100644 resources/assets/admin/img/placeholder.png diff --git a/app/Helpers/Template.php b/app/Helpers/Template.php index b0fef70f..a085d384 100644 --- a/app/Helpers/Template.php +++ b/app/Helpers/Template.php @@ -74,4 +74,17 @@ class Template return config('app.url') . '/assets/' . config('app.theme') . '/' . $path; } + + public static function date($datestamp, $withTime = true) + { + $timestamp = strtotime($datestamp); + + if ($timestamp <= 0) { + return ''; + } + + $format = $withTime ? config('app.datetime_format') : config('app.date_format'); + + return date($format, $timestamp); + } } \ No newline at end of file diff --git a/app/Http/Controllers/Admin/ContentOverview.php b/app/Http/Controllers/Admin/ContentOverview.php index 95954ec4..d6b95f39 100644 --- a/app/Http/Controllers/Admin/ContentOverview.php +++ b/app/Http/Controllers/Admin/ContentOverview.php @@ -1,6 +1,7 @@ content->getHomepage(); - return view('admin.content.overview', ['pages' => $pages, 'homepage' => $homepage]); + return view('admin.content.overview', [ + 'pages' => $pages, + 'homepage' => $homepage, + 'statuses' => ContentStatuses::getWithTranslations(), + 'module' => isset($module) ? $module : null + ]); } } \ No newline at end of file diff --git a/app/Models/Content.php b/app/Models/Content.php index 4fec44d0..8d13ee10 100644 --- a/app/Models/Content.php +++ b/app/Models/Content.php @@ -185,7 +185,7 @@ class Content extends Model public function getOverview($handler = false, $status = false, $joinAuthor = false, $joinParent = false) { $query = DB::table('contents') - ->select('contents.*', 'modules.name AS module_name') + ->select('contents.*', 'modules.name AS module_name', 'modules.id AS module_id') ->where('contents.status', '<>', self::STATUS_DELETED) ->where('contents.language', LaravelLocalization::getCurrentLocale()) ->join('modules', 'modules.handler', '=', 'contents.module_handler') diff --git a/app/Providers/GlobalViewDataProvider.php b/app/Providers/GlobalViewDataProvider.php index 957f06d8..c0c92845 100644 --- a/app/Providers/GlobalViewDataProvider.php +++ b/app/Providers/GlobalViewDataProvider.php @@ -80,7 +80,14 @@ class GlobalViewDataProvider extends ServiceProvider return preg_replace($pattern, $code, $view); }); - + + Blade::extend(function ($view) { + $pattern = $this->createPattern('date'); + $code = ''; + + return preg_replace($pattern, $code, $view); + }); + // register extension for rendering widget areas Blade::extend(function ($view) { $pattern = $this->createPattern('widgetArea'); diff --git a/config/app.php b/config/app.php index 443ea671..dd7ce301 100644 --- a/config/app.php +++ b/config/app.php @@ -85,19 +85,23 @@ return [ | */ - 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-CBC', + 'key' => env('APP_KEY'), + 'cipher' => 'AES-256-CBC', /* * Upload path used for storing all uploaded files */ - 'upload_path' => env('UPLOAD_PATH', public_path('uploads')), - 'thumbnail_path' => env('THUMBNAIL_PATH', public_path('uploads/thumbnails')), + 'upload_path' => env('UPLOAD_PATH', public_path('uploads')), + 'thumbnail_path' => env('THUMBNAIL_PATH', public_path('uploads/thumbnails')), /* * Artisan cannot access to website URL, therefore we need to use PHP_SAPI const for determining running from CLI. */ - 'upload_url' => env('UPLOAD_URL', PHP_SAPI === 'cli' ? '' : url('uploads')), - 'thumbnail_url' => env('THUMBNAIL_URL', PHP_SAPI === 'cli' ? '' : url('uploads/thumbnails')), - 'theme' => env('THEME'), + 'upload_url' => env('UPLOAD_URL', PHP_SAPI === 'cli' ? '' : url('uploads')), + 'thumbnail_url' => env('THUMBNAIL_URL', PHP_SAPI === 'cli' ? '' : url('uploads/thumbnails')), + 'theme' => env('THEME'), + 'datetime_format' => 'd. m. Y G:i', + 'date_format' => 'd. m. Y', + 'datetime_format_js' => 'dd-mm-yyyy hh:ii', + 'date_format_js' => 'dd-mm-yyyy', /* |-------------------------------------------------------------------------- | Logging Configuration @@ -125,49 +129,49 @@ return [ 'providers' => [ - /* - * Laravel Framework Service Providers... - */ - Illuminate\Auth\AuthServiceProvider::class, - Illuminate\Broadcasting\BroadcastServiceProvider::class, - Illuminate\Bus\BusServiceProvider::class, - Illuminate\Cache\CacheServiceProvider::class, - Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, - Illuminate\Cookie\CookieServiceProvider::class, - Illuminate\Database\DatabaseServiceProvider::class, - Illuminate\Encryption\EncryptionServiceProvider::class, - Illuminate\Filesystem\FilesystemServiceProvider::class, - Illuminate\Foundation\Providers\FoundationServiceProvider::class, - Illuminate\Hashing\HashServiceProvider::class, - Illuminate\Mail\MailServiceProvider::class, - Illuminate\Pagination\PaginationServiceProvider::class, - Illuminate\Pipeline\PipelineServiceProvider::class, - Illuminate\Queue\QueueServiceProvider::class, - Illuminate\Redis\RedisServiceProvider::class, - Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, - Illuminate\Session\SessionServiceProvider::class, - Illuminate\Translation\TranslationServiceProvider::class, - Illuminate\Validation\ValidationServiceProvider::class, - Illuminate\View\ViewServiceProvider::class, - Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class, - // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json - App\Providers\ModuleManager::class, - Pingpong\Modules\ModulesServiceProvider::class, - Pingpong\Menus\MenusServiceProvider::class, - App\Providers\SubmodulesManager::class, + /* + * Laravel Framework Service Providers... + */ + Illuminate\Auth\AuthServiceProvider::class, + Illuminate\Broadcasting\BroadcastServiceProvider::class, + Illuminate\Bus\BusServiceProvider::class, + Illuminate\Cache\CacheServiceProvider::class, + Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, + Illuminate\Cookie\CookieServiceProvider::class, + Illuminate\Database\DatabaseServiceProvider::class, + Illuminate\Encryption\EncryptionServiceProvider::class, + Illuminate\Filesystem\FilesystemServiceProvider::class, + Illuminate\Foundation\Providers\FoundationServiceProvider::class, + Illuminate\Hashing\HashServiceProvider::class, + Illuminate\Mail\MailServiceProvider::class, + Illuminate\Pagination\PaginationServiceProvider::class, + Illuminate\Pipeline\PipelineServiceProvider::class, + Illuminate\Queue\QueueServiceProvider::class, + Illuminate\Redis\RedisServiceProvider::class, + Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, + Illuminate\Session\SessionServiceProvider::class, + Illuminate\Translation\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, + Illuminate\View\ViewServiceProvider::class, + Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class, + // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json + App\Providers\ModuleManager::class, + Pingpong\Modules\ModulesServiceProvider::class, + Pingpong\Menus\MenusServiceProvider::class, + App\Providers\SubmodulesManager::class, - Franzose\ClosureTable\ClosureTableServiceProvider::class, - \Watson\Sitemap\SitemapServiceProvider::class, - /* - * Application Service Providers... - */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, - App\Providers\GlobalViewDataProvider::class, + Franzose\ClosureTable\ClosureTableServiceProvider::class, + \Watson\Sitemap\SitemapServiceProvider::class, + /* + * Application Service Providers... + */ + App\Providers\AppServiceProvider::class, + App\Providers\AuthServiceProvider::class, + App\Providers\EventServiceProvider::class, + App\Providers\RouteServiceProvider::class, + App\Providers\GlobalViewDataProvider::class, - ], +], /* |-------------------------------------------------------------------------- | Class Aliases @@ -181,41 +185,41 @@ return [ 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, - 'Menu' => Pingpong\Menus\MenuFacade::class, - 'Module' => Pingpong\Modules\Facades\Module::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Sitemap' => Watson\Sitemap\Facades\Sitemap::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Validator' => Illuminate\Support\Facades\Validator::class, - 'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class, - 'View' => Illuminate\Support\Facades\View::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, + 'Menu' => Pingpong\Menus\MenuFacade::class, + 'Module' => Pingpong\Modules\Facades\Module::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Sitemap' => Watson\Sitemap\Facades\Sitemap::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class, + 'View' => Illuminate\Support\Facades\View::class, - ], +], ]; diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css index ac0fd097..e3ed6ccf 100644 --- a/resources/assets/admin/css/vendor.css +++ b/resources/assets/admin/css/vendor.css @@ -13028,6 +13028,11 @@ a:focus { .form-control { margin: .3em 0; } + +.text-center { + text-align: center; +} + .has-error { color: #FF4444; font-size: 13px; @@ -13037,4 +13042,32 @@ a:focus { .tab-with-error { color: red !important; font-weight: bold; +} + +.item-col-header { + outline: solid 1px; +} + +.full-width { + width: 100%; +} + +.content-overview.item-list { + display: table; +} + +.table.content-overview td{ + vertical-align: middle !important; +} + +.content-overview .with-placeholder { + max-width: 3em; +} + +.content-overview .placeholder { + max-height: 3em; +} + +.item-list .item-actions-dropdown.active .item-actions-block { + max-width: 300px !important; } \ No newline at end of file diff --git a/resources/assets/admin/img/placeholder.png b/resources/assets/admin/img/placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf52229da08684f69e4ae9ee249bc992a18bea9 GIT binary patch literal 4395 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 'Files', 'lockUrl' => 'Keep URL', 'noCategory' => ' -- No category -- ', - 'noTemplates' => 'Cannot create content page. There are no available templates for this module.' + 'noTemplates' => 'Cannot create content page. There are no available templates for this module.', + 'title' => 'Title', + 'createdAt' => 'Created at', + 'status' => 'Status', + 'moduleName' => 'Module', + 'actions' => 'Actions' ]; \ No newline at end of file diff --git a/resources/views/admin/content/overview.blade.php b/resources/views/admin/content/overview.blade.php index 266571c1..c1086b0e 100644 --- a/resources/views/admin/content/overview.blade.php +++ b/resources/views/admin/content/overview.blade.php @@ -1,6 +1,14 @@ @extends('admin.layoutWithNavigation') @section('pageHeading', @trans('admin/contents.overview')) +@section('headerButtons') + + @if($module) + + + + @endif +@endsection @section('content') @if (!$homepage) @@ -14,20 +22,130 @@ @endif + @if (count($pages)) - +
- - - + + + + + @foreach($pages as $page) - - - - + + + + + + @endforeach
@lang('admin/contents.title')@lang('admin/contents.status')@lang('admin/contents.moduleName')@lang('admin/contents.createdAt')@lang('admin/contents.actions')
+ + @if(!empty($page->title_photo)) + {{$page->title}} + @else + {{$page->title}} + @endif + + + + {{$page->title}} + + {{$statuses[$page->status]}} + + {{trans($page->module_name)}} + + @date($page->created_at) +
+ + + + + + + + +
+ +
+
+ +
@@ -41,4 +159,22 @@ @lang('admin/contents.noPagesAvailable') @endif -@endsection \ No newline at end of file +@endsection + + + + + + + + + + + + + + + + + + diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php index 3f89e985..b9cb30fe 100644 --- a/resources/views/admin/layout.blade.php +++ b/resources/views/admin/layout.blade.php @@ -42,6 +42,24 @@ @yield('page') + + +
diff --git a/resources/views/admin/layoutWithNavigation.blade.php b/resources/views/admin/layoutWithNavigation.blade.php index 799da4b9..ebf5e125 100644 --- a/resources/views/admin/layoutWithNavigation.blade.php +++ b/resources/views/admin/layoutWithNavigation.blade.php @@ -146,7 +146,7 @@

- @yield('pageHeading') + @yield('pageHeading') @yield('headerButtons')

@yield('pageDescription')