Изменения в меню админки. Баг со кавычками получатель-отправитель

Андрей Ларионов
1 parent 6b5dca57f0
Showing 2 changed files with 88 additions and 15 deletions Side-by-side Diff
resources/views/admin/message-read.blade.php
resources/views/layout/admin.blade.php
@@ -12,7 +12,7 @@
         <span class="text-gray-700 dark:text-gray-400">Отправитель</span>
         <input name="name1" id="name1" disabled
                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-               placeholder="Название пункта" value="@php echo (isset($message->user_from->name)) ? $message->user_from->name.' ('.$message->user_from->id.')' : 'Не определен'; @endphp"
+               placeholder="Название пункта" value='@php echo (isset($message->user_from->name)) ? $message->user_from->name." (".$message->user_from->id.")" : "Не определен"; @endphp'
         />
     </label><br>
  
@@ -20,7 +20,7 @@
         <span class="text-gray-700 dark:text-gray-400">Получатель</span>
         <input name="name2" id="name2" disabled
                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-               placeholder="Название пункта" value="@php echo (isset($message->user_to->name)) ? $message->user_to->name.' ('.$message->user_to->id.')' : 'Не определен'; @endphp"
+               placeholder="Название пункта" value='@php echo (isset($message->user_to->name)) ? $message->user_to->name." (".$message->user_to->id.")" : "Не определен"; @endphp'
             />
     </label><br>
  
@@ -235,6 +235,27 @@
                 </li>
                 @endif
                 <li class="relative px-6 py-3">
+                        <a
+                            class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.education.index') }}"
+                        >
+                            <svg
+                                class="w-5 h-5"
+                                aria-hidden="true"
+                                fill="none"
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                stroke-width="2"
+                                viewBox="0 0 24 24"
+                                stroke="currentColor"
+                            >
+                                <path
+                                    d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
+                                ></path>
+                            </svg>
+                            <span class="ml-4">Учебн.заведения</span>
+                        </a>
+                </li>
+                <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.statics') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.statics') }}"
                     >
@@ -275,6 +296,27 @@
                         <span class="ml-4">Модерация</span>
                     </a>
                 </li>
+                <li class="relative px-6 py-3">
+                    <a
+                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.reclames') }}"
+                    >
+                        <svg
+                            class="w-5 h-5"
+                            aria-hidden="true"
+                            fill="none"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            stroke-width="2"
+                            viewBox="0 0 24 24"
+                            stroke="currentColor"
+                        >
+                            <path
+                                d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
+                            ></path>
+                        </svg>
+                        <span class="ml-4">Реклама</span>
+                    </a>
+                </li>
                 <!-- Справочники -->
                 <li class="relative px-6 py-3" x-data="{ open1: false }">
                     <button
@@ -330,9 +372,6 @@
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.category-emp.index') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.category-emp.index') }}">Категории работодателей</a>
                             </li>
-                            <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}">
-                                <a class="w-full" href="{{ route('admin.education.index') }}">Образование</a>
-                            </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.infobloks.index') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
                             </li>
@@ -394,9 +433,7 @@
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.edit-blocks') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
                             </li>
-                            <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}">
-                                <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
-                            </li>
+
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.editor-seo') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
                             </li>
@@ -650,6 +687,27 @@
                 </li>
                 @endif
                 <li class="relative px-6 py-3">
+                        <a
+                            class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.education.index') }}"
+                        >
+                            <svg
+                                class="w-5 h-5"
+                                aria-hidden="true"
+                                fill="none"
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                stroke-width="2"
+                                viewBox="0 0 24 24"
+                                stroke="currentColor"
+                            >
+                                <path
+                                    d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
+                                ></path>
+                            </svg>
+                            <span class="ml-4">Учебн.заведения</span>
+                        </a>
+                </li>
+                <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.statics') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.statics') }}"
                     >
