Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap 5 #817

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Bootstrap 5 #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4f978f
bootstrap 5
jan-stanek Sep 27, 2021
06dcf8a
breaking changes fix
jan-stanek Sep 27, 2021
b7bb676
Merge branch 'master' into feature/bootstrap5
jan-stanek May 22, 2022
dd5f886
Merge branch 'master' into feature/bootstrap5
jan-stanek Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/AdminModule/Components/templates/applications_grid_detail.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
<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>
<tbody class="bg-white">
<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>
Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"';

Expand Down
4 changes: 2 additions & 2 deletions app/AdminModule/Forms/BaseFormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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"';

Expand Down
Loading