@@ -71,14 +77,16 @@
@if(!$page->is_homepage)
-
+
@endif
-
+
@@ -86,7 +94,8 @@
@if($page->status == \App\Models\Content::STATUS_DRAFT)
+ class="confirm" data-toggle="tooltip"
+ title="@lang('admin/contents.makePublic')">
@@ -115,7 +124,8 @@
diff --git a/resources/views/admin/widgets/area/overview.blade.php b/resources/views/admin/widgets/area/overview.blade.php
index ae1bd8e8..483d0022 100644
--- a/resources/views/admin/widgets/area/overview.blade.php
+++ b/resources/views/admin/widgets/area/overview.blade.php
@@ -27,18 +27,24 @@
-
-
-
-
-
- -
-
+
+
+ @if($area->deletable)
+ -
+
+
+ @endif
diff --git a/resources/views/admin/widgets/overview.blade.php b/resources/views/admin/widgets/overview.blade.php
index 085eaf70..185b3eb2 100644
--- a/resources/views/admin/widgets/overview.blade.php
+++ b/resources/views/admin/widgets/overview.blade.php
@@ -4,31 +4,58 @@
@section('pageDescription', @trans('admin/widgets.descriptionOfWidgets'))
@section('content')
- @if (count($widgets))
-
-
- | @lang('admin/widgets.widgetType') |
- @lang('admin/widgets.name') |
- @lang('admin/widgets.description') |
- @lang('admin/widgets.actions') |
-
+ @if (count($widgets))
+
+
+ | @lang('admin/widgets.widgetType') |
+ @lang('admin/widgets.name') |
+ @lang('admin/widgets.description') |
+ @lang('admin/widgets.actions') |
+
@foreach($widgets as $widget)
| {{trans(call_user_func([$widget->widget_type_handler, 'getName']))}} |
{{$widget->name}} |
{{$widget->description}} |
-
-
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ @if($widget->deletable)
+ -
+
+
+ @endif
+
+
+
+
+
|
@endforeach
-
+
- {!! $widgets->render() !!}
- @else
-
- @lang('admin/widgets.noEntries')
-
- @endif
+ {!! $widgets->render() !!}
+ @else
+
+ @lang('admin/widgets.noEntries')
+
+ @endif
@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/actionLog/overview.blade.php b/resources/views/old_admin/actionLog/overview.blade.php
deleted file mode 100644
index b2d0b6fe..00000000
--- a/resources/views/old_admin/actionLog/overview.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/actionLog.overview'))
-
-@section('content')
-
-
-
@lang('admin/actionLog.overview')
-
-
-
- @if (!empty($actions))
-
- @else
-
@lang('admin/userManagement.noActions')
- @endif
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/content/edit.blade.php b/resources/views/old_admin/content/edit.blade.php
deleted file mode 100644
index 8291fe40..00000000
--- a/resources/views/old_admin/content/edit.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/contents.edit', ['name' => e($page->title)]))
-
-@section('content')
-
-
-
@lang('admin/contents.edit', ['name' => e($page->title)])
-
-
-
- @include('admin.content.editForm')
-
-@stop
diff --git a/resources/views/old_admin/content/editForm.blade.php b/resources/views/old_admin/content/editForm.blade.php
deleted file mode 100644
index 0f47f341..00000000
--- a/resources/views/old_admin/content/editForm.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-
-
-@section('javascripts')
- @include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formInputs.blade.php b/resources/views/old_admin/content/formInputs.blade.php
deleted file mode 100644
index 2242e016..00000000
--- a/resources/views/old_admin/content/formInputs.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
- @foreach($formSectionNames as $section => $sectionName)
- -
-
- {{trans($sectionName)}}
-
-
- @endforeach
-
-
-
- @foreach($formSections as $section => $view)
-
- @include($view)
-
- @endforeach
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formParts/appearance.blade.php b/resources/views/old_admin/content/formParts/appearance.blade.php
deleted file mode 100644
index a3598d9c..00000000
--- a/resources/views/old_admin/content/formParts/appearance.blade.php
+++ /dev/null
@@ -1,50 +0,0 @@
-@if($page->title_photo)
-
-
-
}}/{{$page->title_photo}})
-
-
-@endif
-
-
-
-
-
- @if (isset($errors) && $errors->has('titlePhoto'))
-
- {{ $errors->first('titlePhoto') }}
-
- @endif
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formParts/basicInformation.blade.php b/resources/views/old_admin/content/formParts/basicInformation.blade.php
deleted file mode 100644
index 47a2caae..00000000
--- a/resources/views/old_admin/content/formParts/basicInformation.blade.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @if (isset($errors) && $errors->has('status'))
-
- {{ $errors->first('status') }}
-
- @endif
-
-
-
-
- @if (isset($errors) && $errors->has('parentPage'))
-
- {{ $errors->first('parentPage') }}
-
- @endif
-
-
- @if($module->support_categories && count($categories))
-
-
-
-
- @endif
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formParts/files.blade.php b/resources/views/old_admin/content/formParts/files.blade.php
deleted file mode 100644
index c865baab..00000000
--- a/resources/views/old_admin/content/formParts/files.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- @if(count($page->files))
-
- @endif
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formParts/metaInformation.blade.php b/resources/views/old_admin/content/formParts/metaInformation.blade.php
deleted file mode 100644
index 259033a4..00000000
--- a/resources/views/old_admin/content/formParts/metaInformation.blade.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/formParts/publicationSetup.blade.php b/resources/views/old_admin/content/formParts/publicationSetup.blade.php
deleted file mode 100644
index 81d22d29..00000000
--- a/resources/views/old_admin/content/formParts/publicationSetup.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/content/new.blade.php b/resources/views/old_admin/content/new.blade.php
deleted file mode 100644
index edb97de5..00000000
--- a/resources/views/old_admin/content/new.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/contents.new', ['name' => $moduleName]))
-
-@section('content')
-
-
-
@lang('admin/contents.new', ['name' => $moduleName])
-
-
-
- @include('admin.content.newForm')
-
-@stop
diff --git a/resources/views/old_admin/content/newForm.blade.php b/resources/views/old_admin/content/newForm.blade.php
deleted file mode 100644
index 508135fa..00000000
--- a/resources/views/old_admin/content/newForm.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-
-
-@section('javascripts')
- @include('admin.snippets.ckEditor', ['textareaId' => 'pageContent'])
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/content/overview.blade.php b/resources/views/old_admin/content/overview.blade.php
deleted file mode 100644
index b72d23b0..00000000
--- a/resources/views/old_admin/content/overview.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-@extends('admin/layout')
-
-@section('content')
-
-
@lang('admin/contents.overview')
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
- @if (!$homepage)
-
-
- @lang('admin/contents.noHomepage')
-
-
- @elseif(!$homepage->isPublic())
-
-
- @lang('admin/contents.homepageProtected')
-
-
- @endif
-
- @include('admin.content.overviewTiles')
-
-
- {!! $pages->render() !!}
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/content/overviewTiles.blade.php b/resources/views/old_admin/content/overviewTiles.blade.php
deleted file mode 100644
index 0460632c..00000000
--- a/resources/views/old_admin/content/overviewTiles.blade.php
+++ /dev/null
@@ -1,83 +0,0 @@
-@forelse($pages as $page)
-
-
-
- @if ($page->parent_id && $page->parent_url)
-
- @lang('admin/contents.parentPage'):
- {{$page->parent_title}},
-
- @endif
-
-
{{$page->author_name}},
-
{{date('d.m.Y', strtotime($page->created_at))}}
-
-
-
-
- @if ($page->title_photo)
-
-
-
- @endif
-
-
-
-
-
- @if (trim($page->meta_description))
- {{str_limit($page->meta_description)}}
- @else
- {{str_limit(strip_tags($page->content))}}
- @endif
-
-
-
-
-
-@empty
-
@lang('admin/contents.noPagesAvailable')
-@endforelse
\ No newline at end of file
diff --git a/resources/views/old_admin/customFields/edit.blade.php b/resources/views/old_admin/customFields/edit.blade.php
deleted file mode 100644
index 4cf713f4..00000000
--- a/resources/views/old_admin/customFields/edit.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/customFields.edit', ['name' => $field->name]))
-
-@section('content')
-
-
-
@lang('admin/customFields.edit', ['name' => $field->name])
-
-
-
- @include('admin.customFields.editForm')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/customFields/editForm.blade.php b/resources/views/old_admin/customFields/editForm.blade.php
deleted file mode 100644
index f8f0e82e..00000000
--- a/resources/views/old_admin/customFields/editForm.blade.php
+++ /dev/null
@@ -1,136 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-
diff --git a/resources/views/old_admin/customFields/new.blade.php b/resources/views/old_admin/customFields/new.blade.php
deleted file mode 100644
index 377e5839..00000000
--- a/resources/views/old_admin/customFields/new.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/customFields.new'))
-
-@section('content')
-
-
-
@lang('admin/customFields.new')
-
-
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
- @include('admin.customFields.newForm')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/customFields/newForm.blade.php b/resources/views/old_admin/customFields/newForm.blade.php
deleted file mode 100644
index 61fcc564..00000000
--- a/resources/views/old_admin/customFields/newForm.blade.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/views/old_admin/customFields/overview.blade.php b/resources/views/old_admin/customFields/overview.blade.php
deleted file mode 100644
index 00c22972..00000000
--- a/resources/views/old_admin/customFields/overview.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/customFields.overview'))
-
-@section('content')
-
-
-
@lang('admin/customFields.overview')
-
-
-
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
- {{--draw tabs--}}
- @if (!empty($usedResources))
-
-
- {{--display list of custom fields--}}
-
-
- @foreach($customFields as $resourceId => $fields)
-
-
-
-
- | @lang('admin/customFields.name') |
- @lang('admin/customFields.description') |
- @lang('admin/customFields.type') |
- |
-
-
-
- @foreach($fields as $field)
-
- | {{$field->name}} |
- {{str_limit($field->description)}} |
- @lang($types[$field->type_id]) |
-
-
-
- |
-
- @endforeach
-
-
-
-
- @endforeach
-
-
- @else
-
@lang('admin/customFields.noFields')
- @endif
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/dashboard.blade.php b/resources/views/old_admin/dashboard.blade.php
deleted file mode 100644
index a100d912..00000000
--- a/resources/views/old_admin/dashboard.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('admin.layout')
-
-@section('content')
-
Dashboard
-
- some fancy content
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/directories/editForm.blade.php b/resources/views/old_admin/fileManager/directories/editForm.blade.php
deleted file mode 100644
index ebf675a4..00000000
--- a/resources/views/old_admin/fileManager/directories/editForm.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
@lang('admin/fileManager.editDirectory')
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/directories/newForm.blade.php b/resources/views/old_admin/fileManager/directories/newForm.blade.php
deleted file mode 100644
index 82c4df69..00000000
--- a/resources/views/old_admin/fileManager/directories/newForm.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
@lang('admin/fileManager.newDirectory')
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/directories/subdirectoriesTiles.blade.php b/resources/views/old_admin/fileManager/directories/subdirectoriesTiles.blade.php
deleted file mode 100644
index 223f694e..00000000
--- a/resources/views/old_admin/fileManager/directories/subdirectoriesTiles.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- @if($directory->id)
-
-
-
-
- @lang('admin/fileManager.parentDirectory')
-
-
-
-
- @endif
-
- @forelse($subdirectories as $dir)
-
-
-
-
-
- {{str_limit($dir->name, 15)}}
-
-
-
- @empty
- {{--
@lang('admin/fileManager.noSubdirectories')--}}
- @endforelse
-
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/edit.blade.php b/resources/views/old_admin/fileManager/edit.blade.php
deleted file mode 100644
index cb716492..00000000
--- a/resources/views/old_admin/fileManager/edit.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/fileManager.edit', ['name' => $file->original_filename]))
-
-@section('content')
-
-
-
@lang('admin/fileManager.edit', ['name' => $file->original_filename])
-
-
-
-
-
- {!! \App\Helpers\FileManager::getLargePreview($file) !!}
-
-
-
-
-
-
-
{{$file->original_filename}}
-
-
- - @lang('admin/fileManager.createdAt'): {{$file->created_at}}
- - @lang('admin/fileManager.updatedAt'): {{$file->updated_at}}
- - @lang('admin/fileManager.mime'): {{$file->mime_type}}
- - @lang('admin/fileManager.hash'): {{str_limit($file->file_hash, 10)}}
- - @lang('admin/fileManager.url'): {{$file->filename}}
- - @lang('admin/fileManager.fileSize'): {{\App\Helpers\FileManager::getFormattedSize($file)}}
-
- @foreach($extraInfo as $column => $info)
- - {{$column}}: {{$info}}
- @endforeach
-
-
-
-
-
-
- @include('admin.fileManager.editForm')
-
-
-
-@stop
-
-@section('head_stylesheets')
-
-@stop
-
-@section('javascripts')
-
-
-
-
-
-@stop
diff --git a/resources/views/old_admin/fileManager/editForm.blade.php b/resources/views/old_admin/fileManager/editForm.blade.php
deleted file mode 100644
index 534ce58f..00000000
--- a/resources/views/old_admin/fileManager/editForm.blade.php
+++ /dev/null
@@ -1,53 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-
-
-
-
diff --git a/resources/views/old_admin/fileManager/filesTiles.blade.php b/resources/views/old_admin/fileManager/filesTiles.blade.php
deleted file mode 100644
index 9cf3fa31..00000000
--- a/resources/views/old_admin/fileManager/filesTiles.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
- @forelse($files as $file)
-
-
-
-
-
- {{str_limit($file->original_filename, 15)}}
-
-
- {{$file->mime_type}}
-
-
-
-
-
-
- @empty
-
@lang('admin/fileManager.noFiles')
- @endforelse
-
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/newFileForm.blade.php b/resources/views/old_admin/fileManager/newFileForm.blade.php
deleted file mode 100644
index 05ff0992..00000000
--- a/resources/views/old_admin/fileManager/newFileForm.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
@lang('admin/fileManager.newFile')
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/fileManager/overview.blade.php b/resources/views/old_admin/fileManager/overview.blade.php
deleted file mode 100644
index 52c58da1..00000000
--- a/resources/views/old_admin/fileManager/overview.blade.php
+++ /dev/null
@@ -1,71 +0,0 @@
-@extends('admin.layout')
-
-@if ($directory->id)
- @section('pageName', @trans('admin/fileManager.directories', ['directory' => $directory->name]))
-@else
- @section('pageName', @trans('admin/fileManager.rootDirectories'))
-@endif
-
-
-@section('content')
-
-
- @if ($directory->id)
- @lang('admin/fileManager.directories', ['directory' => $directory->name])
- @else
- @lang('admin/fileManager.rootDirectories')
- @endif
-
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
-
- @include('admin.fileManager.directories.subdirectoriesTiles')
-
-
- @include('admin.fileManager.filesTiles')
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/history/diff.blade.php b/resources/views/old_admin/history/diff.blade.php
deleted file mode 100644
index f23e397c..00000000
--- a/resources/views/old_admin/history/diff.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/history.diffPageName', ['column' => $columnName]))
-
-@section('content')
-
-
-
@lang('admin/history.diffPageName', ['column' => $columnName])
-
-
-
-
- {!! $diff !!}
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/history/overview.blade.php b/resources/views/old_admin/history/overview.blade.php
deleted file mode 100644
index a11a853e..00000000
--- a/resources/views/old_admin/history/overview.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/history.pageName', ['name' => $page->title]))
-
-@section('content')
-
-
-
@lang('admin/history.pageName', ['name' => $page->title])
-
-
-
-
-
-
- @lang('admin/history.backToEdit')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/layout.blade.php b/resources/views/old_admin/layout.blade.php
deleted file mode 100644
index 8e6c8aba..00000000
--- a/resources/views/old_admin/layout.blade.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
- @yield('head_meta')
-
@yield('pageName', @trans('admin/common.admin')) | {{isset($pageName) ? $pageName : ''}}
-
-
-
- @yield('head_stylesheets')
-
-
-
-
-
-
-
-
-
- @include('admin.search.miniSearchForm')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@yield('javascripts')
-
-
diff --git a/resources/views/old_admin/loginForm/form.blade.php b/resources/views/old_admin/loginForm/form.blade.php
deleted file mode 100644
index be532fdc..00000000
--- a/resources/views/old_admin/loginForm/form.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
@lang('admin/loginForm.login') | {{isset($pageName) ? $pageName : ''}}
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/search/form.blade.php b/resources/views/old_admin/search/form.blade.php
deleted file mode 100644
index f4a45faa..00000000
--- a/resources/views/old_admin/search/form.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/views/old_admin/search/miniSearchForm.blade.php b/resources/views/old_admin/search/miniSearchForm.blade.php
deleted file mode 100644
index 61aa66c9..00000000
--- a/resources/views/old_admin/search/miniSearchForm.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-@include('admin.search.form')
\ No newline at end of file
diff --git a/resources/views/old_admin/search/page.blade.php b/resources/views/old_admin/search/page.blade.php
deleted file mode 100644
index cbf25edb..00000000
--- a/resources/views/old_admin/search/page.blade.php
+++ /dev/null
@@ -1,41 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('search.pageTitle'))
-
-@section('content')
-
-
-
@lang('search.pageTitle')
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @if ($search)
-
-
-
@lang('search.results')
- @include('admin.search.results')
-
-
-
@lang('search.term')
- @include('admin.search.form')
-
-
- @else
-
- @include('admin.search.form')
-
- @endif
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/search/results.blade.php b/resources/views/old_admin/search/results.blade.php
deleted file mode 100644
index 2862af78..00000000
--- a/resources/views/old_admin/search/results.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-@foreach($results as $id => $result)
-
-
{{$result['name']}} ({{$result['count']}})
- {!! $result['content'] !!}
-
-@endforeach
\ No newline at end of file
diff --git a/resources/views/old_admin/search/results/content.blade.php b/resources/views/old_admin/search/results/content.blade.php
deleted file mode 100644
index bdf52fba..00000000
--- a/resources/views/old_admin/search/results/content.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
{{$page->title}}
-
\ No newline at end of file
diff --git a/resources/views/old_admin/settings/overview.blade.php b/resources/views/old_admin/settings/overview.blade.php
deleted file mode 100644
index 69aa2c94..00000000
--- a/resources/views/old_admin/settings/overview.blade.php
+++ /dev/null
@@ -1,50 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/settings.overview'))
-
-@section('content')
-
-
-
@lang('admin/settings.overview')
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/settings/parts/basic.blade.php b/resources/views/old_admin/settings/parts/basic.blade.php
deleted file mode 100644
index 24304ff9..00000000
--- a/resources/views/old_admin/settings/parts/basic.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/settings/parts/meta.blade.php b/resources/views/old_admin/settings/parts/meta.blade.php
deleted file mode 100644
index c47fcf8d..00000000
--- a/resources/views/old_admin/settings/parts/meta.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/settings/parts/social.blade.php b/resources/views/old_admin/settings/parts/social.blade.php
deleted file mode 100644
index 360a15fd..00000000
--- a/resources/views/old_admin/settings/parts/social.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/resources/views/old_admin/settings/snippets/commonSettings.blade.php b/resources/views/old_admin/settings/snippets/commonSettings.blade.php
deleted file mode 100644
index 5a0e8c01..00000000
--- a/resources/views/old_admin/settings/snippets/commonSettings.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-
{$field}) || $settings->{$field}['lang'] == null)
- checked
- @endif />
-@lang('admin/settings.commonSettings')
\ No newline at end of file
diff --git a/resources/views/old_admin/snippets/aceEditor.blade.php b/resources/views/old_admin/snippets/aceEditor.blade.php
deleted file mode 100644
index bd7f7aad..00000000
--- a/resources/views/old_admin/snippets/aceEditor.blade.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
{{$value}}
-
-
-@section('javascripts')
-
-
-
-@endsection
\ No newline at end of file
diff --git a/resources/views/old_admin/snippets/ckEditor.blade.php b/resources/views/old_admin/snippets/ckEditor.blade.php
deleted file mode 100644
index 0d16a3ff..00000000
--- a/resources/views/old_admin/snippets/ckEditor.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/templates/directoriesList.blade.php b/resources/views/old_admin/templates/directoriesList.blade.php
deleted file mode 100644
index 9835f77b..00000000
--- a/resources/views/old_admin/templates/directoriesList.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-@if($directory->parent_id)
-
- @lang('admin/templates.parentDirectory')
-
-
-@endif
-
-
@lang($directory->name)
-
-{{--@if (true || isset($isWritable) && $isWritable)--}}
- {{--
--}}
-{{--@endif--}}
-
-
-
-
@lang('admin/templates.subdirectories')
-
- @forelse($subdirectories as $subdirectory)
-
{{trans($subdirectory->name)}}
- @empty
-
@lang('admin/templates.noSubdirectories')
- @endforelse
-
\ No newline at end of file
diff --git a/resources/views/old_admin/templates/edit.blade.php b/resources/views/old_admin/templates/edit.blade.php
deleted file mode 100644
index 683a6e8c..00000000
--- a/resources/views/old_admin/templates/edit.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/templates.edit', ['name' => $template->template_name]))
-
-@section('content')
-
-
-
@lang('admin/templates.edit', ['name' => $template->template_name])
-
-
-
- @include('admin.templates.editForm')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/templates/editForm.blade.php b/resources/views/old_admin/templates/editForm.blade.php
deleted file mode 100644
index 1266bc50..00000000
--- a/resources/views/old_admin/templates/editForm.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-@if (!$isWritable)
-
- @lang('admin/templates.notWritable', ['file' => $path->path])
-
-@endif
-
-
-
diff --git a/resources/views/old_admin/templates/list.blade.php b/resources/views/old_admin/templates/list.blade.php
deleted file mode 100644
index 725f4049..00000000
--- a/resources/views/old_admin/templates/list.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/templates.overview'))
-
-@section('content')
-
@lang('admin/templates.overview')
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
-
- @include('admin.templates.templatesTiles')
-
-
-
-
- @include('admin.templates.directoriesList')
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/templates/templatesTiles.blade.php b/resources/views/old_admin/templates/templatesTiles.blade.php
deleted file mode 100644
index 2a307b43..00000000
--- a/resources/views/old_admin/templates/templatesTiles.blade.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- @forelse($templates as $template)
-
-
-
-
- {{str_limit($template->name, 15)}}
-
-
- {{str_limit($template->description, 150)}}
-
-
-
-
- @if($isWritable)
-
-
-
- @else
-
-
-
- @endif
-
- @if ($template->editable)
-
-
-
- @endif
-
-
-
-
- @empty
-
@lang('admin/templates.noTemplates')
- @endforelse
-
-
-@section('javascripts')
-
-@endsection
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/detail.blade.php b/resources/views/old_admin/userManagement/detail.blade.php
deleted file mode 100644
index ad2582f0..00000000
--- a/resources/views/old_admin/userManagement/detail.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/userManagement.detail', ['name' => $user->name, 'email' => $user->email]))
-
-@section('content')
-
-
-
@lang('admin/userManagement.detail', ['name' => str_limit($user->name, 20), 'email' => $user->email])
-
-
-
-
-
}})
-
-
-
- - {{$user->name}}
- - {{$user->email}}
-
- {{--todo: add custom fields--}}
-
-
-
-
-
-
@lang('admin/userManagement.usersActions')
-
- @if (!empty($actions))
-
- @else
-
@lang('admin/userManagement.noActions')
- @endif
-
-
-
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
-
@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])
- @include('admin.userManagement.editForm')
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/edit.blade.php b/resources/views/old_admin/userManagement/edit.blade.php
deleted file mode 100644
index 42c273c3..00000000
--- a/resources/views/old_admin/userManagement/edit.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
-
-@section('content')
-
-
-
@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @include('admin.userManagement.editForm')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/editForm.blade.php b/resources/views/old_admin/userManagement/editForm.blade.php
deleted file mode 100644
index a67f8c59..00000000
--- a/resources/views/old_admin/userManagement/editForm.blade.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/new.blade.php b/resources/views/old_admin/userManagement/new.blade.php
deleted file mode 100644
index 57355b48..00000000
--- a/resources/views/old_admin/userManagement/new.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/userManagement.addNewUser'))
-
-@section('content')
-
-
@lang('admin/userManagement.addNewUser')
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @include('admin.userManagement.newForm', ['roles' => $roles])
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/newForm.blade.php b/resources/views/old_admin/userManagement/newForm.blade.php
deleted file mode 100644
index 31462cbf..00000000
--- a/resources/views/old_admin/userManagement/newForm.blade.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/views/old_admin/userManagement/overview.blade.php b/resources/views/old_admin/userManagement/overview.blade.php
deleted file mode 100644
index d4ca1a88..00000000
--- a/resources/views/old_admin/userManagement/overview.blade.php
+++ /dev/null
@@ -1,41 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/userManagement.overview'))
-
-@section('content')
-
-
-
@lang('admin/userManagement.overview')
-
-
- @foreach($statuses as $status => $translation)
- {{$translation}}
- @endforeach
-
-
-
-
-
- @forelse($users as $user)
-
- @empty
-
@lang('admin/userManagement.noUsers')
- @endforelse
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/area/edit.blade.php b/resources/views/old_admin/widgets/area/edit.blade.php
deleted file mode 100644
index a96927f2..00000000
--- a/resources/views/old_admin/widgets/area/edit.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/widgetAreas.edit', ['name' => $area->name]))
-
-@section('content')
-
@lang('admin/widgetAreas.edit', ['name' => $area->name])
-
- @include('admin.widgets.area.editForm')
-@stop
-
diff --git a/resources/views/old_admin/widgets/area/editForm.blade.php b/resources/views/old_admin/widgets/area/editForm.blade.php
deleted file mode 100644
index 64e1819f..00000000
--- a/resources/views/old_admin/widgets/area/editForm.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-@if (session('success'))
-
- {{ session('success') }}
-
-@endif
-
-@if (session('error'))
-
- {{ session('error') }}
-
-@endif
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/area/new.blade.php b/resources/views/old_admin/widgets/area/new.blade.php
deleted file mode 100644
index ad6328a9..00000000
--- a/resources/views/old_admin/widgets/area/new.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/widgetAreas.new'))
-
-@section('content')
-
@lang('admin/widgetAreas.new')
-
- @include('admin.widgets.area.newForm')
-@stop
-
diff --git a/resources/views/old_admin/widgets/area/newForm.blade.php b/resources/views/old_admin/widgets/area/newForm.blade.php
deleted file mode 100644
index ead346a3..00000000
--- a/resources/views/old_admin/widgets/area/newForm.blade.php
+++ /dev/null
@@ -1,55 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/area/overview.blade.php b/resources/views/old_admin/widgets/area/overview.blade.php
deleted file mode 100644
index c4ccde33..00000000
--- a/resources/views/old_admin/widgets/area/overview.blade.php
+++ /dev/null
@@ -1,62 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/widgetAreas.overview'))
-
-@section('content')
-
-
-
@lang('admin/widgetAreas.overview')
-
-
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
- @if (count($areas) > 0)
-
-
- | @lang('admin/widgetAreas.name') |
- @lang('admin/widgetAreas.code') |
- @lang('admin/widgetAreas.description') |
- @lang('admin/widgetAreas.actions') |
-
- @foreach($areas as $area)
-
- | {{$area->name}} |
- {{$area->code}} |
- {{str_limit($area->description, 100)}} |
-
-
-
-
- |
-
- @endforeach
-
- @else
-
@lang('admin/widgetAreas.noEntries')
- @endif
-
-
-
@lang('admin/widgetAreas.new')
-
- @include('admin.widgets.area.newForm', ['hideMessages' => true])
-
-
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/association.blade.php b/resources/views/old_admin/widgets/association.blade.php
deleted file mode 100644
index 624b58b5..00000000
--- a/resources/views/old_admin/widgets/association.blade.php
+++ /dev/null
@@ -1,79 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('admin/widgets.overview'))
-
-@section('content')
-
-
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
-
-
-
@lang('admin/widgets.overview')
-
- @forelse($widgets as $widget)
-
-
-
{{str_limit($widget->name, 20)}}
-
- {{trans(call_user_func([$widget->widget_type_handler, 'getName']))}}
-
-
- {{str_limit($widget->description, 150)}}
-
-
-
-
-
- @if (in_array($widget->id, $associatedWidgetIds))
-
-
-
- @else
-
- @endif
-
-
-
- @empty
-
@lang('admin/widgets.noEntries')
- @endforelse
-
-
- {!! $widgets->render() !!}
-
-
-
-
{{$widgetArea->name}}
-
-
- {{$widgetArea->description}}
-
-
-
- - @lang('admin/widgets.createdAt'): {{$widgetArea->created_at}}
- - @lang('admin/widgets.updatedAt'): {{$widgetArea->updated_at}}
-
-
-
@lang('admin/widgetAreas.editButton')
-
- @if (!empty($associatedWidgetIds))
-
@lang('admin/widgets.preview')
-
- @widgetArea($widgetArea->code)
- @endif
-
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/htmlCode/edit.blade.php b/resources/views/old_admin/widgets/htmlCode/edit.blade.php
deleted file mode 100644
index d0cda88c..00000000
--- a/resources/views/old_admin/widgets/htmlCode/edit.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/htmlCode.edit', ['name' => $widget->name]))
-
-@section('content')
-
@lang('widgets/htmlCode.edit', ['name' => $widget->name])
-
-
-
- @include('admin.widgets.htmlCode.editForm')
-
-
-
-
@lang('widgets/htmlCode.preview')
-
- @widgetPreview($widget)
-
-
-@stop
-
diff --git a/resources/views/old_admin/widgets/htmlCode/editForm.blade.php b/resources/views/old_admin/widgets/htmlCode/editForm.blade.php
deleted file mode 100644
index 469d86e6..00000000
--- a/resources/views/old_admin/widgets/htmlCode/editForm.blade.php
+++ /dev/null
@@ -1,68 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/htmlCode/new.blade.php b/resources/views/old_admin/widgets/htmlCode/new.blade.php
deleted file mode 100644
index 0a7a3265..00000000
--- a/resources/views/old_admin/widgets/htmlCode/new.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/htmlCode.new'))
-
-@section('content')
-
@lang('widgets/htmlCode.new')
-
- @include('admin.widgets.htmlCode.newForm')
-@stop
-
diff --git a/resources/views/old_admin/widgets/htmlCode/newForm.blade.php b/resources/views/old_admin/widgets/htmlCode/newForm.blade.php
deleted file mode 100644
index c2deceef..00000000
--- a/resources/views/old_admin/widgets/htmlCode/newForm.blade.php
+++ /dev/null
@@ -1,68 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/menu/advanced/extensions/edit.blade.php b/resources/views/old_admin/widgets/menu/advanced/extensions/edit.blade.php
deleted file mode 100644
index 3685072f..00000000
--- a/resources/views/old_admin/widgets/menu/advanced/extensions/edit.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/menu.edit', ['name' => $widget->name]))
-
-@section('content')
-
@lang('widgets/menu.edit', ['name' => $widget->name])
-
-
-
- @include('admin.widgets.menu.form', ['formAction' => route('widgets.postEdit', ['id' => $widget->id])])
-
-
-
-
@lang('widgets/menu.preview')
-
- @widgetPreview($widget)
-
-
-@stop
-
diff --git a/resources/views/old_admin/widgets/menu/advanced/extensions/form.blade.php b/resources/views/old_admin/widgets/menu/advanced/extensions/form.blade.php
deleted file mode 100644
index a8afd180..00000000
--- a/resources/views/old_admin/widgets/menu/advanced/extensions/form.blade.php
+++ /dev/null
@@ -1,97 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-
-
-
-
-
-
- @foreach($extensions as $extension)
-
-
{{$extension->getName()}}
-
{{$extension->getDescription()}}
-
-
-
- @endforeach
-
-
-@section('javascripts')
-
-@stop
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/menu/advanced/extensions/new.blade.php b/resources/views/old_admin/widgets/menu/advanced/extensions/new.blade.php
deleted file mode 100644
index cc9e5e70..00000000
--- a/resources/views/old_admin/widgets/menu/advanced/extensions/new.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/menu.new'))
-
-@section('content')
-
@lang('widgets/menu.new')
-
- @include('admin.widgets.menu.form', ['formAction' => route('widgets.postNew', ['type' => $type])])
-@stop
-
diff --git a/resources/views/old_admin/widgets/menu/advanced/extensions/url.blade.php b/resources/views/old_admin/widgets/menu/advanced/extensions/url.blade.php
deleted file mode 100644
index 447ce7f4..00000000
--- a/resources/views/old_admin/widgets/menu/advanced/extensions/url.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/menu/edit.blade.php b/resources/views/old_admin/widgets/menu/edit.blade.php
deleted file mode 100644
index 3685072f..00000000
--- a/resources/views/old_admin/widgets/menu/edit.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/menu.edit', ['name' => $widget->name]))
-
-@section('content')
-
@lang('widgets/menu.edit', ['name' => $widget->name])
-
-
-
- @include('admin.widgets.menu.form', ['formAction' => route('widgets.postEdit', ['id' => $widget->id])])
-
-
-
-
@lang('widgets/menu.preview')
-
- @widgetPreview($widget)
-
-
-@stop
-
diff --git a/resources/views/old_admin/widgets/menu/form.blade.php b/resources/views/old_admin/widgets/menu/form.blade.php
deleted file mode 100644
index f8f01349..00000000
--- a/resources/views/old_admin/widgets/menu/form.blade.php
+++ /dev/null
@@ -1,126 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-
-
-
-
@lang('widgets/menu.availablePages')
-
- @foreach ($pages as $page)
-
- @endforeach
-
-
-
-@section('javascripts')
-
-@endsection
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/menu/new.blade.php b/resources/views/old_admin/widgets/menu/new.blade.php
deleted file mode 100644
index 21632b1d..00000000
--- a/resources/views/old_admin/widgets/menu/new.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('admin.layout')
-
-@section('content')
-
@lang('widgets/menu.new')
-
- @include('admin.widgets.menu.form', ['formAction' => route('widgets.postNew', ['type' => $type])])
-@endsection
\ No newline at end of file
diff --git a/resources/views/old_admin/widgets/orbitSlider/edit.blade.php b/resources/views/old_admin/widgets/orbitSlider/edit.blade.php
deleted file mode 100644
index 0eae42e4..00000000
--- a/resources/views/old_admin/widgets/orbitSlider/edit.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('admin.layout')
-
-@section('pageName', @trans('widgets/orbitSlider.edit', ['name' => $widget->name]))
-
-@section('content')
-
@lang('widgets/orbitSlider.edit', ['name' => $widget->name])
-
-
-
- @include('admin.widgets.orbitSlider.form', ['formAction' => route('widgets.postEdit', ['id' => $widget->id])])
-
-
-
@lang('widgets/orbitSlider.preview')
-
- @widgetPreview($widget)
-
-
-@stop
-
diff --git a/resources/views/old_admin/widgets/orbitSlider/form.blade.php b/resources/views/old_admin/widgets/orbitSlider/form.blade.php
deleted file mode 100644
index 5a61f197..00000000
--- a/resources/views/old_admin/widgets/orbitSlider/form.blade.php
+++ /dev/null
@@ -1,121 +0,0 @@
-@if (!isset($hideMessages))
- @if (session('success'))
-
- {{ session('success') }}
-
- @endif
-
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-@endif
-
-