@@ -687,7 +745,28 @@
                         >
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
-                        <span class="ml-4">Сообщения</span>
+                        <span class="ml-4">Сообщения все</span>
+                    </a>
+                </li>
+                <li class="relative px-6 py-3">
+                    <a
+                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.reclames') }}"
+                    >
+                        <svg
+                            class="w-5 h-5"
+                            aria-hidden="true"
+                            fill="none"
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            stroke-width="2"
+                            viewBox="0 0 24 24"
+                            stroke="currentColor"
+                        >
+                            <path
+                                d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
+                            ></path>
+                        </svg>
+                        <span class="ml-4">Реклама</span>
                     </a>
                 </li>
                 <!-- Справочники -->
@@ -745,9 +824,6 @@
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.category-emp.index') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.category-emp.index') }}">Категории работодателей</a>
                             </li>
-                            <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}">
-                                <a class="w-full" href="{{ route('admin.education.index') }}">Образование</a>
-                            </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.infobloks.index') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
                             </li>
@@ -811,9 +887,6 @@
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.edit-blocks') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
                             </li>
-                            <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}">
-                                <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
-                            </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.editor-seo') ? 'dark:text-gray-100' : null }}">
                                 <a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
                             </li>
...	...	@@ -12,7 +12,7 @@
12	12	<span class="text-gray-700 dark:text-gray-400">Отправитель</span>
13	13	<input name="name1" id="name1" disabled
14	14	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
15		- placeholder="Название пункта" value="@php echo (isset($message->user_from->name)) ? $message->user_from->name.' ('.$message->user_from->id.')' : 'Не определен'; @endphp"
	15	+ placeholder="Название пункта" value='@php echo (isset($message->user_from->name)) ? $message->user_from->name." (".$message->user_from->id.")" : "Не определен"; @endphp'
16	16	/>
17	17	</label><br>
18	18
...	...	@@ -20,7 +20,7 @@
20	20	<span class="text-gray-700 dark:text-gray-400">Получатель</span>
21	21	<input name="name2" id="name2" disabled
22	22	class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
23		- placeholder="Название пункта" value="@php echo (isset($message->user_to->name)) ? $message->user_to->name.' ('.$message->user_to->id.')' : 'Не определен'; @endphp"
	23	+ placeholder="Название пункта" value='@php echo (isset($message->user_to->name)) ? $message->user_to->name." (".$message->user_to->id.")" : "Не определен"; @endphp'
24	24	/>
25	25	</label><br>
26	26
...	...	@@ -235,6 +235,27 @@
235	235	</li>
236	236	@endif
237	237	<li class="relative px-6 py-3">
	238	+ <a
	239	+ class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.education.index') }}"
	240	+ >
	241	+ <svg
	242	+ class="w-5 h-5"
	243	+ aria-hidden="true"
	244	+ fill="none"
	245	+ stroke-linecap="round"
	246	+ stroke-linejoin="round"
	247	+ stroke-width="2"
	248	+ viewBox="0 0 24 24"
	249	+ stroke="currentColor"
	250	+ >
	251	+ <path
	252	+ d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
	253	+ ></path>
	254	+ </svg>
	255	+ <span class="ml-4">Учебн.заведения</span>
	256	+ </a>
	257	+ </li>
	258	+ <li class="relative px-6 py-3">
238	259	<a
239	260	class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.statics') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.statics') }}"
240	261	>
...	...	@@ -275,6 +296,27 @@
275	296	<span class="ml-4">Модерация</span>
276	297	</a>
277	298	</li>
	299	+ <li class="relative px-6 py-3">
	300	+ <a
	301	+ class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.reclames') }}"
	302	+ >
	303	+ <svg
	304	+ class="w-5 h-5"
	305	+ aria-hidden="true"
	306	+ fill="none"
	307	+ stroke-linecap="round"
	308	+ stroke-linejoin="round"
	309	+ stroke-width="2"
	310	+ viewBox="0 0 24 24"
	311	+ stroke="currentColor"
	312	+ >
	313	+ <path
	314	+ d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
	315	+ ></path>
	316	+ </svg>
	317	+ <span class="ml-4">Реклама</span>
	318	+ </a>
	319	+ </li>
