micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/1.9.12' into develop

Browse source
This commit is contained in:
Zaripov Emil 2025-04-22 15:43:50 +03:00
commit 8a0dffa27d
7 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/resources/landing/home.css
View file

@ -338,6 +338,9 @@ a.btn:is(:hover, :focus, :active) {
:is(.ul, .fl) .container-inside .list-group .list > div.user::after {
background: url(img/svg/user-24x24.svg) no-repeat 0 0;
}
:is(.ul, .fl) .container-inside .list-group .list > div.docs::after {
background: url(img/svg/docs-24x24.svg) no-repeat 0 0;
}
:is(.ul, .fl) .container-inside .list-group .list > div.romb::after {
background: url(img/svg/romb-24x24.svg) no-repeat 0 0;
}

2
frontend/src/resources/landing/img/svg/case-24x24.svg
View file

@ -1,3 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.7158 3C9.35852 3 8.20421 3.9903 7.99782 5.33184L7.89503 6H4C2.89543 6 2 6.89543 2 8V18C2 19.6569 3.34315 21 5 21H19C20.6569 21 22 19.6569 22 18V8C22 6.89543 21.1046 6 20 6H16.105L16.0022 5.33184C15.7958 3.99031 14.6415 3 13.2842 3H10.7158ZM14.5873 6L14.5196 5.55993C14.4258 4.95014 13.9011 4.5 13.2842 4.5H10.7158C10.0989 4.5 9.57419 4.95014 9.48038 5.55993L9.41268 6H14.5873ZM4 7.5H20C20.2761 7.5 20.5 7.72386 20.5 8V10.9297C18.8456 11.9818 16.9613 12.684 15 13.0362V13C15 11.8954 14.1046 11 13 11H11C9.89543 11 9 11.8954 9 13V13.0362C7.03871 12.684 5.1544 11.9818 3.5 10.9297V8C3.5 7.72386 3.72386 7.5 4 7.5ZM9 14.5582C7.06675 14.2404 5.19401 13.6122 3.5 12.6736V18C3.5 18.8284 4.17157 19.5 5 19.5H19C19.8284 19.5 20.5 18.8284 20.5 18V12.6736C18.806 13.6122 16.9332 14.2404 15 14.5582V15C15 16.1046 14.1046 17 13 17H11C9.89543 17 9 16.1046 9 15V14.5582ZM11 12.5H13C13.2761 12.5 13.5 12.7239 13.5 13V15C13.5 15.2761 13.2761 15.5 13 15.5H11C10.7239 15.5 10.5 15.2761 10.5 15V13C10.5 12.7239 10.7239 12.5 11 12.5Z" fill="#FA773F"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.7158 3C9.35852 3 8.20421 3.9903 7.99782 5.33184L7.89503 6H4C2.89543 6 2 6.89543 2 8V18C2 19.6569 3.34315 21 5 21H19C20.6569 21 22 19.6569 22 18V8C22 6.89543 21.1046 6 20 6H16.105L16.0022 5.33184C15.7958 3.99031 14.6415 3 13.2842 3H10.7158ZM14.5873 6L14.5196 5.55993C14.4258 4.95014 13.9011 4.5 13.2842 4.5H10.7158C10.0989 4.5 9.57419 4.95014 9.48038 5.55993L9.41268 6H14.5873ZM4 7.5H20C20.2761 7.5 20.5 7.72386 20.5 8V10.9297C18.8456 11.9818 16.9613 12.684 15 13.0362V13C15 11.8954 14.1046 11 13 11H11C9.89543 11 9 11.8954 9 13V13.0362C7.03871 12.684 5.1544 11.9818 3.5 10.9297V8C3.5 7.72386 3.72386 7.5 4 7.5ZM9 14.5582C7.06675 14.2404 5.19401 13.6122 3.5 12.6736V18C3.5 18.8284 4.17157 19.5 5 19.5H19C19.8284 19.5 20.5 18.8284 20.5 18V12.6736C18.806 13.6122 16.9332 14.2404 15 14.5582V15C15 16.1046 14.1046 17 13 17H11C9.89543 17 9 16.1046 9 15V14.5582ZM11 12.5H13C13.2761 12.5 13.5 12.7239 13.5 13V15C13.5 15.2761 13.2761 15.5 13 15.5H11C10.7239 15.5 10.5 15.2761 10.5 15V13C10.5 12.7239 10.7239 12.5 11 12.5Z" fill="#C64E1B"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

7
frontend/src/resources/landing/img/svg/docs-24x24.svg Normal file
View file

@ -0,0 +1,7 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.82986 2.7988C5.36122 2.28734 6.08189 2 6.83333 2H14.3889C14.6394 2 14.8796 2.09578 15.0567 2.26627L20.7234 7.72081C20.9005 7.8913 21 8.12253 21 8.36364V19.2727C21 19.996 20.7015 20.6897 20.1701 21.2012C19.6388 21.7127 18.9181 22 18.1667 22H6.83333C6.08189 22 5.36122 21.7127 4.82986 21.2012C4.29851 20.6897 4 19.996 4 19.2727V4.72727C4 4.00396 4.29851 3.31026 4.82986 2.7988ZM6.83333 3.81818C6.58285 3.81818 6.34263 3.91396 6.16551 4.08445C5.98839 4.25494 5.88889 4.48617 5.88889 4.72727V19.2727C5.88889 19.5138 5.98839 19.7451 6.16551 19.9156C6.34263 20.086 6.58285 20.1818 6.83333 20.1818H18.1667C18.4171 20.1818 18.6574 20.086 18.8345 19.9156C19.0116 19.7451 19.1111 19.5138 19.1111 19.2727V8.74019L13.9977 3.81818H6.83333Z" fill="#C64E1B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.3889 2C14.9105 2 15.3333 2.40701 15.3333 2.90909V7.45454H20.0556C20.5772 7.45454 21 7.86156 21 8.36364C21 8.86571 20.5772 9.27273 20.0556 9.27273H14.3889C13.8673 9.27273 13.4445 8.86571 13.4445 8.36364V2.90909C13.4445 2.40701 13.8673 2 14.3889 2Z" fill="#C64E1B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.77783 12.9091C7.77783 12.407 8.20067 12 8.72228 12H16.2778C16.7994 12 17.2223 12.407 17.2223 12.9091C17.2223 13.4112 16.7994 13.8182 16.2778 13.8182H8.72228C8.20067 13.8182 7.77783 13.4112 7.77783 12.9091Z" fill="#C64E1B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.77783 16.5458C7.77783 16.0437 8.20067 15.6367 8.72228 15.6367H16.2778C16.7994 15.6367 17.2223 16.0437 17.2223 16.5458C17.2223 17.0479 16.7994 17.4549 16.2778 17.4549H8.72228C8.20067 17.4549 7.77783 17.0479 7.77783 16.5458Z" fill="#C64E1B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.77783 9.27335C7.77783 8.77127 8.20067 8.36426 8.72228 8.36426H10.6112C11.1328 8.36426 11.5556 8.77127 11.5556 9.27335C11.5556 9.77543 11.1328 10.1824 10.6112 10.1824H8.72228C8.20067 10.1824 7.77783 9.77543 7.77783 9.27335Z" fill="#C64E1B"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

4
frontend/src/resources/landing/img/svg/esia-24x24.svg
View file

@ -1,4 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.44531 9.5C3.0311 9.5 2.69531 9.83579 2.69531 10.25C2.69531 10.6642 3.0311 11 3.44531 11H9.83731C10.2515 11 10.5873 10.6642 10.5873 10.25C10.5873 9.83579 10.2515 9.5 9.83731 9.5H3.44531ZM3.44531 13C3.0311 13 2.69531 13.3358 2.69531 13.75C2.69531 14.1642 3.0311 14.5 3.44531 14.5H15.4853C15.8995 14.5 16.2353 14.1642 16.2353 13.75C16.2353 13.3358 15.8995 13 15.4853 13H3.44531Z" fill="#FA773F"/>
<path d="M3.72852 16.9899C4.03952 17.3879 4.42752 17.7289 4.87852 17.9889L9.99952 20.9489C11.2375 21.6639 12.7615 21.6639 13.9995 20.9489L18.7495 18.2069C19.9875 17.4919 20.7495 16.1719 20.7495 14.7429V9.25788C20.7495 7.82888 19.9875 6.50788 18.7495 5.79388L13.9995 3.05188C12.7615 2.33688 11.2375 2.33688 9.99952 3.05188L4.87852 6.01188C4.42752 6.27288 4.03952 6.61387 3.72852 7.01088" stroke="#FA773F" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.44531 9.5C3.0311 9.5 2.69531 9.83579 2.69531 10.25C2.69531 10.6642 3.0311 11 3.44531 11H9.83731C10.2515 11 10.5873 10.6642 10.5873 10.25C10.5873 9.83579 10.2515 9.5 9.83731 9.5H3.44531ZM3.44531 13C3.0311 13 2.69531 13.3358 2.69531 13.75C2.69531 14.1642 3.0311 14.5 3.44531 14.5H15.4853C15.8995 14.5 16.2353 14.1642 16.2353 13.75C16.2353 13.3358 15.8995 13 15.4853 13H3.44531Z" fill="#C64E1B"/>
<path d="M3.72852 16.9899C4.03952 17.3879 4.42752 17.7289 4.87852 17.9889L9.99952 20.9489C11.2375 21.6639 12.7615 21.6639 13.9995 20.9489L18.7495 18.2069C19.9875 17.4919 20.7495 16.1719 20.7495 14.7429V9.25788C20.7495 7.82888 19.9875 6.50788 18.7495 5.79388L13.9995 3.05188C12.7615 2.33688 11.2375 2.33688 9.99952 3.05188L4.87852 6.01188C4.42752 6.27288 4.03952 6.61387 3.72852 7.01088" stroke="#C64E1B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,021 B

After

Width:  |  Height:  |  Size: 1,021 B

Before After
Before After

4
frontend/src/resources/landing/img/svg/user-24x24.svg
View file

@ -1,4 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.76172 20.9419C4.76172 18.9559 5.58268 17.1559 6.90161 15.8529C7.56958 15.1929 8.36654 14.6609 9.24849 14.2969L11.9974 16.4647L14.7462 14.2969C15.6292 14.6609 16.4251 15.1929 17.0931 15.8529C18.412 17.1559 19.233 18.9559 19.233 20.9419" stroke="#FA773F" stroke-width="1.49996" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M15.2375 6.87359C15.2375 9.33359 13.6176 10.5636 11.9976 10.5636C10.3777 10.5636 8.75781 9.33359 8.75781 6.87359C8.75781 4.41359 10.3777 3.18359 11.9976 3.18359C13.6176 3.18359 15.2375 4.42359 15.2375 6.87359Z" stroke="#FA773F" stroke-width="1.49996" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.76172 20.9419C4.76172 18.9559 5.58268 17.1559 6.90161 15.8529C7.56958 15.1929 8.36654 14.6609 9.24849 14.2969L11.9974 16.4647L14.7462 14.2969C15.6292 14.6609 16.4251 15.1929 17.0931 15.8529C18.412 17.1559 19.233 18.9559 19.233 20.9419" stroke="#C64E1B" stroke-width="1.49996" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M15.2375 6.87359C15.2375 9.33359 13.6176 10.5636 11.9976 10.5636C10.3777 10.5636 8.75781 9.33359 8.75781 6.87359C8.75781 4.41359 10.3777 3.18359 11.9976 3.18359C13.6176 3.18359 15.2375 4.42359 15.2375 6.87359Z" stroke="#C64E1B" stroke-width="1.49996" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 749 B

Before After
Before After

BIN
frontend/src/resources/landing/pdf/Инструкция_для_технических_специалистов.pdf Normal file
View file

Binary file not shown.

3
frontend/src/resources/template/app/component/home_landing.html
View file

@ -23,6 +23,9 @@
<div class="esia short-text">Необходимо авторизоваться</div>
<div class="case short-text">Потребуется подтвержденная учетная запись организации</div>
<div class="user short-text">Доступ предоставляется тольĸо сотрудниĸу, наделенному соответствующими полномочиями (ролью) на ведения воинсĸого учета внутри организации</div>
<div class="docs short-text">
<a href="src/resources/landing/pdf/Инструкция_для_технических_специалистов.pdf" download="Инструкция_для_технических_специалистов.pdf">Информация для технических специалистов</a>
</div>
</div>
<div class="btn-group">
<a id="login-button" href="." class="btn">Войти в Личный кабинет</a>