Skip to content

Commit 2217524

Browse files
jan-stanekjan-stanek
committed
breaking changes fix
1 parent 2a3efd1 commit 2217524

File tree

15 files changed

+83
-83
lines changed

15 files changed

+83
-83
lines changed

‎app/AdminModule/Components/templates/applications_grid_detail.latte‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
<tr class="bg-white">
88
<th>{_admin.users.users_applications_roles}</th>
99
<th>{_admin.users.users_applications_subevents}</th>
10-
<th class="text-right">{_admin.users.users_applications_fee}</th>
10+
<th class="text-end">{_admin.users.users_applications_fee}</th>
1111
<th>{_admin.users.users_applications_variable_symbol}</th>
12-
<th class="text-right">{_admin.users.users_applications_maturity_date}</th>
12+
<th class="text-end">{_admin.users.users_applications_maturity_date}</th>
1313
<th>{_admin.users.users_applications_payment_method}</th>
14-
<th class="text-right">{_admin.users.users_applications_payment_date}</th>
14+
<th class="text-end">{_admin.users.users_applications_payment_date}</th>
1515
<th>{_admin.users.users_applications_state}</th>
16-
<th class="text-right">{_admin.users.users_applications_valid_from}</th>
17-
<th class="text-right">{_admin.users.users_applications_valid_to}</th>
16+
<th class="text-end">{_admin.users.users_applications_valid_from}</th>
17+
<th class="text-end">{_admin.users.users_applications_valid_to}</th>
1818
<th>{_admin.users.users_applications_created_by}</th>
1919
</tr>
2020
</thead>
2121
<tbody class="bg-white">
2222
<tr n:foreach="$applications as $application">
2323
<td>{$application->getRolesText()}</td>
2424
<td>{$application->getSubeventsText()}</td>
25-
<td class="text-right">{$application->getFee()}</td>
25+
<td class="text-end">{$application->getFee()}</td>
2626
<td>{$application->getVariableSymbolText()}</td>
27-
<td class="text-right">{$application->getMaturityDateText()}</td>
27+
<td class="text-end">{$application->getMaturityDateText()}</td>
2828
<td>{if $application->getPaymentMethod()}{_'common.payment.' . $application->getPaymentMethod()}{/if}</td>
29-
<td class="text-right">{$application->getPaymentDateText()}</td>
29+
<td class="text-end">{$application->getPaymentDateText()}</td>
3030
<td>{_'common.application_state.' . $application->getState()}</td>
31-
<td class="text-right">{$application->getValidFrom()|date:'j. n. Y H:i'}</td>
32-
<td class="text-right">{$application->getValidTo()|date:'j. n. Y H:i'}</td>
31+
<td class="text-end">{$application->getValidFrom()|date:'j. n. Y H:i'}</td>
32+
<td class="text-end">{$application->getValidTo()|date:'j. n. Y H:i'}</td>
3333
<td>{if $application->getCreatedBy()}{$application->getCreatedBy()->getDisplayName()}{/if}</td>
3434
</tr>
3535
</tbody>

