From 42a9fe816fde6167f97e1799124b6cd96a4951fb Mon Sep 17 00:00:00 2001 From: ROMANGOLIENKO Date: Thu, 1 Feb 2024 13:40:31 +0300 Subject: [PATCH 1/2] design changes for admin-layout.blade.php and reception-screen.blade.php --- .../admin-reception-screen/index.blade.php | 48 +++++++++++++++++-- resources/views/files/index.blade.php | 9 ++-- .../views/layouts/admin-layout.blade.php | 3 +- .../views/menu/reception-screen.blade.php | 2 +- 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/resources/views/admin-reception-screen/index.blade.php b/resources/views/admin-reception-screen/index.blade.php index 4c644e2..618254b 100644 --- a/resources/views/admin-reception-screen/index.blade.php +++ b/resources/views/admin-reception-screen/index.blade.php @@ -9,14 +9,18 @@ + + - + @foreach($receptionScreens as $receptionScreen) - + name) ?> + + + @if(count($receptionScreen->files) !== 0) @else @@ -80,4 +94,30 @@

+ + + + + + + + + + + + + + + + + + + + + + + + + + @endsection diff --git a/resources/views/files/index.blade.php b/resources/views/files/index.blade.php index 3ad1ee5..e384314 100644 --- a/resources/views/files/index.blade.php +++ b/resources/views/files/index.blade.php @@ -9,18 +9,19 @@
Позиция Название действия
{{ $receptionScreen->position }} {{ $receptionScreen->name }} редактировать @@ -25,16 +29,23 @@ удалить + +
- - +
+ + + @@ -56,6 +67,8 @@ @endforeach + +
Позиция Имя Файла действия
+
- - +{{-- --}} + @foreach($files as $file) - - +{{-- --}} + + @foreach($receptionScreens as $receptionScreen) name) ?> - + @@ -30,7 +45,7 @@ @@ -46,6 +61,7 @@ + @@ -64,18 +80,23 @@ + @endforeach + + + +
ПозицияНазвание файлаПозицияЭкран ПриемаНазвание файла действия
{{ $file->position }}{{ $file->name }} {{ $file->receptionScreen->name }}{{ $file->position }}{{ $file->name }}редактировать diff --git a/resources/views/layouts/admin-layout.blade.php b/resources/views/layouts/admin-layout.blade.php index e4f171e..2275618 100644 --- a/resources/views/layouts/admin-layout.blade.php +++ b/resources/views/layouts/admin-layout.blade.php @@ -49,9 +49,10 @@
{{ $receptionScreen->position }} {{ $receptionScreen->name }} - Имя Файла действия
-
- - Добавить файл - -
+