diff --git a/composer.json b/composer.json index c849394..21ba437 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "typicms/core": "~2.9.0" + "laravel/framework": "~5.5.0" }, "autoload": { "psr-4": { diff --git a/src/Composers/SidebarViewComposer.php b/src/Composers/SidebarViewComposer.php index ce96661..df15577 100644 --- a/src/Composers/SidebarViewComposer.php +++ b/src/Composers/SidebarViewComposer.php @@ -11,16 +11,18 @@ class SidebarViewComposer { public function compose(View $view) { - $view->sidebar->group(trans('global.menus.content'), function (SidebarGroup $group) { - $group->addItem(trans('partners::global.name'), function (SidebarItem $item) { + if (Gate::denies('see-all-partners')) { + return; + } + $view->sidebar->group(__('Content'), function (SidebarGroup $group) { + $group->id = 'content'; + $group->weight = 30; + $group->addItem(__('Partners'), function (SidebarItem $item) { $item->id = 'partners'; $item->icon = config('typicms.partners.sidebar.icon', 'icon fa fa-fw fa-cubes'); $item->weight = config('typicms.partners.sidebar.weight'); $item->route('admin::index-partners'); $item->append('admin::create-partner'); - $item->authorize( - Gate::allows('index-partners') - ); }); }); } diff --git a/src/Facades/Facade.php b/src/Facades/Partners.php similarity index 57% rename from src/Facades/Facade.php rename to src/Facades/Partners.php index 1c6d0ea..52ba4e8 100644 --- a/src/Facades/Facade.php +++ b/src/Facades/Partners.php @@ -2,9 +2,9 @@ namespace TypiCMS\Modules\Partners\Facades; -use Illuminate\Support\Facades\Facade as MainFacade; +use Illuminate\Support\Facades\Facade; -class Facade extends MainFacade +class Partners extends Facade { /** * Get the registered name of the component. @@ -13,6 +13,6 @@ class Facade extends MainFacade */ protected static function getFacadeAccessor() { - return 'TypiCMS\Modules\Partners\Repositories\PartnerInterface'; + return 'Partners'; } } diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php index e10d5e8..c2d8a14 100644 --- a/src/Http/Controllers/AdminController.php +++ b/src/Http/Controllers/AdminController.php @@ -5,11 +5,11 @@ use TypiCMS\Modules\Core\Http\Controllers\BaseAdminController; use TypiCMS\Modules\Partners\Http\Requests\FormRequest; use TypiCMS\Modules\Partners\Models\Partner; -use TypiCMS\Modules\Partners\Repositories\PartnerInterface; +use TypiCMS\Modules\Partners\Repositories\EloquentPartner; class AdminController extends BaseAdminController { - public function __construct(PartnerInterface $partner) + public function __construct(EloquentPartner $partner) { parent::__construct($partner); } @@ -21,7 +21,7 @@ public function __construct(PartnerInterface $partner) */ public function index() { - $models = $this->repository->all([], true); + $models = $this->repository->with('image')->findAll(); app('JavaScript')->put('models', $models); return view('partners::admin.index'); @@ -34,7 +34,8 @@ public function index() */ public function create() { - $model = $this->repository->getModel(); + $model = $this->repository->createModel(); + app('JavaScript')->put('model', $model); return view('partners::admin.create') ->with(compact('model')); @@ -49,6 +50,8 @@ public function create() */ public function edit(Partner $partner) { + app('JavaScript')->put('model', $partner); + return view('partners::admin.edit') ->with(['model' => $partner]); } @@ -77,8 +80,24 @@ public function store(FormRequest $request) */ public function update(Partner $partner, FormRequest $request) { - $this->repository->update($request->all()); + $this->repository->update($request->id, $request->all()); return $this->redirect($request, $partner); } + + /** + * Remove the specified resource from storage. + * + * @param \TypiCMS\Modules\Partners\Models\Partner $partner + * + * @return \Illuminate\Http\JsonResponse + */ + public function destroy(Partner $partner) + { + $deleted = $this->repository->delete($partner); + + return response()->json([ + 'error' => !$deleted, + ]); + } } diff --git a/src/Http/Controllers/ApiController.php b/src/Http/Controllers/ApiController.php deleted file mode 100644 index 693bea4..0000000 --- a/src/Http/Controllers/ApiController.php +++ /dev/null @@ -1,64 +0,0 @@ -repository->create(Request::all()); - $error = $model ? false : true; - - return response()->json([ - 'error' => $error, - 'model' => $model, - ], 200); - } - - /** - * Update the specified resource in storage. - * - * @param $model - * - * @return \Illuminate\Http\JsonResponse - */ - public function update() - { - $updated = $this->repository->update(Request::all()); - - return response()->json([ - 'error' => !$updated, - ]); - } - - /** - * Remove the specified resource from storage. - * - * @param \TypiCMS\Modules\Partners\Models\Partner $partner - * - * @return \Illuminate\Http\JsonResponse - */ - public function destroy(Partner $partner) - { - $deleted = $this->repository->delete($partner); - - return response()->json([ - 'error' => !$deleted, - ]); - } -} diff --git a/src/Http/Controllers/PublicController.php b/src/Http/Controllers/PublicController.php index 0520367..41c8709 100644 --- a/src/Http/Controllers/PublicController.php +++ b/src/Http/Controllers/PublicController.php @@ -3,11 +3,11 @@ namespace TypiCMS\Modules\Partners\Http\Controllers; use TypiCMS\Modules\Core\Http\Controllers\BasePublicController; -use TypiCMS\Modules\Partners\Repositories\PartnerInterface; +use TypiCMS\Modules\Partners\Repositories\EloquentPartner; class PublicController extends BasePublicController { - public function __construct(PartnerInterface $partner) + public function __construct(EloquentPartner $partner) { parent::__construct($partner); } @@ -19,7 +19,7 @@ public function __construct(PartnerInterface $partner) */ public function index() { - $models = $this->repository->all(); + $models = $this->repository->published()->findAll(); return view('partners::public.index') ->with(compact('models')); @@ -32,7 +32,7 @@ public function index() */ public function show($slug) { - $model = $this->repository->bySlug($slug); + $model = $this->repository->published()->bySlug($slug); return view('partners::public.show') ->with(compact('model')); diff --git a/src/Http/Requests/FormRequest.php b/src/Http/Requests/FormRequest.php index 1b2c4fe..a1b5dd6 100644 --- a/src/Http/Requests/FormRequest.php +++ b/src/Http/Requests/FormRequest.php @@ -9,11 +9,11 @@ class FormRequest extends AbstractFormRequest public function rules() { return [ - 'position' => 'required|integer|min:1', - 'image' => 'image|max:2000', - '*.title' => 'max:255', - '*.slug' => 'max:255', - '*.website' => 'url', + 'position' => 'required|integer|min:1', + 'image_id' => 'nullable|integer', + 'title.*' => 'nullable|max:255', + 'slug.*' => 'nullable|alpha_dash|max:255', + 'website.*' => 'nullable|url', ]; } } diff --git a/src/Models/Partner.php b/src/Models/Partner.php index 4c65b58..ea005b8 100644 --- a/src/Models/Partner.php +++ b/src/Models/Partner.php @@ -2,31 +2,24 @@ namespace TypiCMS\Modules\Partners\Models; -use Dimsav\Translatable\Translatable; use Laracasts\Presenter\PresentableTrait; +use Spatie\Translatable\HasTranslations; use TypiCMS\Modules\Core\Models\Base; +use TypiCMS\Modules\Files\Models\File; use TypiCMS\Modules\History\Traits\Historable; +use TypiCMS\Modules\Partners\Presenters\ModulePresenter; class Partner extends Base { + use HasTranslations; use Historable; use PresentableTrait; - use Translatable; - protected $presenter = 'TypiCMS\Modules\Partners\Presenters\ModulePresenter'; + protected $presenter = ModulePresenter::class; - protected $fillable = [ - 'image', - 'position', - 'homepage', - ]; + protected $guarded = ['id', 'exit']; - /** - * Translatable model configs. - * - * @var array - */ - public $translatedAttributes = [ + public $translatable = [ 'title', 'slug', 'status', @@ -35,35 +28,41 @@ class Partner extends Base 'body', ]; - protected $appends = ['status', 'title', 'thumb', 'website']; + protected $appends = ['thumb', 'title_translated', 'website_translated', 'status_translated']; /** - * Columns that are file. + * Append title_translated attribute. * - * @var array + * @return string */ - public $attachments = [ - 'image', - ]; + public function getTitleTranslatedAttribute() + { + $locale = config('app.locale'); + + return $this->translate('title', config('typicms.content_locale', $locale)); + } /** - * Append status attribute from translation table. + * Append status_translated attribute. * * @return string */ - public function getStatusAttribute($value) + public function getStatusTranslatedAttribute() { - return $value; + $locale = config('app.locale'); + + return $this->translate('status', config('typicms.content_locale', $locale)); } /** - * Append title attribute from translation table. + * Append website_translated attribute. * - * @return string title + * @return string */ - public function getTitleAttribute($value) + public function getWebsiteTranslatedAttribute() { - return $value; + $locale = config('app.locale'); + return $this->translate('website', config('typicms.content_locale', $locale)); } /** @@ -77,12 +76,12 @@ public function getThumbAttribute() } /** - * Append website attribute from translation table. + * This model belongs to one image. * - * @return string + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function getWebsiteAttribute($value) + public function image() { - return $value; + return $this->belongsTo(File::class, 'image_id'); } } diff --git a/src/Models/PartnerTranslation.php b/src/Models/PartnerTranslation.php deleted file mode 100644 index 4e28e11..0000000 --- a/src/Models/PartnerTranslation.php +++ /dev/null @@ -1,25 +0,0 @@ -belongsTo('TypiCMS\Modules\Partners\Models\Partner', 'partner_id'); - } -} diff --git a/src/Providers/ModuleProvider.php b/src/Providers/ModuleProvider.php index 2e6a59e..de2d9f2 100644 --- a/src/Providers/ModuleProvider.php +++ b/src/Providers/ModuleProvider.php @@ -3,15 +3,12 @@ namespace TypiCMS\Modules\Partners\Providers; use Illuminate\Foundation\AliasLoader; -use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; use TypiCMS\Modules\Core\Facades\TypiCMS; -use TypiCMS\Modules\Core\Observers\FileObserver; use TypiCMS\Modules\Core\Observers\SlugObserver; -use TypiCMS\Modules\Core\Services\Cache\LaravelCache; +use TypiCMS\Modules\Partners\Composers\SidebarViewComposer; +use TypiCMS\Modules\Partners\Facades\Partners; use TypiCMS\Modules\Partners\Models\Partner; -use TypiCMS\Modules\Partners\Models\PartnerTranslation; -use TypiCMS\Modules\Partners\Repositories\CacheDecorator; use TypiCMS\Modules\Partners\Repositories\EloquentPartner; class ModuleProvider extends ServiceProvider @@ -21,59 +18,47 @@ public function boot() $this->mergeConfigFrom( __DIR__.'/../config/config.php', 'typicms.partners' ); + $this->mergeConfigFrom( + __DIR__.'/../config/permissions.php', 'typicms.permissions' + ); $modules = $this->app['config']['typicms']['modules']; $this->app['config']->set('typicms.modules', array_merge(['partners' => ['linkable_to_page']], $modules)); $this->loadViewsFrom(__DIR__.'/../resources/views/', 'partners'); - $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'partners'); + $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); $this->publishes([ __DIR__.'/../resources/views' => base_path('resources/views/vendor/partners'), ], 'views'); - $this->publishes([ - __DIR__.'/../database' => base_path('database'), - ], 'migrations'); - AliasLoader::getInstance()->alias( - 'Partners', - 'TypiCMS\Modules\Partners\Facades\Facade' - ); + AliasLoader::getInstance()->alias('Partners', Partners::class); // Observers - PartnerTranslation::observe(new SlugObserver()); - Partner::observe(new FileObserver()); - } - - public function register() - { - $app = $this->app; - - /* - * Register route service provider - */ - $app->register('TypiCMS\Modules\Partners\Providers\RouteServiceProvider'); + Partner::observe(new SlugObserver()); /* * Sidebar view composer */ - $app->view->composer('core::admin._sidebar', 'TypiCMS\Modules\Partners\Composers\SidebarViewComposer'); + $this->app->view->composer('core::admin._sidebar', SidebarViewComposer::class); /* * Add the page in the view. */ - $app->view->composer('partners::public.*', function ($view) { + $this->app->view->composer('partners::public.*', function ($view) { $view->page = TypiCMS::getPageLinkedToModule('partners'); }); + } - $app->bind('TypiCMS\Modules\Partners\Repositories\PartnerInterface', function (Application $app) { - $repository = new EloquentPartner(new Partner()); - if (!config('typicms.cache')) { - return $repository; - } - $laravelCache = new LaravelCache($app['cache'], 'partners', 10); + public function register() + { + $app = $this->app; - return new CacheDecorator($repository, $laravelCache); - }); + /* + * Register route service provider + */ + $app->register(RouteServiceProvider::class); + + $app->bind('Partners', EloquentPartner::class); } } diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php index 6053df0..c3e6b20 100644 --- a/src/Providers/RouteServiceProvider.php +++ b/src/Providers/RouteServiceProvider.php @@ -4,6 +4,7 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Routing\Router; +use Illuminate\Support\Facades\Route; use TypiCMS\Modules\Core\Facades\TypiCMS; class RouteServiceProvider extends ServiceProvider @@ -20,23 +21,21 @@ class RouteServiceProvider extends ServiceProvider /** * Define the routes for the application. * - * @param \Illuminate\Routing\Router $router - * - * @return void + * @return null */ - public function map(Router $router) + public function map() { - $router->group(['namespace' => $this->namespace], function (Router $router) { + Route::group(['namespace' => $this->namespace], function (Router $router) { /* * Front office routes */ if ($page = TypiCMS::getPageLinkedToModule('partners')) { $options = $page->private ? ['middleware' => 'auth'] : []; - foreach (config('translatable.locales') as $lang) { - if ($page->translate($lang)->status && $uri = $page->uri($lang)) { - $router->get($uri, $options + ['as' => $lang.'.partners', 'uses' => 'PublicController@index']); - $router->get($uri.'/{slug}', $options + ['as' => $lang.'.partners.slug', 'uses' => 'PublicController@show']); + foreach (locales() as $lang) { + if ($page->translate('status', $lang) && $uri = $page->uri($lang)) { + $router->get($uri, $options + ['uses' => 'PublicController@index'])->name($lang.'::index-partners'); + $router->get($uri.'/{slug}', $options + ['uses' => 'PublicController@show'])->name($lang.'::partner'); } } } @@ -44,18 +43,15 @@ public function map(Router $router) /* * Admin routes */ - $router->get('admin/partners', 'AdminController@index')->name('admin::index-partners'); - $router->get('admin/partners/create', 'AdminController@create')->name('admin::create-partner'); - $router->get('admin/partners/{partner}/edit', 'AdminController@edit')->name('admin::edit-partner'); - $router->post('admin/partners', 'AdminController@store')->name('admin::store-partner'); - $router->put('admin/partners/{partner}', 'AdminController@update')->name('admin::update-partner'); - - /* - * API routes - */ - $router->get('api/partners', 'ApiController@index')->name('api::index-partners'); - $router->put('api/partners/{partner}', 'ApiController@update')->name('api::update-partner'); - $router->delete('api/partners/{partner}', 'ApiController@destroy')->name('api::destroy-partner'); + $router->group(['middleware' => 'admin', 'prefix' => 'admin'], function (Router $router) { + $router->get('partners', 'AdminController@index')->name('admin::index-partners')->middleware('can:see-all-partners'); + $router->get('partners/create', 'AdminController@create')->name('admin::create-partner')->middleware('can:create-partner'); + $router->get('partners/{partner}/edit', 'AdminController@edit')->name('admin::edit-partner')->middleware('can:update-partner'); + $router->post('partners', 'AdminController@store')->name('admin::store-partner')->middleware('can:create-partner'); + $router->put('partners/{partner}', 'AdminController@update')->name('admin::update-partner')->middleware('can:update-partner'); + $router->patch('partners/{ids}', 'AdminController@ajaxUpdate')->name('admin::update-partner-ajax')->middleware('can:update-partner'); + $router->delete('partners/{ids}', 'AdminController@destroyMultiple')->name('admin::destroy-partner')->middleware('can:delete-partner'); + }); }); } } diff --git a/src/Repositories/CacheDecorator.php b/src/Repositories/CacheDecorator.php deleted file mode 100644 index 11c9100..0000000 --- a/src/Repositories/CacheDecorator.php +++ /dev/null @@ -1,15 +0,0 @@ -repo = $repo; - $this->cache = $cache; - } -} diff --git a/src/Repositories/EloquentPartner.php b/src/Repositories/EloquentPartner.php index 8a37f23..6e5ef32 100644 --- a/src/Repositories/EloquentPartner.php +++ b/src/Repositories/EloquentPartner.php @@ -2,13 +2,12 @@ namespace TypiCMS\Modules\Partners\Repositories; -use Illuminate\Database\Eloquent\Model; -use TypiCMS\Modules\Core\Repositories\RepositoriesAbstract; +use TypiCMS\Modules\Core\Repositories\EloquentRepository; +use TypiCMS\Modules\Partners\Models\Partner; -class EloquentPartner extends RepositoriesAbstract implements PartnerInterface +class EloquentPartner extends EloquentRepository { - public function __construct(Model $model) - { - $this->model = $model; - } + protected $repositoryId = 'partners'; + + protected $model = Partner::class; } diff --git a/src/Repositories/PartnerInterface.php b/src/Repositories/PartnerInterface.php deleted file mode 100644 index 362980d..0000000 --- a/src/Repositories/PartnerInterface.php +++ /dev/null @@ -1,9 +0,0 @@ - 50, - 'order' => [ + 'order' => [ 'position' => 'asc', ], 'sidebar' => [ diff --git a/src/config/permissions.php b/src/config/permissions.php new file mode 100644 index 0000000..dab7d63 --- /dev/null +++ b/src/config/permissions.php @@ -0,0 +1,10 @@ + [ + 'see-all-partners' => 'View list', + 'create-partner' => 'Create', + 'update-partner' => 'Edit', + 'delete-partner' => 'Delete', + ], +]; diff --git a/src/database/migrations/2014_06_15_200602_create_partners_table.php b/src/database/migrations/2014_06_15_200602_create_partners_table.php index c5b5790..a6fc0c9 100644 --- a/src/database/migrations/2014_06_15_200602_create_partners_table.php +++ b/src/database/migrations/2014_06_15_200602_create_partners_table.php @@ -8,7 +8,7 @@ class CreatePartnersTable extends Migration /** * Run the migrations. * - * @return void + * @return null */ public function up() { @@ -17,36 +17,24 @@ public function up() $table->increments('id'); $table->boolean('homepage')->default(0); $table->integer('position')->unsigned()->default(1); - $table->string('image')->nullable(); + $table->integer('image_id')->unsigned()->nullable(); + $table->json('status'); + $table->json('title'); + $table->json('slug'); + $table->json('website'); + $table->json('summary'); + $table->json('body'); $table->timestamps(); }); - - Schema::create('partner_translations', function (Blueprint $table) { - $table->engine = 'InnoDB'; - $table->increments('id'); - $table->integer('partner_id')->unsigned(); - $table->string('locale'); - $table->boolean('status')->default(0); - $table->string('title'); - $table->string('slug')->nullable(); - $table->string('website')->nullable(); - $table->text('summary'); - $table->text('body'); - $table->timestamps(); - $table->unique(['partner_id', 'locale']); - $table->unique(['locale', 'slug']); - $table->foreign('partner_id')->references('id')->on('partners')->onDelete('cascade'); - }); } /** * Reverse the migrations. * - * @return void + * @return null */ public function down() { - Schema::drop('partner_translations'); Schema::drop('partners'); } } diff --git a/src/resources/lang/en/global.php b/src/resources/lang/en/global.php deleted file mode 100644 index 7a2779b..0000000 --- a/src/resources/lang/en/global.php +++ /dev/null @@ -1,9 +0,0 @@ - 'Partners', - 'partners' => 'partner|partners', - 'New' => 'New partner', - 'Edit' => 'Edit partner', - 'Back' => 'Back to partners', -]; diff --git a/src/resources/lang/es/global.php b/src/resources/lang/es/global.php deleted file mode 100644 index 22a3d71..0000000 --- a/src/resources/lang/es/global.php +++ /dev/null @@ -1,9 +0,0 @@ - 'Socios', - 'partners' => 'socio|socios', - 'New' => 'Nuevo socio', - 'Edit' => 'Editar socios', - 'Back' => 'Volver a los socios', -]; diff --git a/src/resources/lang/fr/global.php b/src/resources/lang/fr/global.php deleted file mode 100644 index ec3d02a..0000000 --- a/src/resources/lang/fr/global.php +++ /dev/null @@ -1,9 +0,0 @@ - 'Partenaires', - 'partners' => 'partenaire|partenaires', - 'New' => 'Nouveau partenaire', - 'Edit' => 'Modifier le partenaire', - 'Back' => 'Retour à la liste des partenaires', -]; diff --git a/src/resources/views/admin/_form.blade.php b/src/resources/views/admin/_form.blade.php index 10d1ab6..a042451 100644 --- a/src/resources/views/admin/_form.blade.php +++ b/src/resources/views/admin/_form.blade.php @@ -1,25 +1,26 @@ -@section('js') +@push('js') -@endsection +@endpush -@include('core::admin._buttons-form') +@component('core::admin._buttons-form', ['model' => $model]) +@endcomponent {!! BootForm::hidden('id') !!} @include('core::admin._image-fieldset', ['field' => 'image']) {!! BootForm::hidden('homepage')->value(0) !!} -{!! BootForm::checkbox(trans('validation.attributes.homepage'), 'homepage') !!} +{!! BootForm::checkbox(__('Homepage'), 'homepage') !!}
-
- {!! BootForm::text(trans('validation.attributes.position'), 'position') !!} +
+ {!! BootForm::text(__('Position'), 'position')->type('number')->min(1)->required() !!}
@include('core::form._title-and-slug') {!! TranslatableBootForm::hidden('status')->value(0) !!} -{!! TranslatableBootForm::checkbox(trans('validation.attributes.online'), 'status') !!} -{!! TranslatableBootForm::text(trans('validation.attributes.website'), 'website') !!} -{!! TranslatableBootForm::textarea(trans('validation.attributes.summary'), 'summary')->rows(4) !!} -{!! TranslatableBootForm::textarea(trans('validation.attributes.body'), 'body')->addClass('ckeditor') !!} +{!! TranslatableBootForm::checkbox(__('Published'), 'status') !!} +{!! TranslatableBootForm::text(__('Website'), 'website') !!} +{!! TranslatableBootForm::textarea(__('Summary'), 'summary')->rows(4) !!} +{!! TranslatableBootForm::textarea(__('Body'), 'body')->addClass('ckeditor') !!} diff --git a/src/resources/views/admin/create.blade.php b/src/resources/views/admin/create.blade.php index 2752870..4f03b21 100644 --- a/src/resources/views/admin/create.blade.php +++ b/src/resources/views/admin/create.blade.php @@ -1,12 +1,12 @@ @extends('core::admin.master') -@section('title', trans('partners::global.New')) +@section('title', __('New partner')) -@section('main') +@section('content') @include('core::admin._button-back', ['module' => 'partners'])

- @lang('partners::global.New') + @lang('New partner')

{!! BootForm::open()->action(route('admin::index-partners'))->multipart()->role('form') !!} diff --git a/src/resources/views/admin/edit.blade.php b/src/resources/views/admin/edit.blade.php index 7246b8c..3b36823 100644 --- a/src/resources/views/admin/edit.blade.php +++ b/src/resources/views/admin/edit.blade.php @@ -2,11 +2,11 @@ @section('title', $model->present()->title) -@section('main') +@section('content') @include('core::admin._button-back', ['module' => 'partners']) -

- {{ $model->present()->title ?: trans('core::global.Untitled') }} +

+ {{ $model->present()->title ?: __('Untitled') }}

{!! BootForm::open()->put()->action(route('admin::update-partner', $model->id))->multipart()->role('form') !!} diff --git a/src/resources/views/admin/index.blade.php b/src/resources/views/admin/index.blade.php index 4255e05..b681391 100644 --- a/src/resources/views/admin/index.blade.php +++ b/src/resources/views/admin/index.blade.php @@ -1,19 +1,19 @@ @extends('core::admin.master') -@section('title', trans('partners::global.name')) +@section('title', __('Partners')) -@section('main') +@section('content') -
+
@include('core::admin._button-create', ['module' => 'partners']) -

- @{{ models.length }} @choice('partners::global.partners', 2) -

+

@lang('Partners')

- @include('core::admin._lang-switcher') + @include('core::admin._button-select') + @include('core::admin._button-actions') + @include('core::admin._lang-switcher-for-list')
@@ -23,27 +23,29 @@ - Status - Image - Position - Home - Title - Website + {{ __('Status') }} + {{ __('Image') }} + {{ __('Position') }} + {{ __('Home') }} + {{ __('Title') }} + {{ __('Website') }} - + - + - + + + @include('core::admin._button-edit', ['module' => 'partners']) @@ -52,11 +54,11 @@ - + @{{ model.homepage }} - @{{ model.title }} - @{{ model.website }} + @{{ model.title_translated }} + @{{ model.website_translated }} diff --git a/src/resources/views/public/_list-item.blade.php b/src/resources/views/public/_list-item.blade.php index 051c1d3..5da2f70 100644 --- a/src/resources/views/public/_list-item.blade.php +++ b/src/resources/views/public/_list-item.blade.php @@ -1,6 +1,6 @@ -
  • - - {{-- --}} +
  • + + {{-- --}} {!! $partner->present()->thumb(null, 200) !!}
    • diff --git a/src/resources/views/public/_list.blade.php b/src/resources/views/public/_list.blade.php index 3323fa0..2b382a8 100644 --- a/src/resources/views/public/_list.blade.php +++ b/src/resources/views/public/_list.blade.php @@ -1,4 +1,4 @@ -
      +
        @foreach ($items as $partner) @include('partners::public._list-item') @endforeach diff --git a/src/resources/views/public/index.blade.php b/src/resources/views/public/index.blade.php index 4e94b64..694b3c7 100644 --- a/src/resources/views/public/index.blade.php +++ b/src/resources/views/public/index.blade.php @@ -2,14 +2,12 @@ @section('bodyClass', 'body-partners body-partners-index body-page body-page-'.$page->id) -@section('main') +@section('content') {!! $page->present()->body !!} - @include('galleries::public._galleries', ['model' => $page]) + @include('files::public._files', ['model' => $page]) - @if ($models->count()) - @include('partners::public._list', ['items' => $models]) - @endif + @includeWhen($models->count() > 0, 'partners::public._list', ['items' => $models]) @endsection diff --git a/src/resources/views/public/show.blade.php b/src/resources/views/public/show.blade.php index 75f04c8..7888a2c 100644 --- a/src/resources/views/public/show.blade.php +++ b/src/resources/views/public/show.blade.php @@ -1,20 +1,23 @@ @extends('core::public.master') -@section('title', $model->title.' – '.trans('partners::global.name').' – '.$websiteTitle) +@section('title', $model->title.' – '.__('Partners').' – '.$websiteTitle) @section('ogTitle', $model->title) @section('description', $model->summary) @section('image', $model->present()->thumbUrl()) @section('bodyClass', 'body-partners body-partner-'.$model->id.' body-page body-page-'.$page->id) -@section('main') +@section('content') @include('core::public._btn-prev-next', ['module' => 'Partners', 'model' => $model]) -
        -

        {{ $model->title }}

        + +
        +

        {{ $model->title }}

        {!! $model->present()->thumb(null, 200) !!} -

        {{ $model->website }}

        -

        {{ nl2br($model->summary) }}

        -
        {!! $model->present()->body !!}
        +

        + {{ $model->website }} +

        +

        {{ nl2br($model->summary) }}

        +
        {!! $model->present()->body !!}
        @endsection