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

Compare commits

base: aslan:0c16dc960e5fe89a3c008fe5f4bbdd3f730d3fc7
Branches Tags
aslan:main
aslan:new-calculator
..
compare: aslan:03b895e32cefdd9543898dc3760921d2890a8de6
Branches Tags
aslan:main
aslan:new-calculator

2 Commits
0c16dc960e ... 03b895e32c

Author SHA1 Message Date
aslan 03b895e32c Merge pull request 'adding video, fixing adaptive' (#45) from RomanGolienko/Roman_applicant-site:prodV1 into main
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (push) Successful in 2m18s Details
Tests & Lint & Deploy to Railway / deploy (push) Successful in 34s Details 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/45
 2024-04-08 10:14:02 +03:00
ROMANGOLIENKO a3819e02a1 adding video, fixing adaptive 2024-04-05 16:37:10 +03:00
3 changed files with 31 additions and 23 deletions
Show Stats Expand all files Collapse all files

12
app/Services/DirectonHtmlBuilder.php
View File

@ -193,14 +193,14 @@ class DirectonHtmlBuilder
<div class=\"display-5 \" > {$direction['name']}</div> <div class=\"display-5 \" > {$direction['name']}</div>
</div> </div>
<div class='col d-flex justify-content-end'> <div class='col d-flex justify-content-end'>
<div class=\"fs-5 mb-3 \" style=\"font-family: Geologica-Light\"> <div class=\"fs-5 mb-3 d-flex\" style=\"font-family: Geologica-Light\">
<button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}'> <button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}'>
<img style='width: 12px; height: auto;' id = 'id_mgtu_{$direction['id']}' src='img/front-page/green-circle.png'> <img style='width: 12px; height: auto;' id = 'id_mgtu_{$direction['id']}' src='img/front-page/green-circle.png'>
МГТУ МГТУ
</button> | </button>
<button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}'> <button type='button' class='ms-2 button_chng_instit hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}'>
<img style='display: none; width: 12px; height: auto;' id = 'id_filial_{$direction['id']}' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский) <img style='display: none; width: 12px; height: auto;' id = 'id_filial_{$direction['id']}' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский)
</button> </button>
</div> </div>
@ -227,7 +227,7 @@ class DirectonHtmlBuilder
</div> </div>
</div> </div>
<div class='col-12 col-lg-8 col-xl-7 '> <div class='col-12 col-lg-8 col-xl-7 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 px-5 border-success fs-5 h-100 mt-xl-0 mt-3\" style='border-radius: 20px; border: 2px solid;'>
<strong class='d-flex justify-content-center fs-3'>Места для обучения:</strong><br> <strong class='d-flex justify-content-center fs-3'>Места для обучения:</strong><br>
<div class='content_budget'> <div class='content_budget'>
<br> <br>
@ -253,7 +253,7 @@ class DirectonHtmlBuilder
</div> </div>
<div class='row mt-3'> <div class='row mt-3'>
<div class='col-12 col-lg-9 '> <div class='col-12 col-lg-9 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 px-5 border-success fs-5 h-100 mt-xl-0 mt-3\" style='border-radius: 20px; border: 2px solid;'>
<strong class='fs-3'> Проходные баллы:</strong> <strong class='fs-3'> Проходные баллы:</strong>
<div class='row mt-3'> <div class='row mt-3'>
$EGE $po_viboru $SPO $EGE $po_viboru $SPO
@ -263,7 +263,7 @@ class DirectonHtmlBuilder
</div> </div>
</div> </div>
<div class='col-12 col-lg-3 col-xl-2 '> <div class='col-12 col-lg-3 col-xl-2 '>
<div class=\"p-3 border-success fs-5 h-100 col\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 border-success fs-5 h-100 col mt-xl-0 mt-5\" style='border-radius: 20px; border: 2px solid;'>
$paid_cost $paid_cost
</div> </div>
</div> </div>

12
app/Services/DirectonHtmlBuilderForCalculator.php
View File

