design changes for admin-layout.blade.php and reception-screen.blade.php #13

Merged
aslan merged 2 commits from RomanGolienko/Roman_applicant-site:main into main 2024-02-01 14:27:26 +03:00
4 changed files with 52 additions and 10 deletions
Showing only changes of commit 42a9fe816f - Show all commits

View File

@ -9,14 +9,18 @@
<table class="table"> <table class="table">
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left"> <thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
<tr> <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>
<th scope="col"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="accordion" id="accordionExample">
@foreach($receptionScreens as $receptionScreen) @foreach($receptionScreens as $receptionScreen)
<tr> <?php $accordion_tmp = str_replace(' ','', $receptionScreen->name) ?>
<tr class="accordion-item">
<th scope="row">{{ $receptionScreen->position }}</th> <th scope="row">{{ $receptionScreen->position }}</th>
<td>{{ $receptionScreen->name }}</td> <td>{{ $receptionScreen->name }}</td>
<td><a href="{{ route("admin-reception-screen.edit", $receptionScreen) }}" class="btn btn-secondary">редактировать</a> <td><a href="{{ route("admin-reception-screen.edit", $receptionScreen) }}" class="btn btn-secondary">редактировать</a>
@ -25,16 +29,23 @@
удалить удалить
</a> </a>
</td> </td>
<th class="accordion-header" id="heading<?php echo $accordion_tmp ?>">
<button class="accordion-button collapsed" 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) @if(count($receptionScreen->files) !== 0)
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">
<table class="table table-bordered"> <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">
<thead>
<thead class="accordion-body">
<tr> <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> </tr>
</thead> </thead>
<tbody> <tbody>
@ -56,6 +67,8 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<div class="mb-2"> <div class="mb-2">
<a href="{{ route('files.create', $receptionScreen->id) }}" <a href="{{ route('files.create', $receptionScreen->id) }}"
@ -63,6 +76,7 @@
Добавить файл Добавить файл
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
@else @else
@ -80,4 +94,30 @@
<br> <br>
<br> <br>
</div> </div>
@endsection @endsection

View File

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

View File

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

View File

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