From 2c7cdb6a8c886c42eac5b6cae34dd635d5f3e4bd Mon Sep 17 00:00:00 2001 From: Butschster Date: Tue, 16 Feb 2016 16:14:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BD=D0=BE=D0=B6=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ColumnFilters/Date.php | 4 -- src/Columns/Column/Control.php | 26 ++++++------ src/Columns/Column/DateTime.php | 4 -- src/FormItems/BaseDateTime.php | 11 +---- src/FormItems/CKEditor.php | 12 +++--- src/FormItems/Date.php | 22 +--------- src/Http/Controllers/AdminController.php | 41 ++++++++++++++----- src/Http/routes.php | 12 +++--- src/Model/ModelConfiguration.php | 2 + src/NavigationPage.php | 2 +- src/Providers/ModuleServiceProvider.php | 6 +-- src/SleepingOwlAdmin.php | 18 ++++---- src/SleepingOwlModels/User.php | 8 ++-- src/TemplateDefault.php | 2 +- src/config/sleeping_owl.php | 2 +- .../views/default/column/control.blade.php | 6 +-- .../views/default/column/filter.blade.php | 2 +- .../views/default/column/order.blade.php | 4 +- .../default/column/tree_control.blade.php | 8 ++-- .../views/default/column/url.blade.php | 2 +- .../default/display/datatables.blade.php | 2 +- .../default/display/datatablesAsync.blade.php | 2 +- .../views/default/display/table.blade.php | 2 +- .../views/default/display/tree.blade.php | 5 ++- .../views/default/form/default.blade.php | 7 +--- .../views/default/form/panel.blade.php | 5 +-- .../views/default/form/tabbed.blade.php | 5 +-- .../views/default/formitem/file.blade.php | 6 +-- .../views/default/formitem/image.blade.php | 4 +- .../views/default/formitem/images.blade.php | 2 +- .../views/default/formitem/radio.blade.php | 2 +- .../default/formitem/timestamp.blade.php | 2 +- .../views/default/pages/login.blade.php | 31 -------------- 33 files changed, 111 insertions(+), 158 deletions(-) delete mode 100644 src/resources/views/default/pages/login.blade.php diff --git a/src/ColumnFilters/Date.php b/src/ColumnFilters/Date.php index 65f66cb..7afdc2b 100644 --- a/src/ColumnFilters/Date.php +++ b/src/ColumnFilters/Date.php @@ -45,10 +45,6 @@ class Date extends Text */ public function getFormat() { - if (is_null($this->format)) { - $this->setFormat(config('sleeping_owl.datetimeFormat')); - } - return $this->format; } diff --git a/src/Columns/Column/Control.php b/src/Columns/Column/Control.php index b58750f..1a95e1b 100644 --- a/src/Columns/Column/Control.php +++ b/src/Columns/Column/Control.php @@ -11,7 +11,7 @@ class Control extends BaseColumn protected $view = 'control'; /** - * @var + * @var string */ protected $width = '50px'; @@ -46,7 +46,7 @@ protected function isTrashed() * Check if instance editable. * @return bool */ - protected function editable() + protected function isEditable() { return ! $this->isTrashed() && ! is_null($this->getModelConfiguration()->fireEdit($this->getModelKey())); } @@ -55,7 +55,7 @@ protected function editable() * Get instance edit url. * @return string */ - protected function editUrl() + protected function getEditUrl() { return $this->getModelConfiguration()->getEditUrl($this->getModelKey()); } @@ -64,7 +64,7 @@ protected function editUrl() * Check if instance is deletable. * @return bool */ - protected function deletable() + protected function isDeletable() { return ! $this->isTrashed() && ! is_null($this->getModelConfiguration()->fireDelete($this->getModelKey())); } @@ -73,7 +73,7 @@ protected function deletable() * Get instance delete url. * @return string */ - protected function deleteUrl() + protected function getDeleteUrl() { return $this->getModelConfiguration()->getDeleteUrl($this->getModelKey()); } @@ -82,7 +82,7 @@ protected function deleteUrl() * Check if instance is restorable. * @return bool */ - protected function restorable() + protected function isRestorable() { return $this->isTrashed() && ! is_null($this->getModelConfiguration()->fireRestore($this->getModelKey())); } @@ -91,7 +91,7 @@ protected function restorable() * Get instance restore url. * @return string */ - protected function restoreUrl() + protected function getRestoreUrl() { return $this->getModelConfiguration()->getRestoreUrl($this->getModelKey()); } @@ -102,12 +102,12 @@ protected function restoreUrl() public function render() { return app('sleeping_owl.template')->view('column.'.$this->view, [ - 'editable' => $this->editable(), - 'editUrl' => $this->editUrl(), - 'deletable' => $this->deletable(), - 'deleteUrl' => $this->deleteUrl(), - 'restorable' => $this->restorable(), - 'restoreUrl' => $this->restoreUrl(), + 'editable' => $this->isEditable(), + 'editUrl' => $this->getEditUrl(), + 'deletable' => $this->isDeletable(), + 'deleteUrl' => $this->getDeleteUrl(), + 'restorable' => $this->isRestorable(), + 'restoreUrl' => $this->getRestoreUrl(), ]); } } diff --git a/src/Columns/Column/DateTime.php b/src/Columns/Column/DateTime.php index 7ce8709..acbb2ea 100644 --- a/src/Columns/Column/DateTime.php +++ b/src/Columns/Column/DateTime.php @@ -17,10 +17,6 @@ class DateTime extends NamedColumn */ public function getFormat() { - if (is_null($this->format)) { - $this->setFormat(config('sleeping_owl.datetimeFormat')); - } - return $this->format; } diff --git a/src/FormItems/BaseDateTime.php b/src/FormItems/BaseDateTime.php index 09754a1..5bdc876 100644 --- a/src/FormItems/BaseDateTime.php +++ b/src/FormItems/BaseDateTime.php @@ -10,7 +10,7 @@ class BaseDateTime extends NamedFormItem /** * @var string */ - protected $format; + protected $format = 'Y-m-d H:i:s'; /** * @var bool @@ -22,20 +22,11 @@ class BaseDateTime extends NamedFormItem */ protected $pickerFormat; - /** - * @var string - */ - protected $defaultConfigFormat = 'datetimeFormat'; - /** * @return string */ public function getFormat() { - if (is_null($this->format)) { - $this->setFormat(config('sleeping_owl.'.$this->defaultConfigFormat)); - } - return $this->format; } diff --git a/src/FormItems/CKEditor.php b/src/FormItems/CKEditor.php index 3c1d9a8..1edc94d 100644 --- a/src/FormItems/CKEditor.php +++ b/src/FormItems/CKEditor.php @@ -94,21 +94,21 @@ protected static function postUpload() $height = 0; try { if (is_null($file)) { - $errors[] = trans('sleepingowladmin::core.ckeditor.upload.error.common'); + $errors[] = trans('sleepingowl::core.ckeditor.upload.error.common'); throw new Exception; } $extension = $file->guessClientExtension(); if (! in_array($extension, $allowedExtensions)) { - $errors[] = trans('sleepingowladmin::core.ckeditor.upload.error.wrong_extension', + $errors[] = trans('sleepingowl::core.ckeditor.upload.error.wrong_extension', ['file' => $file->getClientOriginalName()]); throw new Exception; } if ($file->getSize() > $maxsize * 1000) { - $errors[] = trans('sleepingowladmin::core.ckeditor.upload.error.filesize_limit', ['size' => $maxsize]); + $errors[] = trans('sleepingowl::core.ckeditor.upload.error.filesize_limit', ['size' => $maxsize]); } list($width, $height) = getimagesize($file); if ($width > $maxwidth || $height > $maxheight) { - $errors[] = trans('sleepingowladmin::core.ckeditor.upload.error.imagesize_max_limit', [ + $errors[] = trans('sleepingowl::core.ckeditor.upload.error.imagesize_max_limit', [ 'width' => $width, 'height' => $height, 'maxwidth' => $maxwidth, @@ -116,7 +116,7 @@ protected static function postUpload() ]); } if ($width < $minwidth || $height < $minheight) { - $errors[] = trans('sleepingowladmin::core.ckeditor.upload.error.imagesize_min_limit', [ + $errors[] = trans('sleepingowl::core.ckeditor.upload.error.imagesize_min_limit', [ 'width' => $width, 'height' => $height, 'minwidth' => $minwidth, @@ -132,7 +132,7 @@ protected static function postUpload() $file = $file->move($upload_dir, $finalFilename); $CKEditorFuncNum = Input::get('CKEditorFuncNum'); $url = asset($path.$finalFilename); - $message = trans('sleepingowladmin::core.ckeditor.upload.success', [ + $message = trans('sleepingowl::core.ckeditor.upload.success', [ 'size' => number_format($file->getSize() / 1024, 3, '.', ''), 'width' => $width, 'height' => $height, diff --git a/src/FormItems/Date.php b/src/FormItems/Date.php index 034a58e..23f51f3 100644 --- a/src/FormItems/Date.php +++ b/src/FormItems/Date.php @@ -12,25 +12,5 @@ class Date extends BaseDateTime /** * @var string */ - protected $defaultConfigFormat = 'dateFormat'; - - /** - * @return string - */ - public function getDefaultConfigFormat() - { - return $this->defaultConfigFormat; - } - - /** - * @param string $defaultConfigFormat - * - * @return Date - */ - public function setDefaultConfigFormat($defaultConfigFormat) - { - $this->defaultConfigFormat = $defaultConfigFormat; - - return $this; - } + protected $format = 'Y-m-d'; } diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php index 48c9068..f75ab15 100644 --- a/src/Http/Controllers/AdminController.php +++ b/src/Http/Controllers/AdminController.php @@ -10,7 +10,6 @@ use KodiCMS\SleepingOwlAdmin\Model\ModelConfiguration; use KodiCMS\CMS\Http\Controllers\System\BackendController; -// TODO: добавить заголовки для различных действий class AdminController extends BackendController { /** @@ -46,19 +45,30 @@ public function getCreate(ModelConfiguration $model) public function postStore(ModelConfiguration $model) { $create = $model->fireCreate(); + if (is_null($create)) { abort(404); } + + $nextAction = $this->request->get('next_action'); + + if ($nextAction == 'cancel') { + return redirect()->to($model->getDisplayUrl()); + } + if ($create instanceof FormInterface) { if ($validator = $create->validate($model)) { - return redirect()->back()->withErrors($validator)->withInput()->with([ - '_redirectBack' => Input::get('_redirectBack'), - ]); + return redirect()->back()->withErrors($validator)->withInput(); } + $create->save($model); } - return redirect()->to(Input::get('_redirectBack', $model->getDisplayUrl())); + if ($nextAction == 'continue') { + return redirect()->to($model->getEditUrl($create->getModelObject()->id)); + } + + return redirect()->to($model->getDisplayUrl()); } /** @@ -89,16 +99,25 @@ public function postUpdate(ModelConfiguration $model, $id) if (is_null($edit)) { abort(404); } + + $nextAction = $this->request->get('next_action'); + + if ($nextAction == 'cancel') { + return redirect()->to($model->getDisplayUrl()); + } + if ($edit instanceof FormInterface) { if ($validator = $edit->validate($model)) { - return redirect()->back()->withErrors($validator)->withInput()->with([ - '_redirectBack' => Input::get('_redirectBack'), - ]); + return redirect()->back()->withErrors($validator)->withInput(); } $edit->save($model); } - return redirect()->to(Input::get('_redirectBack', $model->getDisplayUrl())); + if ($nextAction == 'continue') { + return redirect()->back(); + } + + return redirect()->to($model->getDisplayUrl()); } /** @@ -150,7 +169,9 @@ public function render(ModelConfiguration $model, $content) $this->breadcrumbs->add(config('sleeping_owl.title'), null, true); $this->setTitle($model->getTitle(), $model->getDisplayUrl()); - $this->template->with('content', $content); + $this->template + ->with('content', $content) + ->with('model', $model); } /** diff --git a/src/Http/routes.php b/src/Http/routes.php index df6fd57..b89f466 100644 --- a/src/Http/routes.php +++ b/src/Http/routes.php @@ -1,9 +1,9 @@ config('sleeping_owl.middleware'), - 'prefix' => backend_url_segment().'/sleepingowl', - 'as' => 'admin.', + 'middleware' => ['web'], + 'prefix' => backend_url_segment().'/sleepingowl', + 'as' => 'admin.', ], function () { Route::get('{adminModel}', [ 'as' => 'model', @@ -15,7 +15,7 @@ 'uses' => 'AdminController@getCreate', ]); - Route::post('{adminModel}', [ + Route::post('{adminModel}/create', [ 'as' => 'model.store', 'uses' => 'AdminController@postStore', ]); @@ -25,12 +25,12 @@ 'uses' => 'AdminController@getEdit', ]); - Route::post('{adminModel}/{adminModelId}', [ + Route::post('{adminModel}/{adminModelId}/edit', [ 'as' => 'model.update', 'uses' => 'AdminController@postUpdate', ]); - Route::delete('{adminModel}/{adminModelId}', [ + Route::delete('{adminModel}/{adminModelId}/delete', [ 'as' => 'model.destroy', 'uses' => 'AdminController@postDestroy', ]); diff --git a/src/Model/ModelConfiguration.php b/src/Model/ModelConfiguration.php index 143ef9a..0a15a8d 100644 --- a/src/Model/ModelConfiguration.php +++ b/src/Model/ModelConfiguration.php @@ -238,6 +238,7 @@ public function fireDisplay() if (! is_callable($this->display)) { return; } + $display = app()->call($this->display); if ($display instanceof DisplayInterface) { $display->setClass($this->getClass()); @@ -255,6 +256,7 @@ public function fireCreate() if (! is_callable($this->create)) { return; } + $create = app()->call($this->create); if ($create instanceof DisplayInterface) { $create->setClass($this->getClass()); diff --git a/src/NavigationPage.php b/src/NavigationPage.php index 5a0b163..15b2c31 100644 --- a/src/NavigationPage.php +++ b/src/NavigationPage.php @@ -2,7 +2,7 @@ namespace KodiCMS\SleepingOwlAdmin; -use KodiCMS\CMS\Navigation\Page; +use KodiCMS\Navigation\Page; use KodiCMS\Support\Traits\Accessor; use KodiCMS\SleepingOwlAdmin\Model\ModelConfiguration; diff --git a/src/Providers/ModuleServiceProvider.php b/src/Providers/ModuleServiceProvider.php index fea4205..45a75cc 100644 --- a/src/Providers/ModuleServiceProvider.php +++ b/src/Providers/ModuleServiceProvider.php @@ -5,6 +5,7 @@ use Route; use Event; use ModulesFileSystem; +use KodiCMS\Navigation\Navigation; use KodiCMS\Support\ServiceProvider; use KodiCMS\SleepingOwlAdmin\Filter\Filter; use KodiCMS\SleepingOwlAdmin\Columns\Column; @@ -14,7 +15,6 @@ use KodiCMS\SleepingOwlAdmin\FormItems\FormItem; use KodiCMS\SleepingOwlAdmin\Facades\SleepingOwlModule; use KodiCMS\SleepingOwlAdmin\Display\SleepingOwlDisplay; -use KodiCMS\CMS\Navigation\Section as NavigationSection; use KodiCMS\SleepingOwlAdmin\ColumnFilters\ColumnFilter; use Illuminate\Database\Eloquent\ModelNotFoundException; @@ -58,7 +58,7 @@ public function register() public function boot() { - Event::listen('navigation.inited', function (NavigationSection $navigation) { + Event::listen('navigation.inited', function (Navigation $navigation) { $this->app['sleeping_owl']->buildMenu($navigation); }); } @@ -73,10 +73,10 @@ protected function registerRoutePatterns() Route::pattern('adminModel', implode('|', $aliases)); Route::bind('adminModel', function ($model) use ($aliases) { $class = array_search($model, $aliases); + if ($class === false) { throw new ModelNotFoundException; } - return $this->app['sleeping_owl']->getModel($class); }); } diff --git a/src/SleepingOwlAdmin.php b/src/SleepingOwlAdmin.php index 02f276d..cbe0fb3 100644 --- a/src/SleepingOwlAdmin.php +++ b/src/SleepingOwlAdmin.php @@ -3,10 +3,10 @@ namespace KodiCMS\SleepingOwlAdmin; use Closure; -use KodiCMS\CMS\Navigation\Section; +use KodiCMS\Navigation\Navigation; use Illuminate\Contracts\Support\Renderable; +use KodiCMS\Navigation\Section as NavigationSection; use KodiCMS\SleepingOwlAdmin\Model\ModelConfiguration; -use KodiCMS\CMS\Navigation\Section as NavigationSection; use KodiCMS\SleepingOwlAdmin\Interfaces\TemplateInterface; use KodiCMS\SleepingOwlAdmin\Http\Controllers\AdminController; @@ -123,21 +123,17 @@ public function addMenuLink($class) } /** - * @param NavigationSection $navigation + * @param Navigation $navigation */ - public function buildMenu(NavigationSection $navigation) + public function buildMenu(Navigation $navigation) { - $section = new Section([ - 'name' => 'SleepingOwl', - 'priority' => 999, - 'icon' => 'cubes', - ]); + $section = $navigation->addSection('SleepingOwl', null, 999); + + $section->setIcon('cubes'); foreach ($this->menuItems as $item) { $section->addPage($item); } - - $navigation->addPage($section); } /** diff --git a/src/SleepingOwlModels/User.php b/src/SleepingOwlModels/User.php index dce12b0..ba13cca 100644 --- a/src/SleepingOwlModels/User.php +++ b/src/SleepingOwlModels/User.php @@ -1,12 +1,12 @@ setLabel('E-mail')->setWidth('100px'), ]), 'First Tab'); - $tabbed->appendDisplay(SleepingOwlDisplay::table(), 'Second Tab'); + $tabbed->appendDisplay(SleepingOwlDisplay::table()->setColumns([ + Column::link('username')->setLabel('Username'), + ]), 'Second Tab'); }); return $display; @@ -38,7 +40,7 @@ [ FormItem::text('username', 'Username')->required(), FormItem::text('email', 'E-mail')->required()->addValidationRule('email'), - FormItem::date('created_at', 'Date creation'), + FormItem::timestamp('created_at', 'Date creation'), FormItem::multiselect('roles', 'Roles')->setModelForOptions(new UserRole)->setDisplay('name'), ], diff --git a/src/TemplateDefault.php b/src/TemplateDefault.php index 6314a79..4525370 100644 --- a/src/TemplateDefault.php +++ b/src/TemplateDefault.php @@ -11,7 +11,7 @@ class TemplateDefault implements TemplateInterface */ public function getViewNamespace() { - return 'sleepingowladmin::'; + return 'sleepingowl::'; } /** diff --git a/src/config/sleeping_owl.php b/src/config/sleeping_owl.php index 57aa843..603a6cc 100644 --- a/src/config/sleeping_owl.php +++ b/src/config/sleeping_owl.php @@ -7,7 +7,7 @@ */ 'title' => 'Sleeping Owl administrator', 'prefix' => backend_url_segment(), - 'middleware' => null, + 'middleware' => ['web'], /* * Directory to upload images to (relative to public directory) diff --git a/src/resources/views/default/column/control.blade.php b/src/resources/views/default/column/control.blade.php index 1915a51..9dfc5ec 100644 --- a/src/resources/views/default/column/control.blade.php +++ b/src/resources/views/default/column/control.blade.php @@ -1,13 +1,13 @@
@if ($editable) - + @endif @if ($deletable)
-
@@ -15,7 +15,7 @@ @if ($restorable)
-
diff --git a/src/resources/views/default/column/filter.blade.php b/src/resources/views/default/column/filter.blade.php index 7a0bd2e..de4ebcf 100644 --- a/src/resources/views/default/column/filter.blade.php +++ b/src/resources/views/default/column/filter.blade.php @@ -1,4 +1,4 @@ @if ( ! is_null($value)) - + @endif \ No newline at end of file diff --git a/src/resources/views/default/column/order.blade.php b/src/resources/views/default/column/order.blade.php index 6d96f05..10339af 100644 --- a/src/resources/views/default/column/order.blade.php +++ b/src/resources/views/default/column/order.blade.php @@ -3,7 +3,7 @@ @if ($movableUp)
-
@@ -11,7 +11,7 @@ @if ($movableDown)
-
diff --git a/src/resources/views/default/column/tree_control.blade.php b/src/resources/views/default/column/tree_control.blade.php index ba6f38a..41d7102 100644 --- a/src/resources/views/default/column/tree_control.blade.php +++ b/src/resources/views/default/column/tree_control.blade.php @@ -1,11 +1,13 @@ @if ($editable) - + + + @endif @if ($deletable)
-
@@ -13,7 +15,7 @@ @if ($restorable)
-
diff --git a/src/resources/views/default/column/url.blade.php b/src/resources/views/default/column/url.blade.php index 7dd893d..02be708 100644 --- a/src/resources/views/default/column/url.blade.php +++ b/src/resources/views/default/column/url.blade.php @@ -1,3 +1,3 @@ @if ( ! is_null($url)) - + @endif \ No newline at end of file diff --git a/src/resources/views/default/display/datatables.blade.php b/src/resources/views/default/display/datatables.blade.php index cc9fbbe..b58e0eb 100644 --- a/src/resources/views/default/display/datatables.blade.php +++ b/src/resources/views/default/display/datatables.blade.php @@ -6,7 +6,7 @@
@endif @if ($creatable) - {{ trans('sleepingowladmin::core.table.new-entry') }} + {{ trans('sleepingowl::core.table.new-entry') }} @endif
@foreach ($actions as $action) diff --git a/src/resources/views/default/display/datatablesAsync.blade.php b/src/resources/views/default/display/datatablesAsync.blade.php index 5918c70..55f3195 100644 --- a/src/resources/views/default/display/datatablesAsync.blade.php +++ b/src/resources/views/default/display/datatablesAsync.blade.php @@ -6,7 +6,7 @@
@endif @if ($creatable) - {{ trans('sleepingowladmin::core.table.new-entry') }} + {{ trans('sleepingowl::core.table.new-entry') }} @endif
@foreach ($actions as $action) diff --git a/src/resources/views/default/display/table.blade.php b/src/resources/views/default/display/table.blade.php index 7aaae76..54595ae 100644 --- a/src/resources/views/default/display/table.blade.php +++ b/src/resources/views/default/display/table.blade.php @@ -4,7 +4,7 @@
@if ($creatable) - {!! link_to($createUrl, trans('sleepingowladmin::core.table.new-entry'), [ + {!! link_to($createUrl, trans('sleepingowl::core.table.new-entry'), [ 'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus' ]) !!} @endif diff --git a/src/resources/views/default/display/tree.blade.php b/src/resources/views/default/display/tree.blade.php index ac8109d..1d8dae6 100644 --- a/src/resources/views/default/display/tree.blade.php +++ b/src/resources/views/default/display/tree.blade.php @@ -1,6 +1,9 @@ @if ($creatable) - {{ trans('sleepingowladmin::core.table.new-entry') }} + + {{ trans('sleepingowl::core.table.new-entry') }} + @endif +
    @include(app('sleeping_owl.template')->getTemplateViewPath('display.tree_children'), ['children' => $items]) diff --git a/src/resources/views/default/form/default.blade.php b/src/resources/views/default/form/default.blade.php index 2c592c7..d913a5b 100644 --- a/src/resources/views/default/form/default.blade.php +++ b/src/resources/views/default/form/default.blade.php @@ -6,11 +6,8 @@ @endforeach
-
- - {{ trans('sleepingowladmin::core.table.cancel') }} + @include('cms::app.partials.actionButtons')
-{!! Form::close() !!} - +{!! Form::close() !!} \ No newline at end of file diff --git a/src/resources/views/default/form/panel.blade.php b/src/resources/views/default/form/panel.blade.php index 02a09cf..1b3cc49 100644 --- a/src/resources/views/default/form/panel.blade.php +++ b/src/resources/views/default/form/panel.blade.php @@ -14,8 +14,7 @@
@endforeach -
- - {{ trans('sleepingowladmin::core.table.cancel') }} +
+ @include('cms::app.partials.actionButtons')
diff --git a/src/resources/views/default/form/tabbed.blade.php b/src/resources/views/default/form/tabbed.blade.php index a8e039c..a9ed8f5 100644 --- a/src/resources/views/default/form/tabbed.blade.php +++ b/src/resources/views/default/form/tabbed.blade.php @@ -24,8 +24,7 @@ @endforeach
-
- - {{ trans('sleepingowladmin::core.table.cancel') }} +
+ @include('cms::app.partials.actionButtons')
\ No newline at end of file diff --git a/src/resources/views/default/formitem/file.blade.php b/src/resources/views/default/formitem/file.blade.php index d331d7d..fac3f79 100644 --- a/src/resources/views/default/formitem/file.blade.php +++ b/src/resources/views/default/formitem/file.blade.php @@ -7,13 +7,13 @@ no file
- {{ $value }} + {{ $value }}
-
{{ trans('sleepingowladmin::core.file.browse') }}
-
{{ trans('sleepingowladmin::core.file.remove') }}
+
{{ trans('sleepingowl::core.file.browse') }}
+
{{ trans('sleepingowl::core.file.remove') }}
diff --git a/src/resources/views/default/formitem/image.blade.php b/src/resources/views/default/formitem/image.blade.php index 3c853ba..fe68254 100644 --- a/src/resources/views/default/formitem/image.blade.php +++ b/src/resources/views/default/formitem/image.blade.php @@ -8,8 +8,8 @@
-
{{ trans('sleepingowladmin::core.image.browse') }}
-
{{ trans('sleepingowladmin::core.image.remove') }}
+
{{ trans('sleepingowl::core.image.browse') }}
+
{{ trans('sleepingowl::core.image.remove') }}
diff --git a/src/resources/views/default/formitem/images.blade.php b/src/resources/views/default/formitem/images.blade.php index 5020455..6f5c3c8 100644 --- a/src/resources/views/default/formitem/images.blade.php +++ b/src/resources/views/default/formitem/images.blade.php @@ -12,7 +12,7 @@ @endforeach
-
{{ trans('sleepingowladmin::core.image.browseMultiple') }}
+
{{ trans('sleepingowl::core.image.browseMultiple') }}
diff --git a/src/resources/views/default/formitem/radio.blade.php b/src/resources/views/default/formitem/radio.blade.php index 2246fce..e62d6e2 100644 --- a/src/resources/views/default/formitem/radio.blade.php +++ b/src/resources/views/default/formitem/radio.blade.php @@ -6,7 +6,7 @@
@endif diff --git a/src/resources/views/default/formitem/timestamp.blade.php b/src/resources/views/default/formitem/timestamp.blade.php index 82f4972..42e6c6d 100644 --- a/src/resources/views/default/formitem/timestamp.blade.php +++ b/src/resources/views/default/formitem/timestamp.blade.php @@ -4,7 +4,7 @@
diff --git a/src/resources/views/default/pages/login.blade.php b/src/resources/views/default/pages/login.blade.php deleted file mode 100644 index a83bda9..0000000 --- a/src/resources/views/default/pages/login.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends(AdminTemplate::view('_layout.base')) - -@section('content') -
-
-
- -
-
-
-@stop \ No newline at end of file