ui: improve accessibility and responsive layout across views

- Add align-items flex-start to flex container in app.scss
- Update grid classes from col-6 to col-md-6 for better responsiveness
- Fix modal accessibility with proper aria-labelledby attributes
- Standardize modal titles to h1 with fs-5 class
- Add explicit button types (button/submit)
- Remove duplicate session flash message blocks
- Consistent button sizing with btn-sm class

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

resources/sass/app.scss

@@ -424,6 +424,7 @@
   flex-wrap: wrap;
   gap: 0.25rem;
   justify-content: flex-end;
+  align-items: flex-start;
 }
 
 .report-tabs {

resources/views/admin/areas/index.blade.php

@@ -2,10 +2,10 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Районы</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             <button type="button" class="btn btn-sm btn-success me-2" data-bs-toggle="modal" data-bs-target="#importModal">
                 Импорт
             </button>
@@ -19,20 +19,6 @@
         </div>
     </div>
 
-    @if(session('success'))
-        <div class="alert alert-success alert-dismissible fade show" role="alert">
-            {{ session('success') }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Закрыть"></button>
-        </div>
-    @endif
-
-    @if(session('error'))
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            {{ session('error') }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Закрыть"></button>
-        </div>
-    @endif
-
     <!-- Фильтр по округу -->
     <div class="row mb-3">
         <div class="col-md-4">
@@ -63,11 +49,11 @@
     ])
 
     <!-- Модальное окно добавления -->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addAreaModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Добавить район</h5>
+                    <h1 class="modal-title fs-5" id="addAreaModalLabel">Добавить район</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">
@@ -88,11 +74,11 @@
     </div>
 
     <!-- Модальное окно импорта -->
-    <div class="modal fade" id="importModal" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importAreaModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Импорт районов</h5>
+                    <h1 class="modal-title fs-5" id="importAreaModalLabel">Импорт районов</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/admin/districts/index.blade.php

@@ -2,10 +2,10 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Округа</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             <button type="button" class="btn btn-sm btn-success me-2" data-bs-toggle="modal" data-bs-target="#importModal">
                 Импорт
             </button>
@@ -19,20 +19,6 @@
         </div>
     </div>
 
-    @if(session('success'))
-        <div class="alert alert-success alert-dismissible fade show" role="alert">
-            {{ session('success') }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Закрыть"></button>
-        </div>
-    @endif
-
-    @if(session('error'))
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            {{ session('error') }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Закрыть"></button>
-        </div>
-    @endif
-
     @include('partials.table', [
         'id' => $id,
         'header' => $header,
@@ -48,11 +34,11 @@
     ])
 
     <!-- Модальное окно добавления -->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addDistrictModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Добавить округ</h5>
+                    <h1 class="modal-title fs-5" id="addDistrictModalLabel">Добавить округ</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">
@@ -68,11 +54,11 @@
     </div>
 
     <!-- Модальное окно импорта -->
-    <div class="modal fade" id="importModal" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importDistrictModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Импорт округов</h5>
+                    <h1 class="modal-title fs-5" id="importDistrictModalLabel">Импорт округов</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/admin/settings/index.blade.php

@@ -7,13 +7,6 @@
         </div>
     </div>
 
-    @if(session('success'))
-        <div class="alert alert-success alert-dismissible fade show" role="alert">
-            {{ session('success') }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Закрыть"></button>
-        </div>
-    @endif
-
     <form action="{{ route('admin.settings.store') }}" method="post">
         @csrf
         @include('partials.select', [

resources/views/catalog/edit.blade.php

@@ -3,10 +3,10 @@
 @section('content')
     <div class="px-3">
         <div class="row mb-2">
-            <div class="col-6 d-flex align-items-center">
+            <div class="col-md-6 d-flex align-items-center">
                 <h3 class="mb-0">МАФ {{ $product->common_name ?? 'Новый МАФ' }} ({{ $product->year ?? year() }})</h3>
             </div>
-            <div class="col-6 d-flex align-items-center justify-content-end action-toolbar">
+            <div class="col-md-6 d-flex align-items-center justify-content-end action-toolbar">
                 @if(isset($product) && hasRole('admin'))
                     @if($product->image)
                         <a href="{{ $product->image }}" data-toggle="lightbox" data-gallery="photos" data-size="fullscreen">

resources/views/catalog/index.blade.php

@@ -32,11 +32,11 @@
     @include('partials.pagination', ['items' => $products])
 
     <!-- Модальное окно импорта-->
-    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="exampleModalLabel">Выберите файл для импорта</h1>
+                    <h1 class="modal-title fs-5" id="importModalLabel">Импорт каталога</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">
@@ -52,11 +52,11 @@
     </div>
 
     <!-- Модальное окно экспорта-->
-    <div class="modal fade" id="exportModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="exportModal" tabindex="-1" aria-labelledby="exportModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="exampleModalLabel">Экспорт</h1>
+                    <h1 class="modal-title fs-5" id="exportModalLabel">Экспорт каталога</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/clear-data/index.blade.php

@@ -74,11 +74,11 @@
     </div>
 
     <!-- Модальное окно подтверждения -->
-    <div class="modal fade" id="confirmModal" tabindex="-1" aria-hidden="true">
+    <div class="modal fade" id="confirmModal" tabindex="-1" aria-labelledby="confirmModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header bg-danger text-white">
-                    <h5 class="modal-title">Подтверждение удаления</h5>
+                    <h1 class="modal-title fs-5" id="confirmModalLabel">Подтверждение удаления</h1>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/contracts/index.blade.php

@@ -2,10 +2,10 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Договоры</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             <a href="{{ route('contract.create') }}" class="btn btn-sm btn-primary">Добавить</a>
         </div>
     </div>

resources/views/import/index.blade.php

@@ -2,11 +2,11 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Импорт</h3>
         </div>
         @if(hasRole('admin'))
-            <div class="col-6 text-end">
+            <div class="col-md-6 text-end">
                 <button type="button" class="btn btn-sm mb-1 btn-primary" data-bs-toggle="modal" data-bs-target="#importModal">
                     Импорт
                 </button>
@@ -22,11 +22,11 @@
 
     @include('partials.pagination', ['items' => $imports])
     <!-- Модальное окно импорта-->
-    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="exampleModalLabel">Выберите файл для импорта</h1>
+                    <h1 class="modal-title fs-5" id="importModalLabel">Импорт данных</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/maf_orders/index.blade.php

@@ -25,7 +25,7 @@
 
     @include('partials.pagination', ['items' => $maf_orders])
     <!-- Модальное окно добавления-->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">
                 <div class="modal-header">

resources/views/orders/show.blade.php

@@ -350,11 +350,11 @@
 
     @if(hasRole('admin'))
         <!-- Модальное окно графика -->
-        <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+        <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="copyScheduleLabel" aria-hidden="true">
             <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h1 class="modal-title fs-5" id="addModalLabel">Перенести в график монтажей</h1>
+                        <h1 class="modal-title fs-5" id="copyScheduleLabel">Перенести в график монтажей</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                     </div>
                     <div class="modal-body">
@@ -379,11 +379,11 @@
         </div>
 
         <!-- Модальное окно ТН -->
-        <div class="modal fade" id="createTtnModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+        <div class="modal fade" id="createTtnModal" tabindex="-1" aria-labelledby="createTtnModalLabel" aria-hidden="true">
             <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h1 class="modal-title fs-5" id="addModalLabel">Введите данные для ТН</h1>
+                        <h1 class="modal-title fs-5" id="createTtnModalLabel">Введите данные для ТН</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                     </div>
                     <div class="modal-body">
@@ -393,7 +393,7 @@
                                 <input type="text" class="form-control mb-2" name="order_number" placeholder="Номер заказа">
                                 <input type="date" class="form-control mb-2" name="order_date" placeholder="Дата заказа" value="{{ date('Y-m-d') }}">
                                 <input type="number" class="form-control mb-2" name="order_sum" placeholder="Сумма заказа" value="0">
-                                <button href="#" class="btn btn-primary" id="createTtn">Создать ТН</button>
+                                <button type="button" class="btn btn-primary" id="createTtn">Создать ТН</button>
                             </div>
                         </form>
                     </div>
@@ -402,11 +402,11 @@
         </div>
 
         <!-- Модальное окно переноса -->
-        <div class="modal fade" id="moveModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+        <div class="modal fade" id="moveModal" tabindex="-1" aria-labelledby="moveModalLabel" aria-hidden="true">
             <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h1 class="modal-title fs-5" id="addModalLabel">Выбрать площадку, куда переносим</h1>
+                        <h1 class="modal-title fs-5" id="moveModalLabel">Выбрать площадку, куда переносим</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                     </div>
                     <div class="modal-body">
@@ -416,7 +416,7 @@
                                 <input type="text" class="form-control mb-2" placeholder="Поиск площадки" id="search_order">
                                 <select id="select_order" name="new_order_id" class="form-select mb-3" size="20" multiple
                                         required></select>
-                                <a href="#" class="btn btn-primary" id="moveMaf">Перенести</a>
+                                <button type="button" class="btn btn-primary" id="moveMaf">Перенести</button>
                             </div>
                         </form>
                     </div>

resources/views/partials/customAlert.blade.php

@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="customAlertModalLabel">Внимание</h5>
+                <h1 class="modal-title fs-5" id="customAlertModalLabel">Внимание</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
             </div>
             <div class="modal-body" id="customAlertModalBody">
@@ -19,7 +19,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="customConfirmModalLabel">Подтверждение</h5>
+                <h1 class="modal-title fs-5" id="customConfirmModalLabel">Подтверждение</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
             </div>
             <div class="modal-body" id="customConfirmModalBody"></div>

resources/views/partials/table.blade.php

@@ -227,12 +227,12 @@
 </div>
 
 <!-- Модальное окно настроек таблицы -->
-<div class="modal fade" id="table_{{ $id }}_modal_settings" tabindex="-1" aria-labelledby="exampleModalLabel"
+<div class="modal fade" id="table_{{ $id }}_modal_settings" tabindex="-1" aria-labelledby="table_{{ $id }}_modal_settings_label"
      aria-hidden="true">
     <div class="modal-dialog modal-fullscreen-sm-down">
         <div class="modal-content">
             <div class="modal-header">
-                <h1 class="modal-title fs-5" id="exampleModalLabel">Выбор отображаемых колонок</h1>
+                <h1 class="modal-title fs-5" id="table_{{ $id }}_modal_settings_label">Выбор отображаемых колонок</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
             </div>
             <div class="modal-body">
@@ -252,12 +252,12 @@
 </div>
 
 <!-- Модальное окно фильтров -->
-<div class="modal fade" id="table_{{ $id }}_modal_filters" tabindex="-1" aria-labelledby="exampleModalLabel"
+<div class="modal fade" id="table_{{ $id }}_modal_filters" tabindex="-1" aria-labelledby="table_{{ $id }}_modal_filters_label"
      aria-hidden="true">
     <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h1 class="modal-title fs-5" id="exampleModalLabel">Фильтры по колонкам таблицы</h1>
+                <h1 class="modal-title fs-5" id="table_{{ $id }}_modal_filters_label">Фильтры по колонкам таблицы</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
             </div>
             <div class="modal-body">
@@ -329,12 +329,12 @@
 </div>
 
 <!-- Модальное окно поиска -->
-<div class="modal fade" id="table_{{ $id }}_modal_search" tabindex="-1" aria-labelledby="exampleModalLabel"
+<div class="modal fade" id="table_{{ $id }}_modal_search" tabindex="-1" aria-labelledby="table_{{ $id }}_modal_search_label"
      aria-hidden="true">
     <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h1 class="modal-title fs-5" id="exampleModalLabel">Поиск</h1>
+                <h1 class="modal-title fs-5" id="table_{{ $id }}_modal_search_label">Поиск</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
             </div>
             <div class="modal-body">

resources/views/partials/textarea.blade.php

@@ -1,9 +1,9 @@
 <div class="row mb-2">
-    <label for="{{ $name }}" class="col-form-label col-md-4 text-md-end mt-1">
+    <label for="{{ $name }}" class="col-form-label small @if(!($right ?? null)) col-md-4 text-md-end @endif">
         {{ $title ?? '' }}
         @isset($required) <sup>*</sup> @endisset
     </label>
-    <div class="col-md-8">
+    <div class="@if(!($right ?? null)) col-md-8 @endif">
         <textarea type="{{ $type ?? 'text' }}" name="{{ $name }}" id="{{ $name }}" @isset($size) rows="{{ $size }}" @endisset
                class="form-control @error($name) is-invalid @enderror  @isset($classes) {{ implode(' ', $classes) }} @endisset" @disabled($disabled ?? null) @required($required ?? null)
         >{{ old($name, $value ?? '') }}</textarea>

resources/views/pricing_codes/index.blade.php

@@ -4,7 +4,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-12">
-            <h2>{{ $title }}</h2>
+            <h3>{{ $title }}</h3>
 
             {{-- Навигация --}}
             <ul class="nav nav-tabs mb-3">
@@ -38,7 +38,7 @@
 
             {{-- Кнопки управления --}}
             <div class="mb-3">
-                <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addCodeModal">
+                <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addCodeModal">
                     Добавить код
                 </button>
             </div>
@@ -64,11 +64,11 @@
 </div>
 
 {{-- Модальное окно добавления кода --}}
-<div class="modal fade" id="addCodeModal" tabindex="-1">
+<div class="modal fade" id="addCodeModal" tabindex="-1" aria-labelledby="addCodeModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">Добавить код расценки</h5>
+                <h1 class="modal-title fs-5" id="addCodeModalLabel">Добавить код расценки</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form action="{{ route('pricing_codes.store') }}" method="POST">

resources/views/products_sku/index.blade.php

@@ -30,11 +30,11 @@
 
     @include('partials.pagination', ['items' => $products_sku])
     <!-- Модальное окно импорта-->
-    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="exampleModalLabel">Выберите файл для импорта</h1>
+                    <h1 class="modal-title fs-5" id="importModalLabel">Импорт МАФ</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">
@@ -50,11 +50,11 @@
     </div>
 
     <!-- Модальное окно экспорта-->
-    <div class="modal fade" id="exportModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="exportModal" tabindex="-1" aria-labelledby="exportModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="exampleModalLabel">Экспорт</h1>
+                    <h1 class="modal-title fs-5" id="exportModalLabel">Экспорт МАФ</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/reclamations/edit.blade.php

@@ -591,11 +591,11 @@
 
     @if(hasRole('admin'))
         <!-- Модальное окно графика -->
-        <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+        <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="copyScheduleLabel" aria-hidden="true">
             <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h1 class="modal-title fs-5" id="addModalLabel">Перенести в график монтажей</h1>
+                        <h1 class="modal-title fs-5" id="copyScheduleLabel">Перенести в график монтажей</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                     </div>
                     <div class="modal-body">

resources/views/reclamations/index.blade.php

@@ -3,10 +3,10 @@
 @section('content')
 
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Рекламации</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             @if(hasRole('admin'))
                 <a href="#" class="btn btn-sm btn-primary" onclick="$('#export-reclamations').submit()">Экспорт</a>
             @endif

resources/views/reports/index.blade.php

@@ -17,13 +17,12 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-md-4">
+        <div class="col-md-6">
             <h3>Отчеты</h3>
         </div>
-        <div class="col-md-4 text-center">
+        <div class="col-md-6 text-center">
             <div class="fw-bold fs-2 lh-1">{{ year() }}</div>
         </div>
-        <div class="col-md-4 text-end"></div>
     </div>
 
     <ul class="nav nav-tabs report-tabs" id="myTab" role="tablist">

resources/views/responsibles/index.blade.php

@@ -3,10 +3,10 @@
 @section('content')
 
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Ответственные</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addModal">
                 Добавить
             </button>
@@ -23,11 +23,11 @@
 
     @include('partials.pagination', ['items' => $responsibles])
     <!-- Модальное окно добавления-->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="addModalLabel">Добавить заказ МАФ</h1>
+                    <h1 class="modal-title fs-5" id="addModalLabel">Добавить ответственного</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">

resources/views/schedule/index.blade.php

@@ -30,7 +30,7 @@
                                 <i class="bi bi-arrow-left"></i>
                             </button>
                         </div>
-                        <label class="p-2 d-none d-md-block small mt-1" for="fromDate">Неделя №</label>
+                        <label class="p-2 d-none d-md-block small" for="fromDate">Неделя №</label>
                         <div class="p-2">
                             <input type="number" value="{{ $weekNumber }}"
                                    class="form-control form-control-sm week-number-input" name="weekNumber"
@@ -307,11 +307,11 @@
 
         @if(hasRole('admin'))
             <!-- Модальное окно редактирования графика -->
-            <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+            <div class="modal fade" id="copySchedule" tabindex="-1" aria-labelledby="copyScheduleLabel" aria-hidden="true">
                 <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <h1 class="modal-title fs-5" id="addModalLabel">Изменить/создать запись в графике</h1>
+                            <h1 class="modal-title fs-5" id="copyScheduleLabel">Изменить/создать запись в графике</h1>
                             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                         </div>
                         <div class="modal-body">

resources/views/spare_part_orders/edit.blade.php

@@ -4,7 +4,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-6">
-            <h2>{{ $spare_part_order ? 'Заказ детали #' . $spare_part_order->id : 'Новый заказ детали' }}</h2>
+            <h3>{{ $spare_part_order ? 'Заказ детали #' . $spare_part_order->id : 'Новый заказ детали' }}</h3>
 
             <form action="{{ $spare_part_order ? route('spare_part_orders.update', $spare_part_order) : route('spare_part_orders.store') }}"
                   method="POST">
@@ -97,18 +97,18 @@
                 </div>
 
                 <div class="mb-3 d-flex flex-wrap gap-1 align-items-start">
-                    <button type="submit" class="btn btn-success">Сохранить</button>
-                    <a href="{{ $previous_url ?? route('spare_part_orders.index') }}" class="btn btn-secondary">Назад</a>
+                    <button type="submit" class="btn btn-sm btn-success">Сохранить</button>
+                    <a href="{{ $previous_url ?? route('spare_part_orders.index') }}" class="btn btn-sm btn-secondary">Назад</a>
 
                     @if($spare_part_order && $spare_part_order->status === 'ordered' && hasRole('admin,manager'))
                         <form action="{{ route('spare_part_orders.set_in_stock', $spare_part_order) }}" method="POST" class="d-inline">
                             @csrf
-                            <button type="submit" class="btn btn-info">Поступило на склад</button>
+                            <button type="submit" class="btn btn-sm btn-info">Поступило на склад</button>
                         </form>
                     @endif
 
                     @if($spare_part_order && hasRole('admin'))
-                        <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
+                        <button type="button" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
                             Удалить
                         </button>
                     @endif
@@ -170,11 +170,11 @@
                 <h3>История движений</h3>
 
                 @if($spare_part_order->status === 'in_stock' && $spare_part_order->free_qty > 0 && hasRole('admin,manager'))
-                    <button type="button" class="btn btn-warning mb-3" data-bs-toggle="modal" data-bs-target="#shipModal">
+                    <button type="button" class="btn btn-sm btn-warning mb-3" data-bs-toggle="modal" data-bs-target="#shipModal">
                         Отгрузить
                     </button>
                     @if(hasRole('admin'))
-                        <button type="button" class="btn btn-secondary mb-3" data-bs-toggle="modal" data-bs-target="#correctModal">
+                        <button type="button" class="btn btn-sm btn-secondary mb-3" data-bs-toggle="modal" data-bs-target="#correctModal">
                             Коррекция
                         </button>
                     @endif
@@ -220,13 +220,13 @@
 
 @if($spare_part_order && hasRole('admin,manager'))
     {{-- Модальное окно отгрузки --}}
-    <div class="modal fade" id="shipModal" tabindex="-1">
+    <div class="modal fade" id="shipModal" tabindex="-1" aria-labelledby="shipModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <form action="{{ route('spare_part_orders.ship', $spare_part_order) }}" method="POST">
                     @csrf
                     <div class="modal-header">
-                        <h5 class="modal-title">Отгрузка</h5>
+                        <h1 class="modal-title fs-5" id="shipModalLabel">Отгрузка</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                     </div>
                     <div class="modal-body">
@@ -261,13 +261,13 @@
 
 @if($spare_part_order && hasRole('admin'))
     {{-- Модальное окно коррекции --}}
-    <div class="modal fade" id="correctModal" tabindex="-1">
+    <div class="modal fade" id="correctModal" tabindex="-1" aria-labelledby="correctModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <form action="{{ route('spare_part_orders.correct', $spare_part_order) }}" method="POST">
                     @csrf
                     <div class="modal-header">
-                        <h5 class="modal-title">Коррекция остатка</h5>
+                        <h1 class="modal-title fs-5" id="correctModalLabel">Коррекция остатка</h1>
                         <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                     </div>
                     <div class="modal-body">
@@ -297,11 +297,11 @@
     </div>
 
     {{-- Модальное окно удаления --}}
-    <div class="modal fade" id="deleteModal" tabindex="-1">
+    <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Подтверждение удаления</h5>
+                    <h1 class="modal-title fs-5" id="deleteModalLabel">Подтверждение удаления</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">

resources/views/spare_parts/edit.blade.php

@@ -5,10 +5,10 @@
     <div class="row">
         <div class="col-12">
             <div class="row mb-2">
-                <div class="col-6">
-                    <h2>{{ $spare_part ? 'Редактирование запчасти' : 'Создание запчасти' }}</h2>
+                <div class="col-md-6">
+                    <h3>{{ $spare_part ? 'Редактирование запчасти' : 'Создание запчасти' }}</h3>
                 </div>
-                <div class="col-6 text-end">
+                <div class="col-md-6 text-end">
                     @if($spare_part && hasRole('admin'))
                         <button class="btn btn-sm text-success" onclick="$('#upl-image').trigger('click');"><i class="bi bi-plus-circle-fill"></i> Загрузить изображение</button>
 
@@ -216,12 +216,12 @@
                 <div class="row">
                     <div class="col-12">
                         @if(hasRole('admin'))
-                            <button type="submit" class="btn btn-success">Сохранить</button>
+                            <button type="submit" class="btn btn-sm btn-success">Сохранить</button>
                         @endif
-                        <a href="{{ $previous_url ?? route('spare_parts.index') }}" class="btn btn-secondary">Назад</a>
+                        <a href="{{ $previous_url ?? route('spare_parts.index') }}" class="btn btn-sm btn-secondary">Назад</a>
 
                         @if($spare_part && hasRole('admin'))
-                            <button type="button" class="btn btn-danger float-end" data-bs-toggle="modal" data-bs-target="#deleteModal">
+                            <button type="button" class="btn btn-sm btn-danger float-end" data-bs-toggle="modal" data-bs-target="#deleteModal">
                                 Удалить
                             </button>
                         @endif
@@ -515,11 +515,11 @@
 
 @if($spare_part && hasRole('admin'))
     {{-- Модальное окно удаления --}}
-    <div class="modal fade" id="deleteModal" tabindex="-1">
+    <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteSparePartModalLabel" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Подтверждение удаления</h5>
+                    <h1 class="modal-title fs-5" id="deleteSparePartModalLabel">Подтверждение удаления</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">

resources/views/spare_parts/index.blade.php

@@ -4,7 +4,7 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-12">
-            <h2>{{ $title }}</h2>
+            <h3>{{ $title }}</h3>
 
             {{-- Вкладки --}}
             <ul class="nav nav-tabs mb-3">
@@ -45,12 +45,12 @@
                 {{-- Кнопки управления --}}
                 <div class="mb-3">
                     @if(hasRole('admin'))
-                        <a href="{{ route('spare_parts.create') }}" class="btn btn-primary">Добавить запчасть</a>
+                        <a href="{{ route('spare_parts.create') }}" class="btn btn-sm btn-primary">Добавить запчасть</a>
                         <form action="{{ route('spare_parts.export') }}" method="POST" class="d-inline">
                             @csrf
-                            <button type="submit" class="btn btn-success">Экспорт</button>
+                            <button type="submit" class="btn btn-sm btn-success">Экспорт</button>
                         </form>
-                        <button type="button" class="btn btn-info" data-bs-toggle="modal" data-bs-target="#importModal">
+                        <button type="button" class="btn btn-sm btn-info" data-bs-toggle="modal" data-bs-target="#importModal">
                             Импорт
                         </button>
                     @endif
@@ -79,7 +79,7 @@
                 @if(isset($spare_part_orders))
                     <div class="mb-3">
                         @if(hasRole('admin,manager'))
-                            <a href="{{ route('spare_part_orders.create') }}" class="btn btn-primary">Создать заказ</a>
+                            <a href="{{ route('spare_part_orders.create') }}" class="btn btn-sm btn-primary">Создать заказ</a>
                         @endif
                     </div>
 
@@ -275,11 +275,11 @@
 
 {{-- Модальное окно импорта --}}
 @if(hasRole('admin'))
-<div class="modal fade" id="importModal" tabindex="-1">
+<div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importSparePartsModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">Импорт каталога запчастей и справочника расшифровок</h5>
+                <h1 class="modal-title fs-5" id="importSparePartsModalLabel">Импорт каталога запчастей и справочника расшифровок</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form action="{{ route('spare_parts.import') }}" method="POST" enctype="multipart/form-data">

resources/views/users/index.blade.php

@@ -2,10 +2,10 @@
 
 @section('content')
     <div class="row mb-2">
-        <div class="col-6">
+        <div class="col-md-6">
             <h3>Пользователи</h3>
         </div>
-        <div class="col-6 text-end">
+        <div class="col-md-6 text-end">
             <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addModal">
                 Добавить
             </button>
@@ -23,11 +23,11 @@
     @include('partials.pagination', ['items' => $users])
 
     <!-- Модальное окно добавления-->
-    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="addModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-fullscreen-sm-down modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h1 class="modal-title fs-5" id="addModalLabel">Добавить заказ МАФ</h1>
+                    <h1 class="modal-title fs-5" id="addModalLabel">Добавить пользователя</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
                 </div>
                 <div class="modal-body">