‎app/AdminModule/Presenters/templates/Dashboard/default.latte‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
<h5 class="card-title">{_admin.menu.cms}</h5>
88
<div class="row">
99
<div class="col-6 mb-3">
10-
<a href="{plink Cms:Pages:default}" class="btn btn-secondary btn-sm btn-block">
10+
<a href="{plink Cms:Pages:default}" class="btn btn-secondary btn-sm">
1111
<span class="fa fa-2x fa-file-text-o"></span><br>{_admin.cms.menu.pages}
1212
</a>
1313
</div>
1414
<div class="col-6 mb-3">
15-
<a href="{plink Cms:News:default}" class="btn btn-secondary btn-sm btn-block">
15+
<a href="{plink Cms:News:default}" class="btn btn-secondary btn-sm">
1616
<span class="fa fa-2x fa-newspaper-o"></span><br>{_admin.cms.menu.news}
1717
</a>
1818
</div>
1919
<div class="col-6 mb-3">
20-
<a href="{plink Cms:Documents:default}" class="btn btn-secondary btn-sm btn-block">
20+
<a href="{plink Cms:Documents:default}" class="btn btn-secondary btn-sm">
2121
<span class="fa fa-2x fa-files-o"></span><br>{_admin.cms.menu.documents}
2222
</a>
2323
</div>
2424
<div class="col-6 mb-3">
25-
<a href="{plink Cms:Faq:default}" class="btn btn-secondary btn-sm btn-block">
25+
<a href="{plink Cms:Faq:default}" class="btn btn-secondary btn-sm">
2626
<span class="fa fa-2x fa-comment-o"></span><br>{_admin.cms.menu.faq}
2727
</a>
2828
</div>
@@ -37,22 +37,22 @@
3737
<h5 class="card-title">{_admin.menu.program}</h5>
3838
<div class="row">
3939
<div class="col-6 mb-3">
40-
<a href="{plink Program:Blocks:default}" class="btn btn-secondary btn-sm btn-block">
40+
<a href="{plink Program:Blocks:default}" class="btn btn-secondary btn-sm">
4141
<span class="fa fa-2x fa-calendar-o"></span><br>{_admin.program.menu.blocks}
4242
</a>
4343
</div>
4444
<div class="col-6 mb-3">
45-
<a href="{plink Program:Schedule:default}" class="btn btn-secondary btn-sm btn-block">
45+
<a href="{plink Program:Schedule:default}" class="btn btn-secondary btn-sm">
4646
<span class="fa fa-2x fa-calendar"></span><br>{_admin.program.menu.schedule}
4747
</a>
4848
</div>
4949
<div class="col-6 mb-3" n:if="$user->isAllowed($resourceProgram, $permissionManageCategories)">
50-
<a href="{plink Program:Categories:default}" class="btn btn-secondary btn-sm btn-block">
50+
<a href="{plink Program:Categories:default}" class="btn btn-secondary btn-sm">
5151
<span class="fa fa-2x fa-flag"></span><br>{_admin.program.menu.categories}
5252
</a>
5353
</div>
5454
<div class="col-6 mb-3" n:if="$user->isAllowed($resourceProgram, $permissionManageRooms)">
55-
<a href="{plink Program:Rooms:default}" class="btn btn-secondary btn-sm btn-block">
55+
<a href="{plink Program:Rooms:default}" class="btn btn-secondary btn-sm">
5656
<span class="fa fa-2x fa-home"></span><br>{_admin.program.menu.rooms}
5757
</a>
5858
</div>
@@ -67,7 +67,7 @@
6767
<h5 class="card-title">{_admin.menu.users}</h5>
6868
<div class="row">
6969
<div class="col-6 mb-3">
70-
<a href="{plink Users:default}" class="btn btn-secondary btn-sm btn-block">
70+
<a href="{plink Users:default}" class="btn btn-secondary btn-sm">
7171
<span class="fa fa-2x fa-users"></span><br>{_admin.menu.users}
7272
</a>
7373
</div>
@@ -82,7 +82,7 @@
8282
<h5 class="card-title">{_admin.menu.payments}</h5>
8383
<div class="row">
8484
<div class="col-6 mb-3">
85-
<a href="{plink Payments:Payments:default}" class="btn btn-secondary btn-sm btn-block">
85+
<a href="{plink Payments:Payments:default}" class="btn btn-secondary btn-sm">
8686
<span class="fa fa-2x fa-money"></span><br>{_admin.menu.payments}
8787
</a>
8888
</div>
@@ -97,7 +97,7 @@
9797
<h5 class="card-title">{_admin.menu.acl}</h5>
9898
<div class="row">
9999
<div class="col-6 mb-3">
100-
<a href="{plink Acl:default}" class="btn btn-secondary btn-sm btn-block">
100+
<a href="{plink Acl:default}" class="btn btn-secondary btn-sm">
101101
<span class="fa fa-2x fa-user-circle-o"></span><br>{_admin.menu.acl}
102102
</a>
103103
</div>
@@ -112,17 +112,17 @@
112112
<h5 class="card-title">{_admin.menu.mailing}</h5>
113113
<div class="row">
114114
<div class="col-6 mb-3">
115-
<a href="{plink Mailing:Templates:default}" class="btn btn-secondary btn-sm btn-block">
115+
<a href="{plink Mailing:Templates:default}" class="btn btn-secondary btn-sm">
116116
<span class="fa fa-2x fa-envelope-o"></span><br>{_admin.mailing.menu.templates}
117117
</a>
118118
</div>
119119
<div class="col-6 mb-3">
120-
<a href="{plink Mailing:Send:default}" class="btn btn-secondary btn-sm btn-block">
120+
<a href="{plink Mailing:Send:default}" class="btn btn-secondary btn-sm">
121121
<span class="fa fa-2x fa-envelope-o"></span><br>{_admin.mailing.menu.send}
122122
</a>
123123
</div>
124124
<div class="col-6 mb-3">
125-
<a href="{plink Mailing:History:default}" class="btn btn-secondary btn-sm btn-block">
125+
<a href="{plink Mailing:History:default}" class="btn btn-secondary btn-sm">
126126
<span class="fa fa-2x fa-archive"></span><br>{_admin.mailing.menu.history}
127127
</a>
128128
</div>
@@ -137,57 +137,57 @@
137137
<h5 class="card-title">{_admin.menu.configuration}</h5>
138138
<div class="row">
139139
<div class="col-2 mb-3">
140-
<a href="{plink Configuration:Seminar:default}" class="btn btn-secondary btn-sm btn-block">
140+
<a href="{plink Configuration:Seminar:default}" class="btn btn-secondary btn-sm">
141141
<span class="fa fa-2x fa-calendar-o"></span><br>{_admin.configuration.menu_seminar}
142142
</a>
143143
</div>
144144
<div class="col-2 mb-3">
145-
<a href="{plink Configuration:Program:default}" class="btn btn-secondary btn-sm btn-block">
145+
<a href="{plink Configuration:Program:default}" class="btn btn-secondary btn-sm">
146146
<span class="fa fa-2x fa-calendar"></span><br>{_admin.configuration.menu_program}
147147
</a>
148148
</div>
149149
<div class="col-2 mb-3">
150-
<a href="{plink Configuration:Subevents:default}" class="btn btn-secondary btn-sm btn-block">
150+
<a href="{plink Configuration:Subevents:default}" class="btn btn-secondary btn-sm">
151151
<span class="fa fa-2x fa-calendar"></span><br>{_admin.configuration.menu_subevents}
152152
</a>
153153
</div>
154154
<div class="col-2 mb-3" n:if="$explicitSubeventsExists">
155-
<a href="{plink Configuration:Discounts:default}" class="btn btn-secondary btn-sm btn-block">
155+
<a href="{plink Configuration:Discounts:default}" class="btn btn-secondary btn-sm">
156156
<span class="fa fa-2x fa-money"></span><br>{_admin.configuration.menu_discounts}
157157
</a>
158158
</div>
159159
<div class="col-2 mb-3">
160-
<a href="{plink Configuration:Payment:default}" class="btn btn-secondary btn-sm btn-block">
160+
<a href="{plink Configuration:Payment:default}" class="btn btn-secondary btn-sm">
161161
<span class="fa fa-2x fa-money"></span><br>{_admin.configuration.menu_payment}
162162
</a>
163163
</div>
164164
<div class="col-2 mb-3">
165-
<a href="{plink Configuration:Application:default}" class="btn btn-secondary btn-sm btn-block">
165+
<a href="{plink Configuration:Application:default}" class="btn btn-secondary btn-sm">
166166
<span class="fa fa-2x fa-id-card-o"></span><br>{_admin.configuration.menu_application}
167167
</a>
168168
</div>
169169
<div class="col-2 mb-3">
170-
<a href="{plink Configuration:Place:default}" class="btn btn-secondary btn-sm btn-block">
170+
<a href="{plink Configuration:Place:default}" class="btn btn-secondary btn-sm">
171171
<span class="fa fa-2x fa-home"></span><br>{_admin.configuration.menu_place}
172172
</a>
173173
</div>
174174
<div class="col-2 mb-3">
175-
<a href="{plink Configuration:Mailing:default}" class="btn btn-secondary btn-sm btn-block">
175+
<a href="{plink Configuration:Mailing:default}" class="btn btn-secondary btn-sm">
176176
<span class="fa fa-2x fa-envelope-o"></span><br>{_admin.configuration.menu_mailing}
177177
</a>
178178
</div>
179179
<div class="col-2 mb-3">
180-
<a href="{plink Configuration:SkautIs:default}" class="btn btn-secondary btn-sm btn-block">
180+
<a href="{plink Configuration:SkautIs:default}" class="btn btn-secondary btn-sm">
181181
<span class="fa fa-2x fa-refresh"></span><br>{_admin.configuration.menu_skautis}
182182
</a>
183183
</div>
184184
<div class="col-2 mb-3">
185-
<a href="{plink Configuration:Web:default}" class="btn btn-secondary btn-sm btn-block">
185+
<a href="{plink Configuration:Web:default}" class="btn btn-secondary btn-sm">
186186
<span class="fa fa-2x fa-file-text-o"></span><br>{_admin.configuration.menu_web}
187187
</a>
188188
</div>
189189
<div class="col-2 mb-3">
190-
<a href="{plink Configuration:System:default}" class="btn btn-secondary btn-sm btn-block">
190+
<a href="{plink Configuration:System:default}" class="btn btn-secondary btn-sm">
191191
<span class="fa fa-2x fa-cog"></span><br>{_admin.configuration.menu_system}
192192
</a>
193193
</div>

