From a4f978fcee215112208046d4823b5551f1cf39cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Mon, 27 Sep 2021 14:23:42 +0200
Subject: [PATCH 1/2] bootstrap 5

---
 app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php | 4 ++--
 .../ConfigurationModule/Forms/MailingFormFactory.php          | 4 ++--
 app/AdminModule/ConfigurationModule/Forms/PaymentForm.php     | 4 ++--
 .../ConfigurationModule/Forms/PaymentProofFormFactory.php     | 4 ++--
 .../ConfigurationModule/Forms/ProgramFormFactory.php          | 4 ++--
 .../ConfigurationModule/Forms/SeminarFormFactory.php          | 4 ++--
 .../ConfigurationModule/Forms/SkautIsEventFormFactory.php     | 4 ++--
 .../ConfigurationModule/Forms/TicketsFormFactory.php          | 4 ++--
 app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php  | 4 ++--
 app/AdminModule/Forms/BaseFormFactory.php                     | 4 ++--
 app/WebModule/Forms/BaseFormFactory.php                       | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
index b83067729..cea6e6e1c 100644
--- a/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
@@ -16,7 +16,7 @@
 use Nette\Application\UI\Form;
 use Nette\Forms\Controls\TextInput;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 use Tracy\Debugger;
@@ -54,7 +54,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
index fa936c03e..7826e3866 100644
--- a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
@@ -23,7 +23,7 @@
 use Nette\Application\LinkGenerator;
 use Nette\Application\UI\Form;
 use Nette\Forms\Controls\TextInput;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -82,7 +82,7 @@ public function create(int $id): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php b/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
