Skip to content

Commit 4d6cc16

Browse files
chrispennyblueo
andauthored
Improve accessibility and implement translatable strings (#13)
Co-authored-by: Bernard Hamlin <948122+blueo@users.noreply.github.com>
1 parent fe5c018 commit 4d6cc16

File tree

3 files changed

+53
-33
lines changed

3 files changed

+53
-33
lines changed
Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,55 @@
1-
<ul class="pagination">
2-
<li class="pagination-item pagination-item--prev">
3-
<% if $NotFirstPage %>
4-
<a title="View previous page of results" class="pagination-prev-link" href="$PrevLink">&laquo;</a>
5-
<% else %>
6-
<span title="View previous page of results" class="pagination-prev-link pagination-prev-link--disabled">&laquo;</span>
7-
<% end_if %>
8-
</li>
1+
<nav aria-label="<%t SilverStripe\Discoverer\Includes\Pagination.PaginationLabel 'Search pagination' %>">
2+
<ul class="pagination">
3+
<li class="pagination-item pagination-item--prev">
4+
<% if $NotFirstPage %>
5+
<a
6+
class="pagination-prev-link"
7+
href="$PrevLink"
8+
{$Attributes}
9+
aria-label="<%t SilverStripe\Discoverer\Includes\Pagination.PreviousPage 'Previous page' %>"
10+
>&laquo;</a>
11+
<% else %>
12+
<a
13+
class="pagination-prev-link pagination-prev-link--disabled"
14+
href="#"
15+
aria-label="<%t SilverStripe\Discoverer\Includes\Pagination.PreviousPageDisabled 'Previous page (not available)' %>"
16+
aria-disabled="true"
17+
>&laquo;</a>
18+
<% end_if %>
19+
</li>
920

10-
<% loop $PaginationSummary(4) %>
11-
<% if $CurrentBool %>
12-
<li class="pagination-item pagination-item--active">
13-
<a title="Viewing page $PageNum of results" class="pagination-link pagination-link--disabled">$PageNum</a>
21+
<% loop $PaginationSummary(4) %>
22+
<li class="pagination-item">
23+
<% if $CurrentBool %>
24+
<a title="Viewing page $PageNum of results"
25+
class="pagination-link pagination-link--disabled"
26+
>$PageNum</a>
27+
<% else %>
28+
<% if $Link %>
29+
<a title="View page $PageNum of results" class="pagination-link" href="$Link">$PageNum</a>
30+
<% else %>
31+
<span class="pagination-link pagination-link--disabled">&hellip;</span>
32+
<% end_if %>
33+
<% end_if %>
1434
</li>
15-
<% else %>
16-
<% if $Link %>
17-
<li class="pagination-item">
18-
<a title="View page $PageNum of results" class="pagination-link" href="$Link">$PageNum</a>
19-
</li>
35+
<% end_loop %>
36+
37+
<li class="pagination-item pagination-item--next">
38+
<% if $NotLastPage %>
39+
<a
40+
class="pagination-next-link"
41+
href="$NextLink"
42+
{$Attributes}
43+
aria-label="<%t SilverStripe\Discoverer\Includes\Pagination.NextPage 'Next page' %>"
44+
>&raquo;</a>
2045
<% else %>
21-
<li class="pagination-item">
22-
<a class="pagination-link pagination-link--disabled">&hellip;</a>
23-
</li>
46+
<a
47+
class="pagination-next-link pagination-next-link--disabled"
48+
href="#"
49+
aria-label="<%t SilverStripe\Discoverer\Includes\Pagination.NextPageDisabled 'Next page (not available)' %>"
50+
aria-disabled="true"
51+
>&raquo;</a>
2452
<% end_if %>
25-
<% end_if %>
26-
<% end_loop %>
27-
28-
<li class="pagination-item pagination-item--next">
29-
<% if $NotLastPage %>
30-
<a title="View next page of results" class="pagination-next-link" href="$NextLink">&raquo;</a>
31-
<% else %>
32-
<span title="View next page of results" class="pagination-next-link pagination-next-link--disabled">&raquo;</span>
33-
<% end_if %>
34-
</li>
35-
</ul>
53+
</li>
54+
</ul>
55+
</nav>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<p class="_summary">Displaying <% if $LastItem > 0 %>$FirstItem<% else %>0<% end_if %> - $LastItem results of $TotalItems</p>
1+
<p class="_summary"><%t SilverStripe\Discoverer\Includes\Summary.Results 'Displaying {first} - {last} results of {total}' first=$FirstItem last=$LastItem total=$TotalItems %></p>

templates/SilverStripe/Discoverer/Service/Results/Results.ss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<% end_if %>
1010
<% end_with %>
1111
<% else %>
12-
<p class="error">No search results.</p>
12+
<p class="error"><%t SilverStripe\Discoverer\Service\Results\Results.NoResults 'No search results.' %></p>
1313
<% end_if %>

0 commit comments

Comments
 (0)