‎app/AdminModule/Presenters/templates/Users/detail.latte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,21 @@
175175
<table class="table table-sm table-bordered table-striped">
176176
<thead>
177177
<tr>
178-
<th class="text-right" style="width: 15%">{_admin.users.users_from}</th>
179-
<th class="text-right" style="width: 15%">{_admin.users.users_to}</th>
178+
<th class="text-end" style="width: 15%">{_admin.users.users_from}</th>
179+
<th class="text-end" style="width: 15%">{_admin.users.users_to}</th>
180180
<th style="width: 25%">{_admin.users.users_program_name}</th>
181181
<th style="width: 20%">{_admin.users.users_room}</th>
182182
<th style="width: 25%">{_admin.users.users_lectors}</th>
183183
</tr>
184184
</thead>
185185
<tbody>
186186
<tr n:foreach="$detailUserPrograms as $program">
187-
<td class="text-right">
187+
<td class="text-end">
188188
{var $startDay = $program->getStart()->format('N')}
189189
{_common.day.$startDay}
190190
{$program->getStart()|date:"j. n. G:i"}
191191
</td>
192-
<td class="text-right">
192+
<td class="text-end">
193193
{var $endDay = $program->getEnd()->format('N')}
194194
{_common.day.$endDay}
195195
{$program->getEnd()|date:"j. n. G:i"}

