resources/views/admin-reception-screen/index.blade.php

@@ -1,20 +1,5 @@
 @extends('layouts.admin-layout')
 @section('content')
-    <style>
-        .accordion-button:not(.collapsed)
-        {
-            color:#006147;
-            background-color: rgb(255, 255, 255);
-            box-shadow:inset 0 -1px 0 rgba(0,0,0,.125)
-        }
-        .accordion-button:focus {
-            z-index: 3;
-            border-color: #006147;
-            outline: 0;
-            box-shadow: 0 0 0 0.25rem #006147;
-        }
-
-    </style>
     <div class="container">
         <h2>Экран Приема</h2>
         <br>
@@ -24,18 +9,14 @@
         <table class="table">
             <thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
             <tr>
-
                 <th scope="col">Позиция</th>
                 <th scope="col">Название</th>
                 <th scope="col">действия</th>
-                <th scope="col"></th>
             </tr>
             </thead>
-            <tbody class="accordion" id="accordionExample">
+            <tbody>
             @foreach($receptionScreens as $receptionScreen)
-                    <?php $accordion_tmp = str_replace(' ','', $receptionScreen->name) ?>
+                <tr>
-                <tr class="accordion-item ">
-
                     <th scope="row">{{ $receptionScreen->position }}</th>
                     <td>{{ $receptionScreen->name }}</td>
                     <td><a href="{{ route("admin-reception-screen.edit", $receptionScreen) }}" class="btn btn-secondary">редактировать</a>
@@ -44,24 +25,16 @@
                             удалить
                         </a>
                     </td>
-                    <th class="accordion-header" id="heading<?php echo $accordion_tmp ?>">
-                        <button class="accordion-button collapsed btn btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapse<?php echo $accordion_tmp ?> " aria-expanded="false" aria-controls="collapse<?php echo $accordion_tmp ?>">
-                            Показать
-                        </button>
-                    </th>
                     @if(count($receptionScreen->files) !== 0)
                 </tr>
                 <tr>
                     <td colspan="3">
-                        <table class="table table-bordered accordion-collapse collapse" id="collapse<?php echo $accordion_tmp ?>" aria-labelledby="heading<?php echo $accordion_tmp ?>" data-bs-parent="#accordionExample">
+                        <table class="table table-bordered">
-
+                            <thead>
-                            <thead class="accordion-body">
                             <tr>
                                 <th scope="col">Позиция</th>
                                 <th scope="col">Имя Файла</th>
                                 <th scope="col">действия</th>
-
-
                             </tr>
                             </thead>
                             <tbody>
@@ -80,24 +53,16 @@
                                         </a>
                                     </td>
                                 </tr>
-
                             @endforeach
-                            <tr class=" border border-white border-bottom-0 border-start-0 border-end-0">
-                                <td colspan="3"><div class="mb-2">
-                                        <a href="{{ route('files.create', $receptionScreen->id) }}"
-                                           class="btn btn-primary">
-                                            Добавить файл
-                                        </a>
-                                    </div></td>
-
-                            </tr>
 
                             </tbody>
-
-
                         </table>
-
+                        <div class="mb-2">
-
+                            <a href="{{ route('files.create', $receptionScreen->id) }}"
+                               class="btn btn-primary">
+                                Добавить файл
+                            </a>
+                        </div>
                     </td>
                 </tr>
                 @else
@@ -115,30 +80,4 @@
         <br>
         <br>
     </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 @endsection

resources/views/files/index.blade.php

@@ -9,19 +9,18 @@
         <table class="table">
             <thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
             <tr>
-{{--                <th scope="col">Позиция</th>--}}
+                <th scope="col">Позиция</th>
-                <th scope="col">Экран Приема</th>
                 <th scope="col">Название файла</th>
+                <th scope="col">Экран Приема</th>
                 <th scope="col">действия</th>
             </tr>
             </thead>
             <tbody>
             @foreach($files as $file)
                 <tr>
-                    <td>{{ $file->receptionScreen->name }}</td>
+                    <th scope="row">{{ $file->position }}</th>
-{{--                    <th scope="row">{{ $file->position }}</th>--}}
                     <td>{{ $file->name }}</td>
-
+                    <td>{{ $file->receptionScreen->name }}</td>
                     <td><a href="{{ route("files.edit", $file) }}" class="btn btn-secondary">редактировать</a>
                         <a rel="nofollow" data-method="delete" data-confirm="Вы действительно хотите удалить?"
                            href="{{ route('files.destroy', $file) }}" class="btn btn-danger">

resources/views/layouts/admin-layout.blade.php

@@ -49,10 +49,9 @@
     <div class="row align-items-start">
         <aside class="list-group col-2">
             <ul>
-                <li class="list-group-item"><a href="{{ route('files.index') }}">Файлы</a></li>
                 <li class="list-group-item"><a href="{{ route('admin-reception-screen.index') }}">Экран Приема</a></li>
                 @if(!is_null(Auth::getUser()) && Auth::getUser()->name === 'admin')
-{{--                <li class="list-group-item"></li>--}}
+                <li class="list-group-item"></li>
                 <li class="list-group-item"><a href="{{ route('users.index') }}">Список администраторов</a></li>
                 @endif
             </ul>

resources/views/menu/reception-screen.blade.php

@@ -73,7 +73,7 @@
             <div id="panelsStayOpen-<?php echo $tmp ?>" class="accordion-collapse collapse show">
                 <div class="accordion-body">
                     @foreach($receptionScreen->files as $file)
-                        <div class="col-8 mb-2 pb-2 ms-4">
+                        <div class="col-8 mb-2 pb-2">
                             <a href="{{  $file->url }}">{{ $file->name }}</a>
                         </div>
                     @endforeach