Skip to content

Commit

Permalink
breaking changes fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@jan-stanek
jan-stanek committed Sep 27, 2021
1 parent 2a3efd1 commit 2217524
Show file tree
Hide file tree
Showing 15 changed files with 83 additions and 83 deletions.
20 changes: 10 additions & 10 deletions app/AdminModule/Components/templates/applications_grid_detail.latte
View file
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
50 changes: 25 additions & 25 deletions app/AdminModule/Presenters/templates/Dashboard/default.latte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-text-o"></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-o"></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-files-o"></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-comment-o"></span><br>{_admin.cms.menu.faq}
</a>
</div>
Expand All @@ -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-o"></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"></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-flag"></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-home"></span><br>{_admin.program.menu.rooms}
</a>
</div>
Expand All @@ -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>
Expand All @@ -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"></span><br>{_admin.menu.payments}
</a>
</div>
Expand All @@ -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-circle-o"></span><br>{_admin.menu.acl}
</a>
</div>
Expand All @@ -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-o"></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-o"></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-archive"></span><br>{_admin.mailing.menu.history}
</a>
</div>
Expand All @@ -137,57 +137,57 @@
<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-o"></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"></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"></span><br>{_admin.configuration.menu_subevents}
</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-money"></span><br>{_admin.configuration.menu_discounts}
</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-money"></span><br>{_admin.configuration.menu_payment}
</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-id-card-o"></span><br>{_admin.configuration.menu_application}
</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-home"></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-envelope-o"></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-refresh"></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-text-o"></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-cog"></span><br>{_admin.configuration.menu_system}
</a>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/AdminModule/Presenters/templates/Users/detail.latte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,21 @@
<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>
</tr>
</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"}
Expand Down
10 changes: 5 additions & 5 deletions app/AdminModule/Presenters/templates/includes/main_menu.latte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -58,16 +58,16 @@
</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}
</a>
</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">
Expand All @@ -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"></span>
Expand Down
Loading

0 comments on commit 2217524

Please sign in to comment.