‎app/AdminModule/Presenters/templates/includes/main_menu.latte‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<nav class="navbar navbar-expand-sm navbar-dark fixed-top bg-dark" style="min-width: 1200px;">
33
<a class="navbar-brand" href="{plink :Web:Page:default}">{_admin.common.heading, [seminar_name => $seminarName]}</a>
44

5-
<ul class="navbar-nav mr-auto">
5+
<ul class="navbar-nav me-auto">
66
<li n:class="nav-item, $presenter->isLinkCurrent(':Admin:Dashboard:*') ? active">
77
<a class="nav-link" href="{plink :Admin:Dashboard:default}">{_admin.menu.dashboard}</a>
88
</li>
@@ -58,16 +58,16 @@
5858
</li>
5959
</ul>
6060

61-
<ul class="navbar-nav ml-auto">
62-
<li class="nav-item mr-1">
61+
<ul class="navbar-nav ms-auto">
62+
<li class="nav-item me-1">
6363
<div class="navbar-btn">
6464
<a class="btn btn-light btn-sm" href="https://napoveda.skaut.cz/srs" target="_blank">
6565
<i class="fa fa-question-circle"></i> {_admin.menu.help}
6666
</a>
6767
</div>
6868
</li>
6969

70-
<li class="nav-item dropdown mr-1 ml-1" id="role-menu">
70+
<li class="nav-item dropdown me-1 ms-1" id="role-menu">
7171
<div class="navbar-btn">
7272
<button class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown">
7373
<span id="role-menu-text">
@@ -84,7 +84,7 @@
8484
</div>
8585
</li>
8686

87-
<li class="nav-item dropdown ml-1" id="user-menu">
87+
<li class="nav-item dropdown ms-1" id="user-menu">
8888
<div class="navbar-btn">
8989
<button class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown">
9090
<span class="fa fa-user"></span>

0 commit comments

Comments
 (0)