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 @@ {_admin.users.users_applications_roles} {_admin.users.users_applications_subevents} - {_admin.users.users_applications_fee} + {_admin.users.users_applications_fee} {_admin.users.users_applications_variable_symbol} - {_admin.users.users_applications_maturity_date} + {_admin.users.users_applications_maturity_date} {_admin.users.users_applications_payment_method} - {_admin.users.users_applications_payment_date} + {_admin.users.users_applications_payment_date} {_admin.users.users_applications_state} - {_admin.users.users_applications_valid_from} - {_admin.users.users_applications_valid_to} + {_admin.users.users_applications_valid_from} + {_admin.users.users_applications_valid_to} {_admin.users.users_applications_created_by} @@ -22,14 +22,14 @@ {$application->getRolesText()} {$application->getSubeventsText()} - {$application->getFee()} + {$application->getFee()} {$application->getVariableSymbolText()} - {$application->getMaturityDateText()} + {$application->getMaturityDateText()} {if $application->getPaymentMethod()}{_'common.payment.' . $application->getPaymentMethod()}{/if} - {$application->getPaymentDateText()} + {$application->getPaymentDateText()} {_'common.application_state.' . $application->getState()} - {$application->getValidFrom()|date:'j. n. Y H:i'} - {$application->getValidTo()|date:'j. n. Y H:i'} + {$application->getValidFrom()|date:'j. n. Y H:i'} + {$application->getValidTo()|date:'j. n. Y H:i'} {if $application->getCreatedBy()}{$application->getCreatedBy()->getDisplayName()}{/if} diff --git a/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php index a327a5484..a103bc5a9 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; @@ -45,7 +45,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 de4136bb3..157b07327 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; @@ -64,7 +64,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 dfaad5c08..2b8d070af 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; @@ -62,7 +62,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 6de145b08..95317edb2 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; @@ -39,7 +39,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 0776c963f..4303f5a4d 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; @@ -47,7 +47,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 107bb3dff..61972b26b 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; @@ -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/SkautIsEventFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php index 97ba18f31..ad6002608 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; @@ -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/TicketsFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php index 3a71e235a..3918b3b36 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; @@ -37,7 +37,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 1eac0f8e4..74129525f 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; @@ -53,7 +53,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 3bcae5ae8..093cc7e4d 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. @@ -28,7 +28,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/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 @@
{_admin.menu.cms}
- +
{_admin.cms.menu.pages}
- +
{_admin.cms.menu.news}
- +
{_admin.cms.menu.documents}
- +
{_admin.cms.menu.faq}
@@ -37,22 +37,22 @@
{_admin.menu.program}
@@ -67,7 +67,7 @@
{_admin.menu.users}
@@ -82,7 +82,7 @@
{_admin.menu.payments}
@@ -97,7 +97,7 @@
{_admin.menu.acl}
@@ -112,17 +112,17 @@
{_admin.menu.mailing}
@@ -137,62 +137,62 @@
{_admin.menu.configuration}
diff --git a/app/AdminModule/Presenters/templates/Users/detail.latte b/app/AdminModule/Presenters/templates/Users/detail.latte index c5435d176..09441e0aa 100644 --- a/app/AdminModule/Presenters/templates/Users/detail.latte +++ b/app/AdminModule/Presenters/templates/Users/detail.latte @@ -171,8 +171,8 @@ - - + + @@ -180,12 +180,12 @@ - -
{_admin.users.users_from}{_admin.users.users_to}{_admin.users.users_from}{_admin.users.users_to} {_admin.users.users_program_name} {_admin.users.users_room} {_admin.users.users_lectors}
+ {var $startDay = $program->getStart()->format('N')} {_common.day.$startDay} {$program->getStart()|date:"j. n. G:i"} + {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 @@