Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessibility: Alerts the user how many results have been returned on a tree search #10100

Merged
merged 17 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a031e8
Merge pull request #1 from umbraco/v8/contrib
RachBreeze Aug 22, 2020
c708b37
Merge branch 'v8/contrib' of https://github.com/RachBreeze/Umbraco-CM…
Oct 7, 2020
0b49cd0
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Oct 22, 2020
e395a42
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Oct 25, 2020
d988bc6
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Oct 26, 2020
35b9897
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Oct 31, 2020
81d9665
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Nov 19, 2020
5d2e0b5
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Dec 17, 2020
251ea27
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Jan 4, 2021
1186f1b
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Jan 18, 2021
0bade7d
Added support for screeen reader alerts on the embed so that assitive…
Jan 31, 2021
4a8735d
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Feb 13, 2021
f90fb99
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Feb 28, 2021
aec2a86
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
Apr 4, 2021
1e3e5d8
Tree search details the number of search items returned
Apr 4, 2021
2ff6c67
Merge branch 'v8/contrib' into pr/10100
mikecp Apr 6, 2021
a646893
Add French translations
mikecp Apr 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
<div>
<umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>

<ul class="umb-tree">
<li class="root">
<ul class="umb-search-group">
<li class="umb-search-group-item" ng-repeat="result in results">
<div ng-class="{ 'umb-tree-node-checked': result.selected }">
<button type="button"
class="btn-reset umb-search-group-item-link"
ng-class="{ first: $first }"
ng-click="selectResultCallback($event, result)">
<span class="umb-search-group-item-name">
<umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}"
class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}">
</umb-icon>
<span class="umb-search-group-item-name__text">{{ result.name }}</span>
</span>
<small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
</button>
</div>
<umb-empty-state ng-if="results.length === 0" position="{{emptySearchResultPosition}}">
<p role="alert"><localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize></p>
</umb-empty-state>
<p ng-if="results.length === 1" role="alert">1 <localize key="treeSearch_searchResult">item returned</localize></p>
<p ng-if="results.length > 1" role="alert">{{results.length}} <localize key="treeSearch_searchResults">items returned</localize></p>
<ul class="umb-tree">
<li class="root">
<ul class="umb-search-group">
<li class="umb-search-group-item" ng-repeat="result in results">
<div ng-class="{ 'umb-tree-node-checked': result.selected }">
<button type="button"
class="btn-reset umb-search-group-item-link"
ng-class="{ first: $first }"
ng-click="selectResultCallback($event, result)">
<span class="umb-search-group-item-name">
<umb-icon icon="{{result.selected ? 'icon-check' : result.icon}}" class="icon umb-tree-icon sprTree {{result.selected ? 'icon-check' : result.icon}}"></umb-icon>
<span class="umb-search-group-item-name__text">{{ result.name }}</span>
</span>
<small class="search-subtitle" ng-if="result.subTitle">{{ result.subTitle }}</small>
</button>
</div>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</ul>

</div>

Expand Down
4 changes: 4 additions & 0 deletions src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2576,4 +2576,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="viewPublishedContentAcceptButton">View published version</key>
<key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
</area>
<area alias="treeSearch">
<key alias="searchResult">item returned</key>
<key alias="searchResults">items returned</key>
</area>
</language>
4 changes: 4 additions & 0 deletions src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2595,4 +2595,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="viewPublishedContentAcceptButton">View published version</key>
<key alias="viewPublishedContentDeclineButton">Stay in preview mode</key>
</area>
<area alias="treeSearch">
<key alias="searchResult">item returned</key>
<key alias="searchResults">items returned</key>
</area>
</language>
4 changes: 4 additions & 0 deletions src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2371,4 +2371,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
]]>
</key>
</area>
<area alias="treeSearch">
<key alias="searchResult">élément retrouvé</key>
<key alias="searchResults">éléments retrouvés</key>
</area>
</language>