kowalski
/
Obvody
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sjednocení designu.

master
Kowalski 2026-10-11 21:13:34 +02:00
parent 800a920f1c
commit f15fc9317b
6 changed files with 85 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Presentation/@layout.latte
View File

@ -28,7 +28,7 @@
</script> </script>
{* naše vlastní styly *} {* naše vlastní styly *}
<link href="{$basePath}/css/base.css?v=6" rel="stylesheet"> <link href="{$basePath}/css/base.css?v=9" rel="stylesheet">
<title>{ifset title}{include title|stripHtml} | {/ifset}Obvody</title> <title>{ifset title}{include title|stripHtml} | {/ifset}Obvody</title>
</head> </head>

2
app/Presentation/Obvod/list.latte
View File

@ -11,7 +11,7 @@
<section class="panel"> <section class="panel">
<div class="filtry" n:if="$skupiny" role="group" aria-label="Filtr skupin"> <div class="filtry" n:if="$skupiny" role="group" aria-label="Filtr skupin">
<a n:foreach="$skupiny as $s" n:href="list, skupina: $s" n:class="$skupina === $s ? 'tlacitko is-aktivni' : 'tlacitko'">{$s}</a> <a n:foreach="$skupiny as $s" n:href="list, skupina: $s" n:class="$skupina === $s ? 'tlacitko tlacitko-filtr is-aktivni' : 'tlacitko tlacitko-filtr'">{$s}</a>
</div> </div>
<table class="tabulka"> <table class="tabulka">

61
app/Presentation/Obvod/view.latte
View File