index 94dfd400f..3bb1590e9 100644
--- a/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
+++ b/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
@@ -20,7 +20,7 @@
 use Nette\Application\UI;
 use Nette\Application\UI\Form;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -71,7 +71,7 @@ public function createComponentForm(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
index b84b0054b..b3481cbaa 100644
--- a/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
@@ -12,7 +12,7 @@
 use App\Services\QueryBus;
 use Nette;
 use Nette\Application\UI\Form;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -48,7 +48,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
index 33f5f59c9..a916ccaa6 100644
--- a/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
@@ -20,7 +20,7 @@
 use Nette\Application\UI\Form;
 use Nette\Utils\DateTime;
 use Nextras\FormComponents\Controls\DateTimeControl;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -56,7 +56,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
index 6062bb855..4cfdd5835 100644
--- a/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
@@ -17,7 +17,7 @@
 use Nette\Application\UI\Form;
 use Nette\Utils\DateTime;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -56,7 +56,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
index 4cca623ff..6ed468d6f 100644
--- a/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
@@ -21,7 +21,7 @@
 use Doctrine\ORM\ORMException;
 use Nette;
 use Nette\Application\UI\Form;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -77,7 +77,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
index 49e7a8f67..f7fac8664 100644
--- a/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
@@ -12,7 +12,7 @@
 use App\Services\QueryBus;
 use Nette\Application\UI\Form;
 use Nextras\FormComponents\Controls\DateTimeControl;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -46,7 +46,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
index 41b1034b5..f82645103 100644
--- a/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
@@ -15,7 +15,7 @@
 use Nette;
 use Nette\Application\UI\Form;
 use Nette\Http\FileUpload;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 use stdClass;
 use Throwable;
 
@@ -67,7 +67,7 @@ public function create(): Form
         $form = $this->baseFormFactory->create();
 
         $renderer = $form->getRenderer();
-        assert($renderer instanceof Bs4FormRenderer);
+        assert($renderer instanceof Bs5FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/Forms/BaseFormFactory.php b/app/AdminModule/Forms/BaseFormFactory.php
index c2412e6cf..d074e2ab1 100644
--- a/app/AdminModule/Forms/BaseFormFactory.php
+++ b/app/AdminModule/Forms/BaseFormFactory.php
@@ -7,7 +7,7 @@
 use Nette;
 use Nette\Application\UI\Form;
 use Nette\Localization\Translator;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 
 /**
  * BaseFormFactory pro AdminModule.
@@ -31,7 +31,7 @@ public function create(): Form
         $form = new Form();
         $form->setTranslator($this->translator);
 
-        $renderer                                   = new Bs4FormRenderer();
+        $renderer                                   = new Bs5FormRenderer();
         $renderer->wrappers['control']['container'] = 'div class="col-9"';
         $renderer->wrappers['label']['container']   = 'div class="col-3 col-form-label"';
 
diff --git a/app/WebModule/Forms/BaseFormFactory.php b/app/WebModule/Forms/BaseFormFactory.php
index 029d780a0..0de03ea54 100644
--- a/app/WebModule/Forms/BaseFormFactory.php
+++ b/app/WebModule/Forms/BaseFormFactory.php
@@ -7,7 +7,7 @@
 use Nette;
 use Nette\Application\UI\Form;
 use Nette\Localization\Translator;
-use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs5FormRenderer;
 
 /**
  * BaseFormFactory pro WebModule.
@@ -31,7 +31,7 @@ public function create(): Form
         $form = new Form();
         $form->setTranslator($this->translator);
 
-        $renderer                                   = new Bs4FormRenderer();
+        $renderer                                   = new Bs5FormRenderer();
         $renderer->wrappers['control']['container'] = 'div class="col-md-9"';
         $renderer->wrappers['label']['container']   = 'div class="col-md-3 col-form-label"';
 

From 06dcf8a7fad6638d88eea09d76d05f4dc5d43c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Mon, 27 Sep 2021 14:50:46 +0200
Subject: [PATCH 2/2] breaking changes fix

---
 .../templates/applications_grid_detail.latte  | 20 +++----
 .../templates/Dashboard/default.latte         | 52 +++++++++----------
 .../Presenters/templates/Users/detail.latte   |  8 +--
 .../templates/includes/main_menu.latte        | 10 ++--
 .../Presenters/templates/Blocks/detail.latte  | 10 ++--
 .../templates/IncomeProof/pdf.latte           |  8 +--
 .../Presenters/templates/Ticket/pdf.latte     | 12 ++---
 .../Components/templates/blocks_content.latte |  2 +-
 .../templates/lectors_content.latte           |  4 +-
 .../Presenters/templates/@layout.latte        |  2 +-
 .../templates/Profile/default.latte           | 10 ++--
 .../templates/includes/main_menu.latte        |  2 +-
 app/assets/admin/schedule/BlocksList.vue      | 10 ++--
 app/assets/admin/schedule/Calendar.vue        |  4 +-
 app/assets/web/schedule/Calendar.vue          | 12 ++---
 15 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/app/AdminModule/Components/templates/applications_grid_detail.latte b/app/AdminModule/Components/templates/applications_grid_detail.latte
index 8fb2b100d..605892a04 100644
--- a/app/AdminModule/Components/templates/applications_grid_detail.latte
+++ b/app/AdminModule/Components/templates/applications_grid_detail.latte
@@ -7,14 +7,14 @@
             <tr class="bg-white">
                 <th>{_admin.users.users_applications_roles}</th>
                 <th>{_admin.users.users_applications_subevents}</th>
-                <th class="text-right">{_admin.users.users_applications_fee}</th>
+                <th class="text-end">{_admin.users.users_applications_fee}</th>
                 <th>{_admin.users.users_applications_variable_symbol}</th>
-                <th class="text-right">{_admin.users.users_applications_maturity_date}</th>
+                <th class="text-end">{_admin.users.users_applications_maturity_date}</th>
                 <th>{_admin.users.users_applications_payment_method}</th>
-                <th class="text-right">{_admin.users.users_applications_payment_date}</th>
+                <th class="text-end">{_admin.users.users_applications_payment_date}</th>
                 <th>{_admin.users.users_applications_state}</th>
-                <th class="text-right">{_admin.users.users_applications_valid_from}</th>
-                <th class="text-right">{_admin.users.users_applications_valid_to}</th>
+                <th class="text-end">{_admin.users.users_applications_valid_from}</th>
+                <th class="text-end">{_admin.users.users_applications_valid_to}</th>
                 <th>{_admin.users.users_applications_created_by}</th>
             </tr>
         </thead>
@@ -22,14 +22,14 @@
             <tr n:foreach="$applications as $application">
                 <td>{$application->getRolesText()}</td>
                 <td>{$application->getSubeventsText()}</td>
-                <td class="text-right">{$application->getFee()}</td>
+                <td class="text-end">{$application->getFee()}</td>
                 <td>{$application->getVariableSymbolText()}</td>
-                <td class="text-right">{$application->getMaturityDateText()}</td>
+                <td class="text-end">{$application->getMaturityDateText()}</td>
                 <td>{if $application->getPaymentMethod()}{_'common.payment.' . $application->getPaymentMethod()}{/if}</td>
-                <td class="text-right">{$application->getPaymentDateText()}</td>
+                <td class="text-end">{$application->getPaymentDateText()}</td>
                 <td>{_'common.application_state.' . $application->getState()}</td>
-                <td class="text-right">{$application->getValidFrom()|date:'j. n. Y H:i'}</td>
-                <td class="text-right">{$application->getValidTo()|date:'j. n. Y H:i'}</td>
+                <td class="text-end">{$application->getValidFrom()|date:'j. n. Y H:i'}</td>
+                <td class="text-end">{$application->getValidTo()|date:'j. n. Y H:i'}</td>
                 <td>{if $application->getCreatedBy()}{$application->getCreatedBy()->getDisplayName()}{/if}</td>
             </tr>
         </tbody>
diff --git a/app/AdminModule/Presenters/templates/Dashboard/default.latte b/app/AdminModule/Presenters/templates/Dashboard/default.latte
index 3ed3bb43b..50e875b1b 100644
--- a/app/AdminModule/Presenters/templates/Dashboard/default.latte
+++ b/app/AdminModule/Presenters/templates/Dashboard/default.latte
@@ -7,22 +7,22 @@
                         <h5 class="card-title">{_admin.menu.cms}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Cms:Pages:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Cms:Pages:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-file-lines"></span><br>{_admin.cms.menu.pages}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Cms:News:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Cms:News:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-newspaper"></span><br>{_admin.cms.menu.news}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Cms:Documents:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Cms:Documents:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-folder"></span><br>{_admin.cms.menu.documents}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Cms:Faq:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Cms:Faq:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-comments"></span><br>{_admin.cms.menu.faq}
                                 </a>
                             </div>
@@ -37,22 +37,22 @@
                         <h5 class="card-title">{_admin.menu.program}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Program:Blocks:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Program:Blocks:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-calendar-day"></span><br>{_admin.program.menu.blocks}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Program:Schedule:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Program:Schedule:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-calendar-days"></span><br>{_admin.program.menu.schedule}
                                 </a>
                             </div>
                             <div class="col-6 mb-3" n:if="$user->isAllowed($resourceProgram, $permissionManageCategories)">
-                                <a href="{plink Program:Categories:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Program:Categories:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-tags"></span><br>{_admin.program.menu.categories}
                                 </a>
                             </div>
                             <div class="col-6 mb-3" n:if="$user->isAllowed($resourceProgram, $permissionManageRooms)">
-                                <a href="{plink Program:Rooms:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Program:Rooms:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-house-chimney"></span><br>{_admin.program.menu.rooms}
                                 </a>
                             </div>
@@ -67,7 +67,7 @@
                         <h5 class="card-title">{_admin.menu.users}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Users:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Users:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-users"></span><br>{_admin.menu.users}
                                 </a>
                             </div>
@@ -82,7 +82,7 @@
                         <h5 class="card-title">{_admin.menu.payments}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Payments:Payments:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Payments:Payments:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-money-bill"></span><br>{_admin.menu.payments}
                                 </a>
                             </div>
@@ -97,7 +97,7 @@
                         <h5 class="card-title">{_admin.menu.acl}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Acl:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Acl:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-user-group"></span><br>{_admin.menu.acl}
                                 </a>
                             </div>
@@ -112,17 +112,17 @@
                         <h5 class="card-title">{_admin.menu.mailing}</h5>
                         <div class="row">
                             <div class="col-6 mb-3">
-                                <a href="{plink Mailing:Templates:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Mailing:Templates:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-envelope"></span><br>{_admin.mailing.menu.templates}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Mailing:Send:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Mailing:Send:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-envelope-open-text"></span><br>{_admin.mailing.menu.send}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
-                                <a href="{plink Mailing:History:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Mailing:History:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-box-archive"></span><br>{_admin.mailing.menu.history}
                                 </a>
                             </div>
@@ -137,62 +137,62 @@
                         <h5 class="card-title">{_admin.menu.configuration}</h5>
                         <div class="row">
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Seminar:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Seminar:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-calendar"></span><br>{_admin.configuration.menu.seminar}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Program:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Program:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-calendar-days"></span><br>{_admin.configuration.menu.program}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Subevents:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Subevents:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-calendar-week"></span><br>{_admin.configuration.menu.subevents}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Application:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Application:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-address-card"></span><br>{_admin.configuration.menu.application}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Payment:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Payment:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-file-invoice"></span><br>{_admin.configuration.menu.payment}
                                 </a>
                             </div>
                             <div class="col-2 mb-3" n:if="$explicitSubeventsExists">
-                                <a href="{plink Configuration:Discounts:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Discounts:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-percent"></span><br>{_admin.configuration.menu.discounts}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Tickets:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Tickets:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-ticket"></span><br>{_admin.configuration.menu.tickets}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Place:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Place:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-map-location-dot"></span><br>{_admin.configuration.menu.place}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Mailing:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Mailing:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-envelopes-bulk"></span><br>{_admin.configuration.menu.mailing}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:SkautIs:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:SkautIs:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-rotate"></span><br>{_admin.configuration.menu.skautis}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:Web:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:Web:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-file-code"></span><br>{_admin.configuration.menu.web}
                                 </a>
                             </div>
                             <div class="col-2 mb-3">
-                                <a href="{plink Configuration:System:default}" class="btn btn-secondary btn-sm btn-block">
+                                <a href="{plink Configuration:System:default}" class="btn btn-secondary btn-sm">
                                     <span class="fa fa-2x fa-gear"></span><br>{_admin.configuration.menu.system}
                                 </a>
                             </div>
diff --git a/app/AdminModule/Presenters/templates/Users/detail.latte b/app/AdminModule/Presenters/templates/Users/detail.latte
index 2e600726d..22496ce09 100644
--- a/app/AdminModule/Presenters/templates/Users/detail.latte
+++ b/app/AdminModule/Presenters/templates/Users/detail.latte
@@ -166,8 +166,8 @@
         <table class="table table-sm table-bordered table-striped">
             <thead>
                 <tr>
-                    <th class="text-right" style="width: 15%">{_admin.users.users_from}</th>
-                    <th class="text-right" style="width: 15%">{_admin.users.users_to}</th>
+                    <th class="text-end" style="width: 15%">{_admin.users.users_from}</th>
+                    <th class="text-end" style="width: 15%">{_admin.users.users_to}</th>
                     <th style="width: 25%">{_admin.users.users_program_name}</th>
                     <th style="width: 20%">{_admin.users.users_room}</th>
                     <th style="width: 25%">{_admin.users.users_lectors}</th>
@@ -175,12 +175,12 @@
             </thead>
             <tbody>
                 <tr n:foreach="$detailUserPrograms as $program">
-                    <td class="text-right">
+                    <td class="text-end">
                         {var $startDay = $program->getStart()->format('N')}
                         {_common.day.$startDay}
                         {$program->getStart()|date:"j. n. G:i"}
                     </td>
-                    <td class="text-right">
+                    <td class="text-end">
                         {var $endDay = $program->getEnd()->format('N')}
                         {_common.day.$endDay}
                         {$program->getEnd()|date:"j. n. G:i"}
diff --git a/app/AdminModule/Presenters/templates/includes/main_menu.latte b/app/AdminModule/Presenters/templates/includes/main_menu.latte
index 68f22ea40..5349e37bc 100644
--- a/app/AdminModule/Presenters/templates/includes/main_menu.latte
+++ b/app/AdminModule/Presenters/templates/includes/main_menu.latte
@@ -2,7 +2,7 @@
     <nav class="navbar navbar-expand-sm navbar-dark fixed-top bg-dark" style="min-width: 1200px;">
         <a class="navbar-brand" href="{plink :Web:Page:default}">{_admin.common.heading, [seminar_name => $seminarName]}</a>
 
-        <ul class="navbar-nav mr-auto">
+        <ul class="navbar-nav me-auto">
             <li n:class="nav-item, $presenter->isLinkCurrent(':Admin:Dashboard:*') ? active">
                 <a class="nav-link" href="{plink :Admin:Dashboard:default}">{_admin.menu.dashboard}</a>
             </li>
@@ -58,8 +58,8 @@
             </li>
         </ul>
 
-        <ul class="navbar-nav ml-auto">
-            <li class="nav-item mr-1">
+        <ul class="navbar-nav ms-auto">
+            <li class="nav-item me-1">
                 <div class="navbar-btn">
                     <a class="btn btn-light btn-sm" href="https://napoveda.skaut.cz/srs" target="_blank">
                         <i class="fa fa-question-circle"></i> {_admin.menu.help}
@@ -67,7 +67,7 @@
                 </div>
             </li>
 
-            <li class="nav-item dropdown mr-1 ml-1" id="role-menu">
+            <li class="nav-item dropdown me-1 ms-1" id="role-menu">
                 <div class="navbar-btn">
                     <button class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown">
                             <span id="role-menu-text">
@@ -84,7 +84,7 @@
                 </div>
             </li>
 
-            <li class="nav-item dropdown ml-1" id="user-menu">
+            <li class="nav-item dropdown ms-1" id="user-menu">
                 <div class="navbar-btn">
                     <button class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown">
                         <span class="fa fa-user-circle"></span>
diff --git a/app/AdminModule/ProgramModule/Presenters/templates/Blocks/detail.latte b/app/AdminModule/ProgramModule/Presenters/templates/Blocks/detail.latte
index a2f2952ba..467a34560 100644
--- a/app/AdminModule/ProgramModule/Presenters/templates/Blocks/detail.latte
+++ b/app/AdminModule/ProgramModule/Presenters/templates/Blocks/detail.latte
@@ -91,8 +91,8 @@
         <table class="table table-sm table-bordered table-striped">
             <thead>
                 <tr>
-                    <th class="text-right">{_admin.program.blocks.programs.column.start}</th>
-                    <th class="text-right">{_admin.program.blocks.programs.column.end}</th>
+                    <th class="text-end">{_admin.program.blocks.programs.column.start}</th>
+                    <th class="text-end">{_admin.program.blocks.programs.column.end}</th>
                     <th>{_admin.program.blocks.programs.column.room}</th>
                     <th>{_admin.program.blocks.programs.column.attendees_count}</th>
                     <th n:if="$block->isAlternatesAllowed()">{_admin.program.blocks.programs.column.alternates_count}</th>
@@ -105,12 +105,12 @@
                 {foreach $block->getPrograms() as $program}
                     {var $background = $i % 2 ? '#F2F2F2' : '#FFFFFF'}
                     <tr style="background-color: {$background|noescape}">
-                        <td class="text-right">
+                        <td class="text-end">
                             {var $startDay = $program->getStart()->format('N')}
                             {_common.day.$startDay}
                             {$program->getStart()|date:"j. n. G:i"}
                         </td>
-                        <td class="text-right">
+                        <td class="text-end">
                             {var $endDay = $program->getEnd()->format('N')}
                             {_common.day.$endDay}
                             {$program->getEnd()|date:"j. n. G:i"}
@@ -126,7 +126,7 @@
                         <td n:if="$block->isAlternatesAllowed()">
                             {$program->getAlternatesCount()}
                         </td>
-                        <td class="text-right" style="white-space: nowrap; width: 1%;">
+                        <td class="text-end" style="white-space: nowrap; width: 1%;">
                             {if $programId === $program->getId()}
                                 <a class="btn btn-xs btn-warning ajax" n:href="showattendees! 0">
                                     {_admin.program.blocks.programs.action.hide_attendees_list}
diff --git a/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte b/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
index f272f8c4b..04be78efd 100644
--- a/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
+++ b/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
@@ -5,7 +5,7 @@
                 <div class="col-8">
                     <h1 style="padding-top: 24px">{_export.income_proof.cash.heading}</h1>
                 </div>
-                <div class="col-4 text-right">
+                <div class="col-4 text-end">
                     <img src="{$basePath}{$logo}" style="max-height: 60px"/>
                 </div>
             </div>
@@ -18,7 +18,7 @@
                         {_export.income_proof.ico} {$ico}
                     </div>
                 </div>
-                <div class="col-4 text-right">
+                <div class="col-4 text-end">
                     {_export.income_proof.cash.number} {$application->getIncomeProof()->getId()}
                     {_export.income_proof.cash.date} {$application->getIncomeProof()->getDateText()}
                 </div>
@@ -56,7 +56,7 @@
                 <div class="col-8">
                     <h1 style="padding-top: 24px">{_export.income_proof.bank.heading}</h1>
                 </div>
-                <div class="col-4 text-right">
+                <div class="col-4 text-end">
                     <img src="{$basePath}{$logo}" style="max-height: 60px"/>
                 </div>
             </div>
@@ -92,7 +92,7 @@
             </div>
 
             <div class="row mt-4">
-                <div class="col-12 text-right">
+                <div class="col-12 text-end">
                     {_export.income_proof.bank.accountant} {$accountant} {_export.income_proof.bank.date} {$date}
                 </div>
             </div>
diff --git a/app/ExportModule/Presenters/templates/Ticket/pdf.latte b/app/ExportModule/Presenters/templates/Ticket/pdf.latte
index f722c8652..b343ecd03 100644
--- a/app/ExportModule/Presenters/templates/Ticket/pdf.latte
+++ b/app/ExportModule/Presenters/templates/Ticket/pdf.latte
@@ -3,7 +3,7 @@
         <div class="col-5">
             <img src="{$basePath}{$logo}"/>
         </div>
-        <div class="col-7 text-right">
+        <div class="col-7 text-end">
             <h1>{$seminarName}</h1>
         </div>
     </div>
@@ -31,7 +31,7 @@
                 <div class="col-9">{$ticketUser->getSubeventsText()}</div>
             </div>
         </div>
-        <div class="col-3 text-right">
+        <div class="col-3 text-end">
             <barcode class="barcode" code="{$ticketUser->getId()}" type="QR" error="M" disableborder="1"/>
         </div>
     </div>
@@ -42,8 +42,8 @@
             <table class="table table-sm">
                 <thead>
                     <tr>
-                        <th class="text-right" style="width: 10%">{_export.ticket.from}</th>
-                        <th class="text-right" style="width: 10%">{_export.ticket.to}</th>
+                        <th class="text-end" style="width: 10%">{_export.ticket.from}</th>
+                        <th class="text-end" style="width: 10%">{_export.ticket.to}</th>
                         <th style="width: 30%">{_export.ticket.program_name}</th>
                         <th style="width: 20%">{_export.ticket.room}</th>
                         <th style="width: 30%">{_export.ticket.lectors}</th>
@@ -51,12 +51,12 @@
                 </thead>
                 <tbody>
                     <tr n:foreach="$ticketUserPrograms as $program">
-                        <td class="text-right">
+                        <td class="text-end">
                             {var $startDay = $program->getStart()->format('N')}
                             {_common.day.$startDay}
                             {$program->getStart()|date:"j. n. G:i"}
                         </td>
-                        <td class="text-right">
+                        <td class="text-end">
                             {var $endDay = $program->getEnd()->format('N')}
                             {_common.day.$endDay}
                             {$program->getEnd()|date:"j. n. G:i"}
diff --git a/app/WebModule/Components/templates/blocks_content.latte b/app/WebModule/Components/templates/blocks_content.latte
index 25394d178..89c866691 100644
--- a/app/WebModule/Components/templates/blocks_content.latte
+++ b/app/WebModule/Components/templates/blocks_content.latte
@@ -68,7 +68,7 @@
                         {foreach $selectedBlock->getLectors() as $lector}
                             <h6>{$lector->getLectorName()}</h6>
                             <p>
-                                <img src="{$basePath}{$lector->getPhoto()}" class="float-left mr-3 mb-3" n:if="$lector->getPhoto()"/>
+                                <img src="{$basePath}{$lector->getPhoto()}" class="float-left me-3 mb-3" n:if="$lector->getPhoto()"/>
                                 {$lector->getAbout()}
                             </p>
                             <div class="clearfix"></div>
diff --git a/app/WebModule/Components/templates/lectors_content.latte b/app/WebModule/Components/templates/lectors_content.latte
index b4c3b5ccd..a590eb20e 100644
--- a/app/WebModule/Components/templates/lectors_content.latte
+++ b/app/WebModule/Components/templates/lectors_content.latte
@@ -17,7 +17,7 @@
                     </div>
                     <div class="col">
                         <div class="row mb-3" n:if="$lector->getAbout()">
-                            <div class="col-md-3 font-weight-bold">
+                            <div class="col-md-3 fw-bold">
                                 {_web.lectors_content.about_me}
                             </div>
                             <div class="col-md-9">
@@ -25,7 +25,7 @@
                             </div>
                         </div>
                         <div class="row mb-3" n:if="$lector->getLecturersBlocks()->count() > 0">
-                            <div class="col-md-3 font-weight-bold">
+                            <div class="col-md-3 fw-bold">
                                 {_web.lectors_content.blocks}
                             </div>
                             <div class="col-md-9">
diff --git a/app/WebModule/Presenters/templates/@layout.latte b/app/WebModule/Presenters/templates/@layout.latte
index 7470c0b12..6954aeb9d 100644
--- a/app/WebModule/Presenters/templates/@layout.latte
+++ b/app/WebModule/Presenters/templates/@layout.latte
@@ -30,7 +30,7 @@
         {/snippet}
 
         <div id="header" class="row mt-3">
-            <div id="logo" class="col-md-6 text-center text-md-left">
+            <div id="logo" class="col-md-6 text-center text-md-start">
                 <a href="{plink :Web:Page:default}">
                     <img src="{$basePath}{$logo}" title="{$seminarName}" alt="logo">
                 </a>
diff --git a/app/WebModule/Presenters/templates/Profile/default.latte b/app/WebModule/Presenters/templates/Profile/default.latte
index b3a9541a4..94e427fd1 100644
--- a/app/WebModule/Presenters/templates/Profile/default.latte
+++ b/app/WebModule/Presenters/templates/Profile/default.latte
@@ -117,8 +117,8 @@
                                                 <table class="table table-sm table-bordered table-striped">
                                                     <thead>
                                                         <tr>
-                                                            <th class="text-right" style="width: 15%">{_web.profile.from}</th>
-                                                            <th class="text-right" style="width: 15%">{_web.profile.to}</th>
+                                                            <th class="text-end" style="width: 15%">{_web.profile.from}</th>
+                                                            <th class="text-end" style="width: 15%">{_web.profile.to}</th>
                                                             <th style="width: 25%">{_web.profile.program_name}</th>
                                                             <th style="width: 20%">{_web.profile.room}</th>
                                                             <th style="width: 25%">{_web.profile.lectors}</th>
@@ -126,12 +126,12 @@
                                                     </thead>
                                                     <tbody>
                                                         <tr n:foreach="$userPrograms as $program">
-                                                            <td class="text-right">
+                                                            <td class="text-end">
                                                                 {var $startDay = $program->getStart()->format('N')}
                                                                 {_common.day.$startDay}
                                                                 {$program->getStart()|date:"j. n. G:i"}
                                                             </td>
-                                                            <td class="text-right">
+                                                            <td class="text-end">
                                                                 {var $endDay = $program->getEnd()->format('N')}
                                                                 {_common.day.$endDay}
                                                                 {$program->getEnd()|date:"j. n. G:i"}
@@ -148,7 +148,7 @@
                                     <div class="row mb-3">
                                         <div class="col">
                                             <div class="btn-toolbar">
-                                                <a n:href="exportschedule" class="btn btn-secondary mr-2">{_web.profile.download_schedule_excel}</a>
+                                                <a n:href="exportschedule" class="btn btn-secondary me-2">{_web.profile.download_schedule_excel}</a>
 
                                                 <div class="input-group">
                                                     <div class="input-group-prepend">
diff --git a/app/WebModule/Presenters/templates/includes/main_menu.latte b/app/WebModule/Presenters/templates/includes/main_menu.latte
index 6cfa8bd3c..14fa4f811 100644
--- a/app/WebModule/Presenters/templates/includes/main_menu.latte
+++ b/app/WebModule/Presenters/templates/includes/main_menu.latte
@@ -5,7 +5,7 @@
         </button>
 
         <div class="collapse navbar-collapse" id="main-navbar">
-            <ul class="navbar-nav mr-auto">
+            <ul class="navbar-nav me-auto">
                 {foreach $pages as $item}
                     {if $item->getSlug() === '/'}
                         <li n:class="nav-item, $presenter->isLinkCurrent(':Web:Page:default', ['slug' => null]) ? active">
diff --git a/app/assets/admin/schedule/BlocksList.vue b/app/assets/admin/schedule/BlocksList.vue
index 2cf5938d9..fe51d8855 100644
--- a/app/assets/admin/schedule/BlocksList.vue
+++ b/app/assets/admin/schedule/BlocksList.vue
@@ -20,21 +20,21 @@
                             <div class="col">
                                 <b>{{ block.name }}</b>
                             </div>
-                            <div class="col-auto text-right">
-                                <span class="badge badge-dark badge-pill">{{ block.programsCount }} ×</span>
+                            <div class="col-auto text-end">
+                                <span class="badge bg-dark rounded-pill">{{ block.programsCount }} ×</span>
                             </div>
                         </div>
                         <table>
                             <tr>
-                                <td class="pr-3 align-top">Kategorie</td>
+                                <td class="pe-3 align-top">Kategorie</td>
                                 <td>{{ block.category }}</td>
                             </tr>
                             <tr>
-                                <td class="pr-3 align-top">Lektoři</td>
+                                <td class="pe-3 align-top">Lektoři</td>
                                 <td>{{ block.lectorsNames }}</td>
                             </tr>
                             <tr>
-                                <td class="pr-3">Kapacita</td>
+                                <td class="pe-3">Kapacita</td>
                                 <td>{{ block.capacity }}</td>
                             </tr>
                         </table>
diff --git a/app/assets/admin/schedule/Calendar.vue b/app/assets/admin/schedule/Calendar.vue
index 197e2e2a3..c78628906 100644
--- a/app/assets/admin/schedule/Calendar.vue
+++ b/app/assets/admin/schedule/Calendar.vue
@@ -5,7 +5,7 @@
                 <div class="modal-content" v-if="selectedEventInfo">
                     <div class="modal-header">
                         <h5 class="modal-title">Nastavení programu</h5>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <button type="button" class="btn-close" data-dismiss="modal">&times;</button>
                     </div>
                     <div class="modal-body">
                         <div class="form-group row">
@@ -63,7 +63,7 @@
         </div>
 
         <div class="row mb-3">
-            <div class="col-auto mr-auto">
+            <div class="col-auto me-auto">
                 <div class="btn-group">
                     <button @click="handleChangeView('timeGridSeminar')" class="btn btn-sm btn-secondary" :class="{ active: initialView === 'timeGridSeminar' }">
                         Na výšku
diff --git a/app/assets/web/schedule/Calendar.vue b/app/assets/web/schedule/Calendar.vue
index 7e2d9c1b3..fc5bc69ee 100644
--- a/app/assets/web/schedule/Calendar.vue
+++ b/app/assets/web/schedule/Calendar.vue
@@ -5,7 +5,7 @@
                 <div class="modal-content" v-if="selectedEventInfo">
                     <div class="modal-header">
                         <h5 class="modal-title">{{ selectedEventInfo.event.extendedProps.block.name }}</h5>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <button type="button" class="btn-close" data-dismiss="modal">&times;</button>
                     </div>
                     <div class="modal-body">
                         <ul class="list-unstyled">
@@ -32,7 +32,7 @@
                             <div v-for="lector in selectedEventInfo.event.extendedProps.block.lectors">
                                 <b>{{ lector.name }}</b>
                                 <p>
-                                    <img :src="basePath + lector.photo" v-if="lector.photo" class="float-left mr-3 mb-3"/>
+                                    <img :src="basePath + lector.photo" v-if="lector.photo" class="float-left me-3 mb-3"/>
                                     {{ lector.about }}
                                 </p>
                                 <div class="clearfix"></div>
@@ -73,7 +73,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">Nápověda</h5>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <button type="button" class="btn-close" data-dismiss="modal">&times;</button>
                     </div>
                     <div class="modal-body">
                         <p>Kliknutím na program se zobrazí možnost přihlášení/odhlášení a další informace o programu.</p>
@@ -96,7 +96,7 @@
         </div>
 
         <div class="row mb-2">
-            <div class="col-auto mr-auto mb-1">
+            <div class="col-auto me-auto mb-1">
                 <div class="btn-group">
                     <button @click="handleChangeView('timeGridSeminar')" class="btn btn-sm btn-secondary" :class="{ active: initialView === 'timeGridSeminar' }">
                         Na výšku
@@ -122,10 +122,10 @@
                 </button>
             </div>
             <div class="col-auto mb-1 mr-n2">
-                <div class="spinner float-left mr-2" v-show="loading > 0">
+                <div class="spinner float-start me-2" v-show="loading > 0">
                     <span class="fa fa-spinner fa-pulse fa-2x"></span>
                 </div>
-                <div class="notifications float-left mr-2">
+                <div class="notifications float-start me-2">
                     <div v-if="message" class="alert" :class="'alert-' + message.type" style="padding: 4px 8px; margin: 0">
                         {{ message.text }}
                     </div>