@ -193,14 +193,14 @@ class DirectonHtmlBuilderForCalculator
<div class=\"display-5 \" > {$direction['name']}</div> <div class=\"display-5 \" > {$direction['name']}</div>
</div> </div>
<div class='col d-flex justify-content-end'> <div class='col d-flex justify-content-end'>
<div class=\"fs-5 mb-3 \" style=\"font-family: Geologica-Light\"> <div class=\"fs-5 mb-3 d-flex \" style=\"font-family: Geologica-Light\">
<button type='button' class='calc_green_circle_button hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}calc'> <button type='button' class='calc_green_circle_button hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}calc'>
<img style='width: 8px; height: auto;' id = 'id_mgtu_{$direction['id']}calc' src='img/front-page/green-circle.png'> <img style='width: 8px; height: auto;' id = 'id_mgtu_{$direction['id']}calc' src='img/front-page/green-circle.png'>
МГТУ МГТУ
</button> | </button>
<button type='button' class='calc_green_circle_button hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}calc'> <button type='button' class='ms-2 calc_green_circle_button hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}calc'>
<img style='display: none; width: 8px; height: auto;' id = 'id_filial_{$direction['id']}calc' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский) <img style='display: none; width: 8px; height: auto;' id = 'id_filial_{$direction['id']}calc' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский)
</button> </button>
</div> </div>
@ -227,7 +227,7 @@ class DirectonHtmlBuilderForCalculator
</div> </div>
</div> </div>
<div class='col-12 col-lg-8 col-xl-7 '> <div class='col-12 col-lg-8 col-xl-7 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 px-5 border-success fs-5 h-100 mt-xl-0 mt-3\" style='border-radius: 20px; border: 2px solid;'>
<strong class='d-flex justify-content-center fs-3'>Места для обучения:</strong><br> <strong class='d-flex justify-content-center fs-3'>Места для обучения:</strong><br>
<div class='content_budget'> <div class='content_budget'>
<br> <br>
@ -253,7 +253,7 @@ class DirectonHtmlBuilderForCalculator
</div> </div>
<div class='row mt-3'> <div class='row mt-3'>
<div class='col-12 col-lg-9 '> <div class='col-12 col-lg-9 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 px-5 border-success fs-5 h-100 mt-xl-0 mt-3\" style='border-radius: 20px; border: 2px solid;'>
<strong class='fs-3'> Проходные баллы:</strong> <strong class='fs-3'> Проходные баллы:</strong>
<div class='row mt-3'> <div class='row mt-3'>
$EGE $po_viboru $SPO $EGE $po_viboru $SPO
@ -263,7 +263,7 @@ class DirectonHtmlBuilderForCalculator
</div> </div>
</div> </div>
<div class='col-12 col-lg-3 col-xl-2 '> <div class='col-12 col-lg-3 col-xl-2 '>
<div class=\"p-3 border-success fs-5 h-100 col\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 border-success fs-5 h-100 col mt-xl-0 mt-3\" style='border-radius: 20px; border: 2px solid;'>
$paid_cost $paid_cost
</div> </div>
</div> </div>

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

@ -363,9 +363,17 @@
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered"> <div class="modal-dialog modal-xl modal-dialog-centered">
<div class="modal-content"> <div class="modal-content" style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon3_blok.png') }});" >
<iframe width="100%" height="405" src="https://rutube.ru/play/embed/c2f57bbb4c09b2c8dc78b5e5ccd9cefb" frameBorder="0" allow="clipboard-write; autoplay" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> <div class="modal-body">
<div class="row">
<div class="col">
<iframe width="100%" height="600" src="https://rutube.ru/play/embed/c2f57bbb4c09b2c8dc78b5e5ccd9cefb" frameBorder="0" allow="clipboard-write; autoplay" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
</div>
</div>
</div>
</div> </div>
@ -952,28 +960,28 @@
<div class="ms-4 col-auto "> <div class="ms-4 col-auto ">
<div class="col-12"> <div class="col-11">
<div class="text-white fs-4"> Приемная коммисия:</div> <div class="text-white fs-4"> Приемная коммисия:</div>
<p class="text-white"> (8772) 52-30-08 </p> <p class="text-white"> (8772) 52-30-08 </p>
</div> </div>
<div class="col-12"> <div class="col-11">
<div class="text-white fs-4"> Приёмная комиссия филиала МГТУ в пос. Яблоновском:</div> <div class="text-white fs-4"> Приёмная комиссия филиала МГТУ в пос. Яблоновском:</div>
<p class="text-white"> 8-938-530-53-14 </p> <p class="text-white"> 8-938-530-53-14 </p>
</div> </div>
<div class="col-12"> <div class="col-11">
<div class="text-white fs-4"> Почта:</div> <div class="text-white fs-4"> Почта:</div>
<p class="text-white"> info@mkgtu.ru </p> <p class="text-white"> info@mkgtu.ru </p>
</div> </div>
<div class="col-12"> <div class="col-11">
<p class="text-white fs-4"> 385000, Республика Адыгея, г. Майкоп, ул. Первомайская, д. 191 </p> <p class="text-white fs-4"> 385000, Республика Адыгея, г. Майкоп, ул. Первомайская, д. 191 </p>
</div> </div>
<div class="col-12"> <div class="col-11">
<a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vid.png') }}" alt="vid"></a> <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vid.png') }}" alt="vid"></a>
<a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vk.png') }}" alt="vid"></a> <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vk.png') }}" alt="vid"></a>
<a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/tg.png') }}" alt="vid"></a> <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/tg.png') }}" alt="vid"></a>
@ -982,7 +990,7 @@
<a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/odnok.png') }}" alt="vid"></a> <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/odnok.png') }}" alt="vid"></a>
</div> </div>
</div> </div>
<div class="col" > <div class="col mt-3 mt-xl-0" >
<div class="col-md-6 col-12 d-flex justify-content-md-end justify-content-center" style='border-radius: 20px;'> <div class="col-md-6 col-12 d-flex justify-content-md-end justify-content-center" style='border-radius: 20px;'>
<script type="text/javascript" charset="utf-8" async src="https://api-maps.yandex.ru/services/constructor/1.0/js/?um=constructor%3Abce7036e67cc958b252a800040dcada03df467881dac609a6f6b7ef8618fe7a1&amp;width=500&amp;height=400&amp;lang=ru_RU&amp;scroll=true"></script> <script type="text/javascript" charset="utf-8" async src="https://api-maps.yandex.ru/services/constructor/1.0/js/?um=constructor%3Abce7036e67cc958b252a800040dcada03df467881dac609a6f6b7ef8618fe7a1&amp;width=500&amp;height=400&amp;lang=ru_RU&amp;scroll=true"></script>
</div> </div>