diff --git a/app/Http/Controllers/EchoareaController.php b/app/Http/Controllers/EchoareaController.php index abc71ad..085a562 100644 --- a/app/Http/Controllers/EchoareaController.php +++ b/app/Http/Controllers/EchoareaController.php @@ -41,9 +41,4 @@ class EchoareaController extends Controller return view('echoarea.addedit') ->with('o',$o); } - - public function home() - { - return view('echoarea.home'); - } } \ No newline at end of file diff --git a/app/Http/Controllers/FileareaController.php b/app/Http/Controllers/FileareaController.php index 8667a20..92613d9 100644 --- a/app/Http/Controllers/FileareaController.php +++ b/app/Http/Controllers/FileareaController.php @@ -46,9 +46,4 @@ class FileareaController extends Controller return view('filearea.addedit') ->with('o',$o); } - - public function home() - { - return view('filearea.home'); - } } \ No newline at end of file diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php index 8f37093..87e68e8 100644 --- a/resources/views/domain/addedit.blade.php +++ b/resources/views/domain/addedit.blade.php @@ -104,7 +104,7 @@ @if ($o->nodelist_filename)
- +
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php index 3f5e64e..d9e9e5d 100644 --- a/resources/views/domain/view.blade.php +++ b/resources/views/domain/view.blade.php @@ -51,7 +51,7 @@ @foreach ($o->echoarea_stats()->groupBy('id') as $oo) - {{ $x->name }} + {{ $x->name }} {{ $x->description }} {{ $x->last_message ? $x->last_message->format('Y-m-d H:i') : '-' }} {{ $x->active ? 'Active' : 'Archive' }} @@ -90,7 +90,7 @@ @foreach ($o->fileareas->sortBy('name') as $oo) - {{ $oo->name }} + {{ $oo->name }} {{ $oo->description }} - diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php index 96f575f..c8fdbb5 100644 --- a/resources/views/echoarea/addedit.blade.php +++ b/resources/views/echoarea/addedit.blade.php @@ -140,7 +140,7 @@
- Cancel + Cancel @can('admin',$o) @endcan diff --git a/resources/views/echoarea/home.blade.php b/resources/views/echoarea/home.blade.php index d037e9e..2483f39 100644 --- a/resources/views/echoarea/home.blade.php +++ b/resources/views/echoarea/home.blade.php @@ -14,11 +14,11 @@
-

This system is aware of the following echoareas @can('admin',(new \App\Models\Echoarea))(you can add more)@endcan:

+

This system is aware of the following echoareas @can('admin',(new \App\Models\Echoarea))(you can add more)@endcan:

@if (\App\Models\Echoarea::count() === 0) @can('admin',(new \App\Models\Echoarea)) -

There are no echoareas setup, to set up your first.

+

There are no echoareas setup, to set up your first.

@else

There are no echoareas - you need to ask an admin to create one for you.

@endcan @@ -39,7 +39,7 @@ @foreach (\App\Models\Echoarea::orderBy('name')->with(['domain'])->get() as $oo) - {{ $oo->id }} + {{ $oo->id }} {{ $oo->name }} {{ $oo->description }} {{ $oo->active ? 'YES' : 'NO' }} diff --git a/resources/views/filearea/addedit.blade.php b/resources/views/filearea/addedit.blade.php index af98864..f979035 100644 --- a/resources/views/filearea/addedit.blade.php +++ b/resources/views/filearea/addedit.blade.php @@ -141,7 +141,7 @@
- Cancel + Cancel @can('admin',$o) @endcan diff --git a/resources/views/filearea/home.blade.php b/resources/views/filearea/home.blade.php index f706fd6..eb29f2f 100644 --- a/resources/views/filearea/home.blade.php +++ b/resources/views/filearea/home.blade.php @@ -14,11 +14,11 @@
-

This system is aware of the following fileareas @can('admin',(new \App\Models\Filearea))(you can add more)@endcan:

+

This system is aware of the following fileareas @can('admin',(new \App\Models\Filearea))(you can add more)@endcan:

@if (\App\Models\Filearea::count() === 0) @can('admin',(new \App\Models\Filearea)) -

There are no fileareas setup, to set up your first.

+

There are no fileareas setup, to set up your first.

@else

There are no fileareas - you need to ask an admin to create one for you.

@endcan @@ -39,7 +39,7 @@ @foreach (\App\Models\Filearea::orderBy('name')->with(['domain'])->get() as $oo) - {{ $oo->id }} + {{ $oo->id }} {{ $oo->name }} {{ $oo->description }} {{ $oo->active ? 'YES' : 'NO' }} diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 7aa33d9..c5eb1bd 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -28,8 +28,8 @@
Domains
Systems
Zones
-
Echoareas
-
Fileareas
+
Echoareas
+
Fileareas
diff --git a/routes/web.php b/routes/web.php index 510b01b..cb2a0a4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -65,11 +65,11 @@ Route::middleware(['auth','verified','activeuser'])->group(function () { Route::match(['get','post'],'domain/addedit/{o?}',[DomainController::class,'add_edit']) ->where('o','[0-9]+'); - Route::get('ftn/echoarea',[EchoareaController::class,'home']); - Route::match(['get','post'],'ftn/echoarea/addedit/{o?}',[EchoareaController::class,'add_edit']) + Route::view('echoarea','echoarea.home'); + Route::match(['get','post'],'echoarea/addedit/{o?}',[EchoareaController::class,'add_edit']) ->where('o','[0-9]+'); - Route::get('ftn/filearea',[FileareaController::class,'home']); - Route::match(['get','post'],'ftn/filearea/addedit/{o?}',[FileareaController::class,'add_edit']) + Route::view('filearea','filearea.home'); + Route::match(['get','post'],'filearea/addedit/{o?}',[FileareaController::class,'add_edit']) ->where('o','[0-9]+'); /* SYSTEM PATHS */