aslan
/
applicant-site
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'news fix, new photo added, visually-impaired mode fix' (#54) from RomanGolienko/Roman_applicant-site:feature/visually-impaired-mode into main
Tests & Lint & Deploy to Railway / build (2.7.6, 20.x, 8.3) (push) Successful in 3m20s Details
Tests & Lint & Deploy to Railway / deploy (push) Successful in 33s Details 

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/54
This commit is contained in:
aslan 2024-06-05 15:30:29 +03:00
parent 7f7d6a6a73 4bfa587bb4
commit 3a55cbae15
7 changed files with 83 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/img/front-page/bakalavr-special/photo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

BIN
public/img/front-page/eye.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
public/img/front-page/visually-impaired-mode-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

3
resources/views/layouts/new-design-layout.blade.php
View File

@ -27,8 +27,7 @@
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="0"> <meta http-equiv="Expires" content="0">
<script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>
<script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>
<script src="{{ asset('js/jquery-3.7.1.min.js') }}"></script> <script src="{{ asset('js/jquery-3.7.1.min.js') }}"></script>
</head> </head>

68
resources/views/new-design/bakalavr-special.blade.php
View File

@ -75,7 +75,8 @@
integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"> integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">
</script> </script>
<script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>
<script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>
<body> <body>
@ -88,7 +89,7 @@
style="height: 100%; "> style="height: 100%; ">
<div style="width: 60%"> <div style="width: 60%">
<img class="img-fluid float-end " <img class="img-fluid float-end "
src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt=""> src="{{ URL::to('img/front-page/bakalavr-special/photo.png') }}" alt="">
</div> </div>
</div> </div>
<div class="ms-0 ms-md-5 "> <div class="ms-0 ms-md-5 ">
@ -121,7 +122,7 @@
{{-- <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}} {{-- <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
{{-- <div class="hover2"> RU </div>--}} {{-- <div class="hover2"> RU </div>--}}
{{-- </a>--}} {{-- </a>--}}
<img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" /> <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/visually-impaired-mode-icon.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />
{{-- <a type="button" class="col-auto px-lg-3 text-white text-sm-start visually_impaired_mode_button "--}} {{-- <a type="button" class="col-auto px-lg-3 text-white text-sm-start visually_impaired_mode_button "--}}
{{-- style="font-size: 20px;font-weight: 400;line-height: 29px;">--}} {{-- style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
{{-- <div class="hover2"> Режим для слабовидящих</div>--}} {{-- <div class="hover2"> Режим для слабовидящих</div>--}}
@ -601,51 +602,58 @@
@php @php
$out = array_chunk($all_news, 4, true); $out = array_chunk($all_news, 4, true);
//echo '<pre>' . print_r($out, 1) . '</pre>'
@endphp @endphp
@foreach($out as $id => $page) @foreach($out as $id => $page)
<div class="carousel-item @if($id == 1) active @endif \" > <div class="carousel-item @if($id == 0) active @endif \" >
<div class="row d-flex align-items-center justify-content-center " > <div class="row d-flex align-items-center justify-content-center " >
@foreach($page as $item) @foreach($page as $item)
<div class="col " style="max-width: 20%"> <div class="col" style="max-width: 20%">
<img src="{{$item['url']}}" class="img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px 20px 0px 0px;"> <div class="row">
<div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;"> <div class="col-12" >
<div class=" p-3" style=""> <img src="{{$item['url']}}" class="w-100 border border-white border-2" style=" border-radius: 20px 20px 0px 0px; height: 14.5em; object-fit: cover ">
<strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong> <div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;">
<br><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModalNews-{{$item['id']}}"> читать полностью</button> <div class=" p-3" style="">
<p class="gradient-text" style="font-family: Geologica-ExtraLight;">{{ Str::limit(preg_replace('/<([^>]+)>/', PHP_EOL, $item['text']), 100, "...") }} </p> <strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong>
<br><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModalNews-{{$item['id']}}"> читать полностью</button>
<p class="gradient-text" style="font-family: Geologica-ExtraLight;">{{ Str::limit(preg_replace('/<([^>]+)>/', PHP_EOL, $item['text']), 100, "...") }} </p>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="exampleModalNews-{{$item['id']}}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="exampleModalNews-{{$item['id']}}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl"> <div class="modal-dialog modal-xl">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="exampleModalLabel"> {{$item['name']}}</h1> <h1 class="modal-title fs-5" id="exampleModalLabel"> {{$item['name']}}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="container">
<div class="row justify-content-center">
<div class="col-8">
<img src="{{$item['url']}}" class=" img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px;">
</div>
</div> </div>
<p class="mt-4"> {{$item['text']}}</p> <div class="modal-body">
<div class="container">
<div class="row justify-content-center">
<div class="col-8 d-flex justify-content-center">
<img src="{{$item['url']}}" class=" img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px;">
</div>
</div>
<p class="mt-4"> {{$item['text']}}</p>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endforeach @endforeach

9
resources/views/new-design/inostran.blade.php
View File

@ -54,6 +54,8 @@
integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"> integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">
</script> </script>
<script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>
<script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>
<body> <body>
@ -98,6 +100,7 @@
{{-- <div class="hover2"> RU </div>--}} {{-- <div class="hover2"> RU </div>--}}
{{-- </a>--}} {{-- </a>--}}
{{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}} {{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}}
<img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/visually-impaired-mode-icon.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />
</div> </div>
</div> </div>
@ -343,7 +346,7 @@
</div> </div>
</div> </div>
<div style="background-image: url({{ URL::to('img/front-page/inostran/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;"> <div style="background-image: url({{ URL::to('img/front-page/inostran/fon3_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
<div class="container-fluid ms-sm-5 py-5"> <div class="container-fluid ms-sm-5 py-5">
<div class="row"> <div class="row">
@ -569,11 +572,11 @@
$out = array_chunk($all_news, 4, true); $out = array_chunk($all_news, 4, true);
@endphp @endphp
@foreach($out as $id => $page) @foreach($out as $id => $page)
<div class="carousel-item @if($id == 1) active @endif \" > <div class="carousel-item @if($id == 0) active @endif \" >
<div class="row d-flex align-items-center justify-content-center " > <div class="row d-flex align-items-center justify-content-center " >
@foreach($page as $item) @foreach($page as $item)
<div class="col " style="max-width: 20%"> <div class="col " style="max-width: 20%">
<img src="{{$item['url']}}" class="img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px 20px 0px 0px;"> <img src="{{$item['url']}}" class="w-100 border border-white border-2" style="border-radius: 20px 20px 0px 0px; height: 14.5em; object-fit: cover ">
<div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;"> <div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;">
<div class=" p-3" style=""> <div class=" p-3" style="">
<strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong> <strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong>

66
resources/views/new-design/magistr.blade.php
View File

@ -54,6 +54,8 @@
integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"> integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">
</script> </script>
<script src="{{ URL::to('https://lidrekon.ru/slep/js/jquery.js') }}"></script>
<script src="{{ URL::to('//lidrekon.ru/slep/js/uhpv-full.min.js') }}"></script>
<body> <body>
@ -98,6 +100,7 @@
{{-- <div class="hover2"> RU </div>--}} {{-- <div class="hover2"> RU </div>--}}
{{-- </a>--}} {{-- </a>--}}
{{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}} {{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}}
<img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/visually-impaired-mode-icon.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />
</div> </div>
</div> </div>
@ -346,7 +349,7 @@
</div> </div>
</div> </div>
<div style="background-image: url({{ URL::to('img/front-page/magistr/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;"> <div style="background-image: url({{ URL::to('img/front-page/magistr/fon3_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
<div class="container-fluid ms-sm-5 py-5"> <div class="container-fluid ms-sm-5 py-5">
<div class="row"> <div class="row">
@ -570,51 +573,58 @@
@php @php
$out = array_chunk($all_news, 4, true); $out = array_chunk($all_news, 4, true);
//echo '<pre>' . print_r($out, 1) . '</pre>'
@endphp @endphp
@foreach($out as $id => $page) @foreach($out as $id => $page)
<div class="carousel-item @if($id == 1) active @endif \" > <div class="carousel-item @if($id == 0) active @endif \" >
<div class="row d-flex align-items-center justify-content-center " > <div class="row d-flex align-items-center justify-content-center " >
@foreach($page as $item) @foreach($page as $item)
<div class="col " style="max-width: 20%"> <div class="col" style="max-width: 20%">
<img src="{{$item['url']}}" class="img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px 20px 0px 0px;"> <div class="row">
<div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;"> <div class="col-12" >
<div class=" p-3" style=""> <img src="{{$item['url']}}" class="w-100 border border-white border-2" style=" border-radius: 20px 20px 0px 0px; height: 14.5em; object-fit: cover ">
<strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong> <div class="bg-white border border-white border-2" style="border-radius: 0px 0px 20px 20px ; height: 10.5em;">
<br><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModalNews-{{$item['id']}}"> читать полностью</button> <div class=" p-3" style="">
<p class="gradient-text" style="font-family: Geologica-ExtraLight;">{{ Str::limit(preg_replace('/<([^>]+)>/', PHP_EOL, $item['text']), 100, "...") }} </p> <strong class="fs-5 gradient-text" style="font-family: Geologica-Light"> {{$item['name']}} </strong>
<br><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModalNews-{{$item['id']}}"> читать полностью</button>
<p class="gradient-text" style="font-family: Geologica-ExtraLight;">{{ Str::limit(preg_replace('/<([^>]+)>/', PHP_EOL, $item['text']), 100, "...") }} </p>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="exampleModalNews-{{$item['id']}}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="exampleModalNews-{{$item['id']}}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl"> <div class="modal-dialog modal-xl">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="exampleModalLabel"> {{$item['name']}}</h1> <h1 class="modal-title fs-5" id="exampleModalLabel"> {{$item['name']}}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="container">
<div class="row justify-content-center">
<div class="col-8">
<img src="{{$item['url']}}" class=" img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px;">
</div>
</div> </div>
<p class="mt-4"> {{$item['text']}}</p> <div class="modal-body">
<div class="container">
<div class="row justify-content-center">
<div class="col-8 d-flex justify-content-center">
<img src="{{$item['url']}}" class=" img-fluid border border-white border-2" style="background-size: cover; border-radius: 20px;">
</div>
</div>
<p class="mt-4"> {{$item['text']}}</p>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@endforeach @endforeach