278	320	<!-- Справочники -->
279	321	<li class="relative px-6 py-3" x-data="{ open1: false }">
280	322	<button
...	...	@@ -330,9 +372,6 @@
330	372	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.category-emp.index') ? 'dark:text-gray-100' : null }}">
331	373	<a class="w-full" href="{{ route('admin.category-emp.index') }}">Категории работодателей</a>
332	374	</li>
333		- <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}">
334		- <a class="w-full" href="{{ route('admin.education.index') }}">Образование</a>
335		- </li>
336	375	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.infobloks.index') ? 'dark:text-gray-100' : null }}">
337	376	<a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
338	377	</li>
...	...	@@ -394,9 +433,7 @@
394	433	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.edit-blocks') ? 'dark:text-gray-100' : null }}">
395	434	<a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
396	435	</li>
397		- <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}">
398		- <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
399		- </li>
	436	+
400	437	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.editor-seo') ? 'dark:text-gray-100' : null }}">
401	438	<a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
402	439	</li>
...	...	@@ -650,6 +687,27 @@
650	687	</li>
651	688	@endif
652	689	<li class="relative px-6 py-3">
	690	+ <a
	691	+ class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.education.index') }}"
	692	+ >
	693	+ <svg
	694	+ class="w-5 h-5"
	695	+ aria-hidden="true"
	696	+ fill="none"
	697	+ stroke-linecap="round"
	698	+ stroke-linejoin="round"
	699	+ stroke-width="2"
	700	+ viewBox="0 0 24 24"
	701	+ stroke="currentColor"
	702	+ >
	703	+ <path
	704	+ d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
	705	+ ></path>
	706	+ </svg>
	707	+ <span class="ml-4">Учебн.заведения</span>
	708	+ </a>
	709	+ </li>
	710	+ <li class="relative px-6 py-3">
653	711	<a
654	712	class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.statics') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.statics') }}"
655	713	>
...	...	@@ -687,7 +745,28 @@
687	745	>
688	746	<path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
689	747	</svg>
690		- <span class="ml-4">Сообщения</span>
	748	+ <span class="ml-4">Сообщения все</span>
	749	+ </a>
	750	+ </li>
	751	+ <li class="relative px-6 py-3">
	752	+ <a
	753	+ class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}" href="{{ route('admin.reclames') }}"
	754	+ >
	755	+ <svg
	756	+ class="w-5 h-5"
	757	+ aria-hidden="true"
	758	+ fill="none"
	759	+ stroke-linecap="round"
	760	+ stroke-linejoin="round"
	761	+ stroke-width="2"
	762	+ viewBox="0 0 24 24"
	763	+ stroke="currentColor"
	764	+ >
	765	+ <path
	766	+ d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
	767	+ ></path>
	768	+ </svg>
	769	+ <span class="ml-4">Реклама</span>
691	770	</a>
692	771	</li>
693	772	<!-- Справочники -->
...	...	@@ -745,9 +824,6 @@
745	824	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.category-emp.index') ? 'dark:text-gray-100' : null }}">
746	825	<a class="w-full" href="{{ route('admin.category-emp.index') }}">Категории работодателей</a>
747	826	</li>
748		- <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.education.index') ? 'dark:text-gray-100' : null }}">
749		- <a class="w-full" href="{{ route('admin.education.index') }}">Образование</a>
750		- </li>
751	827	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.infobloks.index') ? 'dark:text-gray-100' : null }}">
752	828	<a class="w-full" href="{{ route('admin.infobloks.index') }}">Блоки-Дипломы</a>
753	829	</li>
...	...	@@ -811,9 +887,6 @@
811	887	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.edit-blocks') ? 'dark:text-gray-100' : null }}">
812	888	<a class="w-full" href="{{ route('admin.edit-blocks') }}">Шапка-футер сайта</a>
813	889	</li>
814		- <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.reclames') ? 'dark:text-gray-100' : null }}">
815		- <a class="w-full" href="{{ route('admin.reclames') }}">Реклама</a>
816		- </li>
817	890	<li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200 {{ Request::routeIs('admin.editor-seo') ? 'dark:text-gray-100' : null }}">
818	891	<a class="w-full" href="{{ route('admin.editor-seo') }}">SEO сайта</a>
819	892	</li>