@ -11,8 +11,8 @@
</div> </div>
<div class="akce"> <div class="akce">
<a n:href=":Mapa: obvod:$obvod->CISLO" class="tlacitko">Mapa</a> <a n:href=":Mapa: obvod:$obvod->CISLO" class="tlacitko">Mapa</a>
<button type="button" class="tlacitko is-aktivni" data-bs-toggle="modal" data-bs-target="#modalPridelit">Přidělit</button> <button n:if="count($otevrene) === 0" type="button" class="tlacitko is-aktivni" data-bs-toggle="modal" data-bs-target="#modalPridelit">Přidělit</button>
<button type="button" class="tlacitko" data-bs-toggle="modal" data-bs-target="#modalVratit">Vrátit</button> <button n:if="count($otevrene) > 0" type="button" class="tlacitko" data-bs-toggle="modal" data-bs-target="#modalVratit">Vrátit</button>
</div> </div>
</header> </header>
@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="modal fade" id="modalPridelit" tabindex="-1" aria-labelledby="modalPridelitLabel" aria-hidden="true" data-show-errors="{if $presenter['pridelitForm']->hasErrors()}1{else}0{/if}"> <div n:if="count($otevrene) === 0" class="modal fade" id="modalPridelit" tabindex="-1" aria-labelledby="modalPridelitLabel" aria-hidden="true" data-show-errors="{if $presenter['pridelitForm']->hasErrors()}1{else}0{/if}">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<form n:name="pridelitForm"> <form n:name="pridelitForm">
@ -84,49 +84,42 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
<button n:name="send" class="tlacitko is-aktivni">Přidělit</button> <button n:name="send" class="tlacitko is-aktivni">Přidělit</button>
<button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="modalVratit" tabindex="-1" aria-labelledby="modalVratitLabel" aria-hidden="true" data-show-errors="{if $presenter['vratitForm']->hasErrors()}1{else}0{/if}"> <div n:if="count($otevrene) > 0" class="modal fade" id="modalVratit" tabindex="-1" aria-labelledby="modalVratitLabel" aria-hidden="true" data-show-errors="{if $presenter['vratitForm']->hasErrors()}1{else}0{/if}">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="modalVratitLabel">Vrátit obvod</h5> <h5 class="modal-title" id="modalVratitLabel">Vrátit obvod</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Zavřít"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Zavřít"></button>
</div> </div>
{if count($otevrene) === 0} <form n:name="vratitForm">
<div class="modal-body">Tento obvod nemá otevřené přidělení.</div> <div class="modal-body">
<div class="modal-footer"> <div class="alert alert-danger" n:if="$form->hasErrors()" n:foreach="$form->getErrors() as $error">{$error}</div>
<button type="button" class="tlacitko" data-bs-dismiss="modal">Zavřít</button> <div class="mb-2">
<label n:name="zaznam" class="form-label">Záznam</label>
<select n:name="zaznam" class="form-select">
<option n:foreach="$otevrene as $otevreny" n:name="zaznam:$otevreny->ID">
{$otevreny->JMENO} (přiděleno {date_format($otevreny->VYDANO, 'd.m.Y')})
</option>
</select>
</div>
<div>
<label n:name="datum" class="form-label">Datum vrácení</label>
<input n:name="datum" class="form-control">
</div>
</div> </div>
{else} <div class="modal-footer">
<form n:name="vratitForm"> <button n:name="send" class="tlacitko is-aktivni">Vrátit</button>
<div class="modal-body"> <button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
<div class="alert alert-danger" n:if="$form->hasErrors()" n:foreach="$form->getErrors() as $error">{$error}</div> </div>
<div class="mb-2"> </form>
<label n:name="zaznam" class="form-label">Záznam</label>
<select n:name="zaznam" class="form-select">
<option n:foreach="$otevrene as $otevreny" n:name="zaznam:$otevreny->ID">
{$otevreny->JMENO} (přiděleno {date_format($otevreny->VYDANO, 'd.m.Y')})
</option>
</select>
</div>
<div>
<label n:name="datum" class="form-label">Datum vrácení</label>
<input n:name="datum" class="form-control">
</div>
</div>
<div class="modal-footer">
<button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
<button n:name="send" class="tlacitko is-aktivni">Vrátit</button>
</div>
</form>
{/if}
</div> </div>
</div> </div>
</div> </div>
@ -159,8 +152,8 @@
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
<button n:name="send" class="tlacitko is-aktivni">Uložit</button> <button n:name="send" class="tlacitko is-aktivni">Uložit</button>
<button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
</div> </div>
</form> </form>
</div> </div>
@ -168,7 +161,7 @@
</div> </div>
<script type="application/json" id="zvestovatele-data">{$zvestovateleJson|noescape}</script> <script type="application/json" id="zvestovatele-data">{$zvestovateleJson|noescape}</script>
<script src="{$basePath}/js/obvod-nahled.js"></script> <script src="{$basePath}/js/obvod-nahled.js?v=2"></script>
<script src="{$basePath}/js/naseptavac.js?v=3"></script> <script src="{$basePath}/js/naseptavac.js?v=3"></script>
<script> <script>
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {

2
app/Presentation/Zvestovatel/edit.latte
View File

@ -17,7 +17,7 @@
</div> </div>
<div class="formular-akce"> <div class="formular-akce">
<button n:name="send" class="tlacitko is-aktivni">Uložit</button> <button n:name="send" class="tlacitko is-aktivni">Uložit</button>
<a n:href="default" class="tlacitko">Zpět</a> <a n:href="default" class="tlacitko tlacitko-zrusit">Zrušit</a>
</div> </div>
</form> </form>
</div> </div>

56
www/css/base.css
View File

@ -154,18 +154,25 @@ body:has(#map[data-max]) {
} }
.mapa-filtr button { .mapa-filtr button {
border: 0; border: 2px solid #c9a24d;
border-radius: 6px; border-radius: 6px;
background: transparent; background: #f8efd0;
color: #1a3a6b; color: #6f5410;
font-size: 13px; font-size: 13px;
font-weight: 700; font-weight: 700;
padding: 0.4rem 0.7rem; padding: 0.4rem 0.7rem;
line-height: 1.2; line-height: 1.2;
} }
.mapa-filtr button:hover,
.mapa-filtr button.is-active { .mapa-filtr button.is-active {
background: #2652a8; background: #c9a227;
color: #fff;
border-color: #8f7010;
}
.mapa-filtr button.is-active:hover {
background: #a88416;
color: #fff; color: #fff;
} }
@ -664,6 +671,27 @@ body:has(#map[data-max]) {
margin-bottom: 0.85rem; margin-bottom: 0.85rem;
} }
.tlacitko.tlacitko-filtr {
background: #f8efd0;
color: #6f5410;
border-color: #c9a24d;
box-shadow: 0 4px 12px rgba(143, 112, 16, 0.16);
}
.tlacitko.tlacitko-filtr:hover,
.tlacitko.tlacitko-filtr:focus-visible,
.tlacitko.tlacitko-filtr.is-aktivni {
background: #c9a227;
color: #fff;
border-color: #8f7010;
}
.tlacitko.tlacitko-filtr.is-aktivni:hover,
.tlacitko.tlacitko-filtr.is-aktivni:focus-visible {
background: #a88416;
color: #fff;
}
.akce { .akce {
justify-content: flex-end; justify-content: flex-end;
} }
@ -811,6 +839,26 @@ body:has(#map[data-max]) {
border-color: #e3f2fd; border-color: #e3f2fd;
} }
.modal-footer {
justify-content: flex-start;
gap: 0.5rem;
}
.tlacitko.tlacitko-zrusit {
margin-left: auto;
background: #eceff1;
color: #455a64;
border-color: #90a4ae;
box-shadow: none;
}
.tlacitko.tlacitko-zrusit:hover,
.tlacitko.tlacitko-zrusit:focus-visible {
background: #cfd8dc;
color: #263238;
border-color: #78909c;
}
.modal-title { .modal-title {
color: #1d4f91; color: #1d4f91;
font-weight: 800; font-weight: 800;

7
www/js/obvod-nahled.js
View File

@ -41,12 +41,11 @@
function style() { function style() {
return { return {
fillColor: '#FD8D3C', fillColor: '#c5ddf6',
color: '#1d4f91',
weight: 2, weight: 2,
opacity: 1, opacity: 1,
color: 'blue', fillOpacity: 0.28,
dashArray: '3',
fillOpacity: 0.05,
}; };
} }