Skip to content

Commit 7808d69

Browse files
eebbieebbi
authored
Merge branch 'master' into TMS-1164 
2 parents 737d3bc + ef3462b commit 7808d69

File tree

11 files changed

+133
-18
lines changed

11 files changed

+133
-18
lines changed

‎CHANGELOG.MD‎

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

1010
- TMS-1164: Remove color changing for button hover-styles
1111

12+
## [1.19.0] - 2025-12-17
13+
14+
- TMS-1226: Change focus order on events-search form
15+
16+
## [1.18.0] - 2025-11-09
17+
18+
- TMS-1224: Remove extra breadcrumbs pseudo-element
19+
- TMS-1218: Change artist-archive image height & margin
20+
1221
## [1.17.0] - 2025-11-10
1322

1423
- TMS-1198: Add new image for single artist page

‎assets/styles/overrides/_breadcrumb.scss‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
.breadcrumb{
1+
.breadcrumb {
2+
li + li {
3+
&::before {
4+
display: none !important;
5+
}
6+
}
27

38
&.has-succeeds-separator li + li::before {
49
content: none;

‎assets/styles/views/_archive-artist.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
height: 21.176rem;
1818

1919
@include from($desktop) {
20-
height: 28.235rem;
20+
height: 24.235rem;
2121
}
2222

2323
@include from($fullhd) {
24-
height: 41.765rem;
24+
height: 28.765rem;
2525
}
2626
}
2727

‎lib/ACF/Field/AccentColorField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static function field( string $key = '' ) : ?Field\Select {
3030

3131
try {
3232
$field = ( new Field\Select( $strings['accent_color']['label'] ) )
33-
->set_key( "${key}_accent_color" )
33+
->set_key( "{$key}_accent_color" )
3434
->set_name( 'accent_color' )
3535
->use_ui()
3636
->set_choices( apply_filters( 'tms/theme/accent_colors', [] ) )

‎models/page-orchester.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,28 @@
1111
*/
1212
class PageOrchester extends BaseModel {
1313

14+
/**
15+
* Return translated strings.
16+
*
17+
* @return array[]
18+
*/
19+
public function strings() : array {
20+
return [
21+
'search' => [
22+
'label' => __( 'Search for artist', 'tms-theme-filharmonia' ),
23+
'submit_value' => __( 'Search', 'tms-theme-filharmonia' ),
24+
'input_placeholder' => __( 'Search query', 'tms-theme-filharmonia' ),
25+
],
26+
'terms' => [
27+
'show_all' => __( 'Show All', 'tms-theme-filharmonia' ),
28+
],
29+
'no_results' => __( 'No results', 'tms-theme-filharmonia' ),
30+
'filter' => __( 'Filter', 'tms-theme-filharmonia' ),
31+
'is_concertmaster' => __( 'Principal', 'tms-theme-filharmonia' ),
32+
'is_principal' => __( 'Soundmaster', 'tms-theme-filharmonia' ),
33+
];
34+
}
35+
1436
/**
1537
* Results.
1638
*

‎partials/ui/artist-item.dust‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{?artist}
2-
<div class="column is-6-tablet is-3-desktop mb-6-desktop is-relative has-text-centered">
2+
<div class="column is-6-tablet is-3-desktop mb-6 is-relative has-text-centered">
33
{?image}
4-
<div class="artist-list__image-container image is-3by1 has-width-100 pr-6 pl-6 mb-4">
4+
<div class="artist-list__image-container image is-3by1 has-width-100 pr-6 pl-6 mb-0">
55
<div
66
class="artist-list__image is-absolute has-top-0 has-bottom-0 has-right-0 has-left-0" {@inlinebg id=image size="large" /}></div>
77
</div>

‎partials/ui/breadcrumbs.dust‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<nav class="breadcrumb has-succeeds-separator" aria-label="breadcrumbs">
33
<ul class="breadcrumbs__nav is-relative is-flex m-0 p-0 is-family-primary">
44
{#breadcrumbs}
5-
<li class="{?is_active}is-active{/is_active} {?class}{class}{/class}">
5+
<li class="{?is_active}is-active{/is_active} {?class}{class|attr}{/class}">
66
{?permalink}
7-
<a href="{permalink}" {?is_active}aria-current="page"{/is_active}>
8-
7+
<a href="{permalink|url}" {?is_active}aria-current="page"{/is_active}>
8+
99
{?title}
10-
{title|s}
10+
{title|html}
1111
{/title}
1212

1313
{>"ui/icon" icon="chevron-right" class="icon--small ml-2" /}
1414

1515
</a>
1616
{:else}
1717
<span {?is_active}aria-current="page"{/is_active}>
18-
18+
1919
{?title}
20-
{title|s}
20+
{title|html}
2121
{/title}
2222

2323
</span>

‎partials/ui/search-form.dust‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<form role="search" method="get" class="search-form is-flex is-flex-wrap-wrap is-align-items-center" action="{Header.search_action|attr}">
2+
<label class="mb-2 mb-0-tablet mr-2 is-flex-grow-1">
3+
<input type="search" class="search-form__input has-border-radius-small has-background-light p-3 has-width-100"
4+
aria-labelledby="{search_title|attr}"
5+
value="{search_query|attr}" name="s">
6+
</label>
7+
8+
<button type="submit" class="search-form__button button button--icon {button_class|attr}">
9+
{Strings.s.header.search|html}
10+
{>"ui/icon" icon="search" class="icon--large" /}
11+
</button>
12+
</form>

‎partials/views/page-events-search/form.dust‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<form class="is-relative" action="{form.action|attr}">
2+
<div class="section pt-8 pb-8 {template_classes.search_form|attr}">
3+
<div class="container">
4+
<div class="event-search-form columns is-flex is-multiline is-variable is-3-tablet is-6-desktop">
5+
<div class="column is-12-mobile is-3-tablet is-4-widescreen">
6+
<div class="h6 mb-2">
7+
{form.seach_term_label|html}
8+
</div>
9+
<label for="search-input">
10+
<span class="is-sr-only">{form.seach_term_label|html}</span>
11+
</label>
12+
<input type="text" name="event_search_text" id="search-input" value="{form.search_term|attr}"
13+
class="has-width-100"
14+
autocomplete="off">
15+
</div>
16+
17+
<div class="column is-12-mobile is-7-tablet is-5-widescreen">
18+
<div class="h6 mb-2">
19+
{form.time_frame_label|html}
20+
</div>
21+
<div class="columns is-12-mobile is-mobile is-variable is-1">
22+
<div class="column">
23+
<label for="start-date" class="is-sr-only">
24+
{form.start_date_label|html}
25+
</label>
26+
<span class="is-block">
27+
<duet-date-picker
28+
identifier="start-date"
29+
name="event_search_start_date"
30+
value="{form.form_start_date|attr}"
31+
data-locale="{Header.site_locale|attr}"></duet-date-picker>
32+
</span>
33+
</div>
34+
<div class="column is-narrow">
35+
<span class="line"></span>
36+
</div>
37+
<div class="column">
38+
<label for="end-date" class="is-sr-only">
39+
{form.end_date_label|html}
40+
</label>
41+
<span class="is-block">
42+
<duet-date-picker
43+
identifier="end-date"
44+
name="event_search_end_date"
45+
value="{form.form_end_date|attr}"
46+
data-locale="{Header.site_locale|attr}"></duet-date-picker>
47+
</span>
48+
</div>
49+
</div>
50+
</div>
51+
52+
<div class="column is-12-mobile is-2-tablet is-3-widescreen is-align-self-flex-end is-flex">
53+
<button type="submit" class="button button--icon is-primary ml-auto-desktop">
54+
{Strings.s.header.search|html}
55+
{>"ui/icon" icon="search" class="icon--large" /}
56+
</button>
57+
</div>
58+
59+
<div class="column is-align-self-flex-start is-flex">
60+
<a href="{form.action|url}" class="button button-clear-inputs is-secondary">
61+
{Strings.s.search.clear|html}
62+
</a>
63+
</div>
64+
</div>
65+
</div>
66+
</div>
67+
</form>

‎partials/views/search/search-term-input.dust‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<div class="column is-10 is-offset-1">
55
<div class="search-input-container mb-4 has-text-centered">
66
<label for="search-input" class="is-block h6 mb-4">
7-
{Strings.s.header.search}
7+
{Strings.s.header.search|html}
88
</label>
99

10-
<input type="text" name="s" id="search-input" value="{form.search_term|s}"
10+
<input type="text" name="s" id="search-input" value="{form.search_term|attr}"
1111
class="search__term mr-auto ml-auto has-text-small"
1212
autocomplete="off">
1313

1414
<div class="has-text-centered mt-5">
15-
<button type="submit" class="search-form__button button button--icon ml-2 {template_classes.search_form_button|s}">
16-
{Strings.s.header.search|s}
17-
{>"ui/icon" icon="search" class="icon--medium" /}
15+
<button type="submit" class="search-form__button button button--icon ml-2 {template_classes.search_form_button|attr}">
16+
{Strings.s.header.search|html}
17+
{>"ui/icon" icon="search" class="icon--large" /}
1818
</button>
1919
</div>
2020
</div>

0 commit comments

Comments
 (0)