Skip to content

Commit 0bd9797

Browse files
committed
Squashed commit of the following:
commit 05cfe31 Author: Cottser <Cottser@1167326.no-reply.drupal.org> Date: Sun Jun 6 11:43:19 2021 -0400 Issue #3217296 by Cottser, sylus: Search field has hardcoded "Enter the terms you wish to search for." commit c6cea36 Author: Cottser <Cottser@1167326.no-reply.drupal.org> Date: Fri Jun 4 08:22:01 2021 -0400 Issue #3217213 by Cottser: Footer menu should be configurable, or should say "About Government", but is hardcoded to "About this site" commit a46fdaf Author: Cottser <Cottser@1167326.no-reply.drupal.org> Date: Fri Jun 4 08:20:06 2021 -0400 Issue #3217232 by Cottser: Sensible label defaults for brand menu (GCWeb HTML footer) commit bc81577 Author: smulvihill <smulvihill@795442.no-reply.drupal.org> Date: Sun May 30 11:26:29 2021 -0400 Issue #3216067 by smulvih2: GCWeb Fix Footer Classes commit 2bc75fa Author: William Hearn <sylus1984@gmail.com> Date: Wed May 26 21:47:22 2021 -0400 feat(phpcs): One space afer CAST
1 parent d0ea7df commit 0bd9797

10 files changed

+9
-12
lines changed

config/optional/block.block.brand.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ provider: null
1616
plugin: 'system_menu_block:brand'
1717
settings:
1818
id: 'system_menu_block:brand'
19-
label: Brand
19+
label: 'About this site'
2020
provider: system
2121
label_display: visible
2222
level: 1

config/optional/block.block.brand_fr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ provider: null
1616
plugin: 'system_menu_block:brand_fr'
1717
settings:
1818
id: 'system_menu_block:brand_fr'
19-
label: 'Marque du site'
19+
label: 'À propos de ce site'
2020
provider: system
2121
label_display: visible
2222
level: 1

src/Plugin/Process/Search.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class Search extends BootstrapSearch {
2121
public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
2222
$element->setProperty('title_display', 'invisible');
2323
$element->setAttribute('placeholder', $element->getProperty('placeholder', $element->getProperty('title', t('Search'))));
24-
if (!$element->hasProperty('description')) {
25-
$element->setProperty('description', t('Enter the terms you wish to search for.'));
26-
}
2724
if ($complete_form['#form_id'] == 'wxt_search_api_block_form') {
2825
unset($complete_form['form_id']);
2926
unset($complete_form['form_build_id']);

src/Plugin/Setting/Accessibility/SkipNav/SkipLinkSecondaryText.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* id = "wxt_skip_link_secondary_text",
1414
* type = "textfield",
1515
* title = @Translation("Text for the secondary ""skip link"""),
16-
* defaultValue = @Translation("Skip to ""About this site"""),
16+
* defaultValue = @Translation("Skip to ""About government"""),
1717
* description = @Translation("For example: <em>Jump to navigation</em>, <em>Skip to content</em>"),
1818
* groups = {
1919
* "accessibility" = @Translation("Accessibility"),

starterkits/wxt/templates/block/block--footer--gcweb--THEMENAME-footer.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
%}
4444
<nav{{ attributes.addClass(classes) }}>
4545
{{ title_prefix }}
46-
<h2>{{ 'About this site'|t }}</h2>
46+
<h2>{{ 'About government'|t }}</h2>
4747
{{ title_suffix }}
4848
{% block content %}
4949
<ul class="list-unstyled colcount-sm-2 colcount-md-3">

templates/block/block--footer--gcweb--wxt-bootstrap-footer-fr.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
%}
4242
<nav{{ attributes.addClass(classes) }}>
4343
{{ title_prefix }}
44-
<h2>{{ 'About this site'|t }}</h2>
44+
<h2>{{ 'About government'|t }}</h2>
4545
{{ title_suffix }}
4646
{% block content %}
4747
<ul class="list-unstyled colcount-sm-2 colcount-md-3">

templates/block/block--footer--gcweb--wxt-bootstrap-footer.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
%}
4242
<nav{{ attributes.addClass(classes) }}>
4343
{{ title_prefix }}
44-
<h2>{{ 'About this site'|t }}</h2>
44+
<h2>{{ 'About government'|t }}</h2>
4545
{{ title_suffix }}
4646
{% block content %}
4747
<ul class="list-unstyled colcount-sm-2 colcount-md-3">

templates/block/block--footer--gcweb-legacy--wxt-bootstrap-footer-fr.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
%}
4444
<nav role="navigation"{{ attributes.addClass(classes) }}>
4545
{{ title_prefix }}
46-
<h2>{{ 'About this site'|t }}</h2>
46+
<h2>{{ 'About government'|t }}</h2>
4747
{{ title_suffix }}
4848
{% block content %}
4949
{{ content }}

templates/block/block--footer--gcweb-legacy--wxt-bootstrap-footer.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
%}
4444
<nav{{ attributes.addClass(classes) }}>
4545
{{ title_prefix }}
46-
<h2>{{ 'About this site'|t }}</h2>
46+
<h2>{{ 'About government'|t }}</h2>
4747
{{ title_suffix }}
4848
{% block content %}
4949
{{ content }}

templates/block/block--system-menu-block--footer.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#}
3636
<nav aria-labelledby="aboutThisSite"{{ attributes.addClass('row').removeClass('clearfix')|without('role', 'aria-labelledby') }}>
3737
{{ title_prefix }}
38-
<h2{{ title_attributes.setAttribute('id', 'aboutThisSite') }}>{{ 'About this site'|t }}</h2>
38+
<h2{{ title_attributes.setAttribute('id', 'aboutThisSite') }}>{{ 'About government'|t }}</h2>
3939
{{ title_suffix }}
4040
{% block content %}
4141
{{ content }}

0 commit comments

Comments
 (0)