Skip to content

Commit ed5af74

Browse files
authored
Merge branch 'master' into TMS-1260
2 parents 7d33dae + 5bd3bfb commit ed5af74

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

CHANGELOG.MD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88
## [Unreleased]
99

1010
- TMS-1260: Add missing alt-text for enlargened images in image-block
11+
- TMS-1261: Change highlighted articles pill colors
12+
- TMS-1264: Fix Eventz to use endpoint url from env
13+
- TMS-1263: Fix pagination from showing arrow button on last page
1114

1215
## [1.71.3] - 2026-03-16
1316

lib/Constants.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private function define() {
7474
}
7575

7676
if ( ! defined( 'PIRKANMAA_EVENTZ_API_URL' ) ) {
77-
define( 'PIRKANMAA_EVENTZ_API_URL', 'https://backend.ver5.eventz.today/' );
77+
define( 'PIRKANMAA_EVENTZ_API_URL', env( 'PIRKANMAA_EVENTZ_API_URL' ) ?? '' );
7878
}
7979

8080
if ( ! defined( 'PIRKANMAA_EVENTZ_API_KEY' ) ) {

lib/DustPressController.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ protected function alter_pagination_data( $data ) : object {
5757
$data->hellip_end = false;
5858
}
5959

60+
// Remove next_page if already on the last page.
61+
if ( ! empty( $data->on_last_page ) ) {
62+
$data->next_page = null;
63+
}
64+
6065
$data->S->page_aria_label = _x( 'Go to Page', 'pagination', 'tms-theme-base' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
6166
$data->S->next = _x( 'Next', 'pagination', 'tms-theme-base' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
6267
$data->S->prev = _x( 'Previous', 'pagination', 'tms-theme-base' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase

partials/home.dust

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</div>
1414
</div>
1515

16-
{>"views/home/home-highlight" category_link_classes="has-background-primary-invert has-text-primary" /}
16+
{>"views/home/home-highlight" category_link_classes="" /}
1717

1818
{>"views/home/home-filters" /}
1919

partials/ui/pagination.dust

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ul class="pagination is-flex is-flex-wrap-wrap is-flex-direction-row is-justify-content-center">
44
{?prev_page}
55
<li class="arrow arrow-left">
6-
<a class="paginate" href="{page_link}{prev_page}{hash}" data-page="{prev_page}">
6+
<a class="paginate" href="{page_link|url}{prev_page|attr}{hash|attr}" data-page="{prev_page|attr}">
77
{>"ui/icon" icon="chevron-left" class="icon--medium" aria-hidden="true" /}
8-
<span class="is-sr-only">{S.prev}</span>
8+
<span class="is-sr-only">{S.prev|html}</span>
99
</a>
1010
</li>
1111
{/prev_page}
1212
{?hellip_start}
1313
<li class="pagination-item">
14-
<a class="pagination-item__link" href="{page_link}1{hash}" data-page="{first_page}">{first_page}</a>
14+
<a class="pagination-item__link" href="{page_link|url}1{hash|attr}" data-page="{first_page|attr}">{first_page|html}</a>
1515
</li>
1616

1717
<li class="unavailable" aria-disabled="true">
@@ -20,11 +20,11 @@
2020
{/hellip_start}
2121
{#pages}
2222
<li class="pagination-item{?active} is-current unavailable{/active}">
23-
<a class="pagination-item__link{^active} clickable{/active}" href="{page_link}{page}{hash}"
23+
<a class="pagination-item__link{^active} clickable{/active}" href="{page_link|url}{page|attr}{hash|attr}"
2424
{?active}aria-current="true" {/active}
25-
aria-label="{S.page_aria_label|s} {page}"
26-
data-page="{page}">
27-
{page}
25+
aria-label="{S.page_aria_label|attr} {page|attr}"
26+
data-page="{page|attr}">
27+
{page|html}
2828
</a>
2929
</li>
3030
{/pages}
@@ -34,15 +34,15 @@
3434
</li>
3535

3636
<li class="pagination-item">
37-
<a class="pagination-item__link" href="{page_link}{last_page}{hash}" data-page="{last_page}">
38-
{last_page}
37+
<a class="pagination-item__link" href="{page_link|url}{last_page|attr}{hash|attr}" data-page="{last_page|attr}">
38+
{last_page|html}
3939
</a>
4040
</li>
4141
{/hellip_end}
4242
{?next_page}
4343
<li class="arrow arrow-right">
44-
<a class="paginate" href="{page_link}{next_page}{hash}" data-page="{next_page}">
45-
<span class="is-sr-only">{S.next}</span>
44+
<a class="paginate" href="{page_link|url}{next_page|attr}{hash|attr}" data-page="{next_page|attr}">
45+
<span class="is-sr-only">{S.next|html}</span>
4646
{>"ui/icon" icon="chevron-right" class="icon--medium" aria-hidden="true" /}
4747
</a>
4848
</li>

0 commit comments

Comments
 (0)