diff --git a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
index 72034180f17fa1dce59c670b6fa9a55d0aabde96..3558c6b75feb040585241d69ac15eadc18d0eb03 100644
--- a/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
+++ b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
@@ -22,7 +22,7 @@
}
?>
<li class="facet">
- <a class="remove-filter" href="<?=$removeLink ?>" title="<?=$this->transEsc('clear_tag_filter') ?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $filter['displayText']])?>">
+ <a class="remove-filter" href="<?=$removeLink ?>" title="<?=$this->transEscAttr('clear_tag_filter') ?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $filter['displayText']])?>">
<span class="sr-only"><?=$this->transEsc('clear_tag_filter') ?></span>
<span class="text">
<?php if ($filter['operator'] == 'NOT'): ?><?=$this->transEsc('NOT') ?><?php endif; ?>
diff --git a/themes/finc-accessibility/templates/RecordTab/similaritemscarousel.phtml b/themes/finc-accessibility/templates/RecordTab/similaritemscarousel.phtml
index 1eb9630e71fcfa13ba6f3388c7d8eec10d282a73..121f9e57d368ae47fcb9c9b1a1d148ce7165f696 100644
--- a/themes/finc-accessibility/templates/RecordTab/similaritemscarousel.phtml
+++ b/themes/finc-accessibility/templates/RecordTab/similaritemscarousel.phtml
@@ -45,11 +45,11 @@
</div>
<!-- Controls -->
- <a class="left carousel-control" href="#similar-items-carousel" role="button" data-slide="prev" aria-label="<?=$this->transEsc('Prev') ?>">
- <span class="fa fa-chevron-left glyphicon-chevron-left" title="<?=$this->transEsc('Prev') ?>"></span>
+ <a class="left carousel-control" href="#similar-items-carousel" role="button" data-slide="prev" aria-label="<?=$this->transEscAttr('Prev') ?>">
+ <span class="fa fa-chevron-left glyphicon-chevron-left" title="<?=$this->transEscAttr('Prev') ?>"></span>
</a>
- <a class="right carousel-control" href="#similar-items-carousel" role="button" data-slide="next" aria-label="<?=$this->transEsc('Next') ?>">
- <span class="fa fa-chevron-right glyphicon-chevron-right" title="<?=$this->transEsc('Next') ?>"></span>
+ <a class="right carousel-control" href="#similar-items-carousel" role="button" data-slide="next" aria-label="<?=$this->transEscAttr('Next') ?>">
+ <span class="fa fa-chevron-right glyphicon-chevron-right" title="<?=$this->transEscAttr('Next') ?>"></span>
</a>
</div>
<?php else: ?>
diff --git a/themes/finc-accessibility/templates/channels/channelList.phtml b/themes/finc-accessibility/templates/channels/channelList.phtml
index 468f950fce5db275ea75cc4e665b8ab3c3cb2289..3b991400254981fd2f429a672a15fa663f1fdf4c 100644
--- a/themes/finc-accessibility/templates/channels/channelList.phtml
+++ b/themes/finc-accessibility/templates/channels/channelList.phtml
@@ -29,8 +29,8 @@
<form action="<?=$this->url('channels-search')?>" class="channel-search form-inline">
<?=$this->transEsc('channel_searchbox_label')?>
<?php /* finc adds 'aria-labels' for accessibility */ ?>
- <input type="text" name="lookfor" class="form-control" value="<?=$this->escapeHtmlAttr($this->lookfor) ?>" aria-label="<?=$this->transEsc('search_terms') ?>"/>
- <input type="submit" value="<?=$this->transEscAttr('Submit')?>" class="btn btn-default" aria-label="<?=$this->transEsc('Submit') ?>" />
+ <input type="text" name="lookfor" class="form-control" value="<?=$this->escapeHtmlAttr($this->lookfor) ?>" aria-label="<?=$this->transEscAttr('search_terms') ?>"/>
+ <input type="submit" value="<?=$this->transEscAttr('Submit')?>" class="btn btn-default" aria-label="<?=$this->transEscAttr('Submit') ?>" />
</form>
<?php endif; ?>
@@ -49,7 +49,7 @@
<div class="channel-add-menu hidden" data-group="<?=$groupId ?>">
<?php /* finc adds 'aria-label' for accessibility */ ?>
<button type="button" class="add-btn btn btn-link"><?=$this->transEsc('channel_add_more') ?></button><!--
- --><button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="<?=$this->transEsc('toggle-dropdown') ?>">
+ --><button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="<?=$this->transEscAttr('toggle-dropdown') ?>">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
diff --git a/themes/finc/templates/ContentBlock/FacetList.phtml b/themes/finc/templates/ContentBlock/FacetList.phtml
index ca2c7cfee10b20db32382174bb4c3409d22acc9f..19de15eeb3f46192137626ccd217fb5a280e6097 100644
--- a/themes/finc/templates/ContentBlock/FacetList.phtml
+++ b/themes/finc/templates/ContentBlock/FacetList.phtml
@@ -38,7 +38,7 @@ JS;
data-path="<?=$this->url($basicSearch)?>"
data-exclude="0"
data-operator="AND"
- data-exclude-title="<?=$this->transEsc('exclude_facet')?>"
+ data-exclude-title="<?=$this->transEscAttr('exclude_facet')?>"
data-sort="<?=$sort?>">
</div>
</div>
diff --git a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
index 6ba7488ce3bbce2137b47511aedd458d045a1778..1b33d22c8c191df1daf7ad28cb1fdb3c98443054 100644
--- a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
+++ b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
@@ -47,7 +47,7 @@
class="<?=implode(' ', $classList) ?>"
data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>"
data-count="<?=$this->facet['count'] ?>"
- title="<?php if($this->facet['isApplied']): ?><?=$this->transEsc('applied_filter')?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>"
+ title="<?php if($this->facet['isApplied']): ?><?=$this->transEscAttr('applied_filter')?> - <?=$this->transEscAttr('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>"
data-lightbox-ignore>
<?php endif; ?>
@@ -59,7 +59,7 @@
data-lightbox-ignore
data-title="<?=$this->escapeHtmlAttr($this->facet['displayText']) ?>"
data-count="<?=$this->facet['count'] ?>"
- title="<?php if($this->facet['isApplied']): ?><?=$this->transEsc('applied_filter')?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?> <?=$this->escapeHtmlAttr($this->facet['displayText']) ?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>">
+ title="<?php if($this->facet['isApplied']): ?><?=$this->transEscAttr('applied_filter')?> - <?=$this->transEscAttr('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?> <?=$this->escapeHtmlAttr($this->facet['displayText']) ?><?php else: ?><?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?><?php endif;?>">
<?=$displayText ?>
<span class="sr-only">
<?php if($this->facet['isApplied']): ?>(<?=$this->transEsc('applied_filter')?> - <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $this->facet['displayText']])?> <?=$this->escapeHtmlAttr($this->facet['displayText']) ?>)<?php else: ?>(<?=$this->transEsc('page_reload_on_select_hint', ['%%filter_name%%' => $this->facet['displayText']])?>)<?php endif;?>
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml
index 0e5bb5d2d2cf8a9ce46189b00c93b86def5de253..c5530b2937d75ea793271cd8e4e95bb593ba085a 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/collection-record.phtml
@@ -11,7 +11,7 @@
<table class="table table-striped table-resp-data">
<caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
<?php foreach ($fields as $current): ?>
- <tr><th><?=$this->transEsc($current['label'])?>:</th><td data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr>
+ <tr><th><?=$this->transEsc($current['label'])?>:</th><td data-title="<?= $this->transEscAttr($current['label']) ?>:"><?=$current['value']?></td></tr>
<?php endforeach; ?>
</table>
<?php endif; ?>
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
index 02ac33162dff60461292fa05f8a912f6f76c57eb..5047db5ac874ef36f95b2b7af1396d8875d2e4b2 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/cover.phtml
@@ -25,7 +25,7 @@
</script>
<?php endif; ?>
<?php elseif ($cover === false): ?>
- <img src="<?=$this->url('cover-unavailable')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="nocover" alt="<?=$this->transEsc('No Cover Image')?>" aria-hidden="true" tabindex="-1" />
+ <img src="<?=$this->url('cover-unavailable')?>" <?php if ($linkPreview): ?>data-linkpreview="true" <?php endif; ?>class="nocover" alt="<?=$this->transEscAttr('No Cover Image')?>" aria-hidden="true" tabindex="-1" />
<?php else: ?>
<?php /* load cover by ajax */ ?>
<div id="<?=$coverId?>" class="ajaxcover">
@@ -39,8 +39,8 @@
loadCoverByElement(
{
recordId:'<?=$this->escapeHtmlAttr($driver->getUniqueID())?>',
- alt:'<?=$this->transEsc('Cover Image')?> <?=$this->transEsc("of")?> <?=$title?>',
- ariaLabel:'<?=$this->transEsc("Link-to")?> <?=$this->transEsc('Cover Image')?> <?=$this->transEsc("of")?> <?=$title?>',
+ alt:'<?=$this->transEscAttr('Cover Image')?> <?=$this->transEscAttr("of")?> <?=$title?>',
+ ariaLabel:'<?=$this->transEscAttr("Link-to")?> <?=$this->transEscAttr('Cover Image')?> <?=$this->transEscAttr("of")?> <?=$title?>',
size:'<?=$this->escapeHtmlAttr($size)?>',
source:'<?=$this->escapeHtmlAttr($driver->getSourceIdentifier())?>'
},
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
index 9107567f38bb821fdf7781c993ac22349d191002..a408c7ff4d7b3285f3a9b5e03a847e9bdbbf7bb1 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml
@@ -221,7 +221,7 @@
<i class="fa fa-fw fa-edit" aria-hidden="true"></i>
<a href="<?=$this->url('myresearch-edit')?>?id=<?=urlencode($id)?>&source=<?=urlencode($source)?><?php if (null !== $list_id):?>&list_id=<?=urlencode($list_id)?><?php endif; ?>" class="edit tool"
<?php /* finc: add aria-label #17993 */ ?>
- aria-label="<?=$this->transEsc('Edit').': '.$this->record($this->driver)->getTitleHtml()?>"><?=$this->transEsc('Edit')?></a><br/>
+ aria-label="<?=$this->transEscAttr('Edit').': '.$this->record($this->driver)->getTitleHtml()?>"><?=$this->transEsc('Edit')?></a><br/>
<?php /* Use a different delete URL if we're removing from a specific list or the overall favorites: */
$deleteUrl = null === $list_id
? $this->url('myresearch-favorites')
@@ -235,13 +235,13 @@
<div class="dropdown">
<i class="fa fa-fw fa-trash-o" aria-hidden="true"></i> <a class="dropdown-toggle del-button" id="<?=$dLabel ?>" role="button" data-toggle="dropdown" href="<?=$deleteUrlGet ?>"
<?php /* finc: add aria-label #17993 */ ?>
- aria-label="<?=$this->transEsc('Delete').': '.$this->record($this->driver)->getTitleHtml()?>">
+ aria-label="<?=$this->transEscAttr('Delete').': '.$this->record($this->driver)->getTitleHtml()?>">
<?=$this->transEsc('Delete') ?>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="<?= $dLabel ?>">
<li role="none">
<?php /* #17711 give user feedback and dont reload page after deleting */ ?>
- <a role="menuitem" href="javascript:document.getElementById('<?=$dLabel?>').focus();" title="<?= $this->transEsc('confirm_delete_brief') ?>" onClick="
+ <a role="menuitem" href="javascript:document.getElementById('<?=$dLabel?>').focus();" title="<?= $this->transEscAttr('confirm_delete_brief') ?>" onClick="
let next = $(this).closest('.result.ajaxItem').next('.result.ajaxItem').find('.del-button');
if (next.length === 0) {
next = $('[id^=delete_list_items_]').first();
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler-myresearch.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler-myresearch.phtml
index c185ad9f4c1002ef73e9729f58209e1cbb5693ab..5ef5922aac8213aae1cc360f1177bf1c60fdd726 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler-myresearch.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler-myresearch.phtml
@@ -1,7 +1,7 @@
<!-- finc: RecordDriver - DefaultRecord - offcanvas-toggler-myresearch -->
<?php ?>
<span class="offcanvas-toggler">
- <a class="search-filter-toggle btn btn-primary visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
+ <a class="search-filter-toggle btn btn-primary visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEscAttr('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</a>
</span>
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler.phtml
index bd8ba5bf89242ef3e8d353c2b6bb3218df06f3b6..36541df8db1c476d629552cfcd75d27075e83952 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/offcanvas-toggler.phtml
@@ -1,7 +1,7 @@
<!-- finc: RecordDriver - DefaultRecord - offcanvas-toggler -->
<?php ?>
<span class="offcanvas-toggler">
- <a class="search-filter-toggle btn btn-primary visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEsc('sidebar_expand')?>">
+ <a class="search-filter-toggle btn btn-primary visible-xs" href="#myresearch-sidebar" data-toggle="offcanvas" aria-label="<?=$this->transEscAttr('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-record-view')?>
</a>
</span>
diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
index 52d1214bdeac09051775ab904593d6771f3d268f..3baac2a354b5caba9bf3c565b6d1a92231d0af1d 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml
@@ -20,7 +20,7 @@
<?php /* Display qrcode if appropriate: */
/* finc removes span + class for accessibility */ ?>
<?php if ($QRCode): ?>
- <br/><img alt="<?= $this->transEsc('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
+ <br/><img alt="<?= $this->transEscAttr('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
@@ -80,7 +80,7 @@
<?php else: ?>
<tr>
<th><?= $this->transEsc($current['label']) ?>:</th>
- <td lang="" data-title="<?= $this->transEsc($current['label']) ?>:"><?= $current['value'] ?></td>
+ <td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:"><?= $current['value'] ?></td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
diff --git a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
index 39b7d0068a9ff6e7f4fa77cf9d6dc0a104514250..adcb20c96f94d7e54adfcb107cb45acbecb03dcf 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
@@ -190,7 +190,7 @@ if ($cover):
<i class="fa fa-fw fa-qrcode" aria-hidden="true"></i><a href="<?=$this->escapeHtmlAttr($QRCode);?>" class="qrcodeLink"><?=$this->transEsc('qrcode_show')?></a>
<span class="qrcode hidden">
<script class="qrCodeImgTag">
- <img alt="<?=$this->transEsc('QR Code')?>" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
+ <img alt="<?=$this->transEscAttr('QR Code')?>" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
</script>
</span>
<br/>
@@ -221,7 +221,7 @@ if ($cover):
<?php foreach ($trees as $hierarchyID => $hierarchyTitle): ?>
<div class="hierarchyTreeLink">
<input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId"/>
- <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEsc('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
+ <a class="hierarchyTreeLinkText result-link-label" data-lightbox href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>#tabnav" title="<?=$this->transEscAttr('hierarchy_tree')?>" data-lightbox-href="<?=$this->recordLink()->getTabUrl($this->driver, 'AjaxTab')?>?hierarchy=<?=urlencode($hierarchyID)?>" data-lightbox-post="tab=hierarchytree">
<i class="result-link-icon fa fa-fw fa-sitemap" aria-hidden="true"></i><span class="hidden-xs hidden-sm"><?=$this->transEsc('hierarchy_view_context')?></span><?php if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><?php endif; ?>
</a>
</div>
diff --git a/themes/finc/templates/RecordDriver/SolrLido/core.phtml b/themes/finc/templates/RecordDriver/SolrLido/core.phtml
index 5cf36cab4d6caf539635d65fd955639d4366a934..ab181191572801b019087fad8270862513389a2b 100644
--- a/themes/finc/templates/RecordDriver/SolrLido/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrLido/core.phtml
@@ -44,7 +44,7 @@
<?php /* Display qrcode if appropriate: */
/* finc removes span + class for accessibility */ ?>
<?php if ($QRCode): ?>
- <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
+ <br/><img alt="<?=$this->transEscAttr('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
@@ -97,7 +97,7 @@
<?php else: ?>
<tr>
<th><?=$this->transEsc($current['label'])?>:</th>
- <td lang="" data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td>
+ <td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:"><?=$current['value']?></td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
index 2f58f7f1d328e0c12dbb78e377967f28e4205987..945ec24c030c3ca6f7d32f1371edfb348cd3092c 100644
--- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml
@@ -20,7 +20,7 @@
<?php /* Display qrcode if appropriate: */
/* finc removes span + class for accessibility */ ?>
<?php if ($QRCode): ?>
- <br/><img alt="<?= $this->transEsc('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
+ <br/><img alt="<?= $this->transEscAttr('QR Code') ?>" class="qrcode" src="<?= $this->escapeHtmlAttr($QRCode); ?>"/>
<?php endif; ?>
<?php // if you have a preview tab but want to move or remove the preview link
@@ -72,14 +72,14 @@
?>
<?php if (!empty($coreFields)): ?>
<?php /* finc adds code for responsive data table here - CK */ ?>
- <table class="table table-striped table-resp-data" aria-label="<?=$this->transEsc('Bibliographic Details')?>">
+ <table class="table table-striped table-resp-data" aria-label="<?=$this->transEscAttr('Bibliographic Details')?>">
<?php foreach ($coreFields as $current): ?>
<?php if ($current['label'] == null): ?>
<?= $current['value'] ?>
<?php else: ?>
<tr>
<th><?= $this->transEsc($current['label']) ?>:</th>
- <td lang="" data-title="<?= $this->transEsc($current['label']) ?>:"><?= $current['value'] ?></td>
+ <td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:"><?= $current['value'] ?></td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
diff --git a/themes/finc/templates/RecordTab/description.phtml b/themes/finc/templates/RecordTab/description.phtml
index 92b169d11fe8efa88d93f763aa6a17fbb07cbd43..0b9a8819d037c5240440c9859ad905c7a20ff184 100644
--- a/themes/finc/templates/RecordTab/description.phtml
+++ b/themes/finc/templates/RecordTab/description.phtml
@@ -19,7 +19,7 @@
<?php /* finc: handel missing label #17434 */ ?>
<?php if (!empty($current['label'])): ?>
<th><?=$this->transEsc($current['label'])?>:</th>
- <td lang="" data-title="<?= $this->transEsc($current['label']) ?>:">
+ <td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:">
<?php else: ?>
<td lang="" colspan="2">
<?php endif; ?>
diff --git a/themes/finc/templates/RecordTab/descriptionlido.phtml b/themes/finc/templates/RecordTab/descriptionlido.phtml
index cb5b32723e52ac9487fbef40537dca3dccdb31ea..e293fcebfda708dcd28975978bd7f643627da8c4 100644
--- a/themes/finc/templates/RecordTab/descriptionlido.phtml
+++ b/themes/finc/templates/RecordTab/descriptionlido.phtml
@@ -14,7 +14,7 @@ $mainFields = $formatter->getData($driver, $formatter->getDefaults('description-
<caption><span class="sr-only"><?= $this->transEsc('Description') ?></span></caption>
<?php if (!empty($mainFields)): ?>
<?php foreach ($mainFields as $current): ?>
- <tr><th><?=$this->transEsc($current['label'])?>:</th><td lang="" data-title="<?= $this->transEsc($current['label']) ?>:"><?=$current['value']?></td></tr>
+ <tr><th><?=$this->transEsc($current['label'])?>:</th><td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:"><?=$current['value']?></td></tr>
<?php endforeach; ?>
<?php else: ?>
<tr><td><?=$this->transEsc('no_description')?></td></tr>
diff --git a/themes/finc/templates/RecordTab/holdingsils/standard.phtml b/themes/finc/templates/RecordTab/holdingsils/standard.phtml
index 3c1b35ad1800e29b394f5285d4f9e7837a094e41..7d18ab2c9bbfe6c904d2f427164a3a1ba91f0117 100644
--- a/themes/finc/templates/RecordTab/holdingsils/standard.phtml
+++ b/themes/finc/templates/RecordTab/holdingsils/standard.phtml
@@ -16,7 +16,7 @@
<?php endif; ?>
</th>
*/ ?>
- <td data-title="<?= $this->transEsc('Availability') ?>" class="availability-column">
+ <td data-title="<?= $this->transEscAttr('Availability') ?>" class="availability-column">
<?php if ($holding['reserve'] == "Y"): ?>
<link property="availability" href="http://schema.org/InStoreOnly"/>
<?=$this->transEsc("On Reserve - Ask at Circulation Desk")?><br><br>
@@ -63,7 +63,7 @@
<?=$this->relais()->renderButtonIfActive($this->driver ?? null)?>
<?php endif; ?>
</td>
- <td data-title="<?= $this->transEsc('Notes') ?>" class="notes">
+ <td data-title="<?= $this->transEscAttr('Notes') ?>" class="notes">
<?php if (isset($holding['item_notes'])): ?>
<div class="item-notes">
<?php /* finc: change b with strong #14450 */ ?>
diff --git a/themes/finc/templates/RecordTab/holdingsworldcat.phtml b/themes/finc/templates/RecordTab/holdingsworldcat.phtml
index 486f3a0c562894050fb4fa9b2171bfedecd66f8a..54b4209bfec2897e97f9ff05e1eb291cde150b8a 100644
--- a/themes/finc/templates/RecordTab/holdingsworldcat.phtml
+++ b/themes/finc/templates/RecordTab/holdingsworldcat.phtml
@@ -25,7 +25,7 @@
<?php if (isset($holding->holdingSimple->copiesSummary->copiesCount)): ?>
<tr>
<th><?=$this->transEsc('Copies')?>: </th>
- <td data-title="<?= $this->transEsc('Copies') ?>:"><?=$this->escapeHtml($holding->holdingSimple->copiesSummary->copiesCount)?></td>
+ <td data-title="<?= $this->transEscAttr('Copies') ?>:"><?=$this->escapeHtml($holding->holdingSimple->copiesSummary->copiesCount)?></td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
diff --git a/themes/finc/templates/RecordTab/topics.phtml b/themes/finc/templates/RecordTab/topics.phtml
index c6e063a786c23ab408c5809e5961d5623fe21c9d..f44ad4f45c2269c1d6341f3e24d7e0bc08732534 100644
--- a/themes/finc/templates/RecordTab/topics.phtml
+++ b/themes/finc/templates/RecordTab/topics.phtml
@@ -18,7 +18,7 @@
<tr>
<?php if (!empty($current['label'])): ?>
<th><?=$this->transEsc($current['label'])?>:</th>
- <td lang="" data-title="<?= $this->transEsc($current['label']) ?>:">
+ <td lang="" data-title="<?= $this->transEscAttr($current['label']) ?>:">
<?php else: ?>
<td lang="" colspan="2">
<?php endif; ?>
diff --git a/themes/finc/templates/ajax/status-full.phtml b/themes/finc/templates/ajax/status-full.phtml
index 3aadb05d168ec9499c8ec14f4b25ae7933d84707..f85a1b17e222a5f8424e021a986001ba9eb54093 100644
--- a/themes/finc/templates/ajax/status-full.phtml
+++ b/themes/finc/templates/ajax/status-full.phtml
@@ -9,7 +9,7 @@
<?php $i = 0; foreach ($this->statusItems as $item): ?>
<?php if (++$i == 5) break; // Show no more than 5 items ?>
<tr>
- <td data-title="<?= $this->transEsc('Location') ?>:" class="fullLocation">
+ <td data-title="<?= $this->transEscAttr('Location') ?>:" class="fullLocation">
<?php $locationText = $this->transEscWithPrefix('location_', $item['location']); ?>
<?php if ($item['locationhref'] ?? false): ?>
<a href="<?=$item['locationhref']?>" target="_blank"><?=$locationText?></a>
@@ -17,14 +17,14 @@
<?=$locationText?>
<?php endif; ?>
</td>
- <td data-title="<?= $this->transEsc('Call Number') ?>:" class="fullCallnumber">
+ <td data-title="<?= $this->transEscAttr('Call Number') ?>:" class="fullCallnumber">
<?php if ($this->callnumberHandler): ?>
<a href="<?=$this->url('alphabrowse-home') ?>?source=<?=$this->escapeHtmlAttr($this->callnumberHandler) ?>&from=<?=$this->escapeHtmlAttr($item['callnumber']) ?>"><?=$this->escapeHtml($item['callnumber'])?></a>
<?php else: ?>
<?=$this->escapeHtml($item['callnumber'])?>
<?php endif; ?>
</td>
- <td data-title="<?= $this->transEsc('Status') ?>:" class="fullAvailability">
+ <td data-title="<?= $this->transEscAttr('Status') ?>:" class="fullAvailability">
<?php if ($item['use_unknown_message'] ?? false): ?>
<span><?=$this->transEsc("status_unknown_message")?></span>
<?php elseif ($item['availability']): ?>
diff --git a/themes/finc/templates/amsl/sources-list.phtml b/themes/finc/templates/amsl/sources-list.phtml
index 71df9b3d25f2fc5278aed1d88d765300970246d1..e5879030f8c2750dd96c701f69e814ab4523bf77 100644
--- a/themes/finc/templates/amsl/sources-list.phtml
+++ b/themes/finc/templates/amsl/sources-list.phtml
@@ -24,7 +24,7 @@ $this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('L
<form>
<div class="form-group">
<label for="sources-filter"><?=$this->transEsc('Filter list')?></label>
- <input type="text" id="sources-filter" class="form-control" placeholder="<?=$this->transEsc('Please enter filter term')?>">
+ <input type="text" id="sources-filter" class="form-control" placeholder="<?=$this->transEscAttr('Please enter filter term')?>">
</div>
</form>
@@ -49,19 +49,19 @@ $this->layout()->breadcrumbs .= '</li> <li class="active">' . $this->transEsc('L
<li>
<?php if (!empty($collection['href'])): ?>
<a
- title="<?=$this->transEsc("Search For") . ' ' . $this->escapeHtml($sub_label)?>"
+ title="<?=$this->transEscAttr("Search For") . ' ' . $this->escapeHtml($sub_label)?>"
href="<?=$this->escapeHtml($collection['href'])?>"
target="_blank"
>
<?=$sub_label?>
</a>
<?php else: ?>
- <div tabindex="0" aria-label="<?=$this->transEsc("Source Title")?>">
+ <div tabindex="0" aria-label="<?=$this->transEscAttr("Source Title")?>">
<?=$sub_label?>
</div>
<?php endif; ?>
<?php if (!empty($collection['desc'])): ?>
- <div class="margin-t" tabindex="0" aria-label="<?=$this->transEsc("Description")?>">
+ <div class="margin-t" tabindex="0" aria-label="<?=$this->transEscAttr("Description")?>">
<i class="fa fa-info-circle" aria-hidden="true"></i>
<?=$collection['desc']?>
</div>
diff --git a/themes/finc/templates/documentdeliveryservice/zform.phtml b/themes/finc/templates/documentdeliveryservice/zform.phtml
index ce3c0daa9ffc6985a74ad55fabae4694ecc9d5bd..185a9fc5ee1e32f0942cf7bb8085be58fc8fd835 100644
--- a/themes/finc/templates/documentdeliveryservice/zform.phtml
+++ b/themes/finc/templates/documentdeliveryservice/zform.phtml
@@ -262,7 +262,7 @@ $formElementErrors->setTranslatorTextDomain('DDS');
<div class="input-department subito-pg">
<div><?=$this->transEsc("Bei eventuellen Rückfragen wenden Sie sich bitte an die Abteilung Fernleihe der Medizin")?>:</div>
<div><?=$this->transEsc("Phone")?>: +49 (0)341 - 97 14014</div>
- <div><?=$this->transEsc("Email")?>: <a href="mailto:zbmed.fernleihe@medizin.uni-leipzig.de?subject=<?=$this->transEsc("Dokumentenlieferdienst")?>">zbmed.fernleihe@medizin.uni-leipzig.de</a>
+ <div><?=$this->transEsc("Email")?>: <a href="mailto:zbmed.fernleihe@medizin.uni-leipzig.de?subject=<?=$this->transEscAttr("Dokumentenlieferdienst")?>">zbmed.fernleihe@medizin.uni-leipzig.de</a>
</div>
</div>
<div class="subito-pg">
diff --git a/themes/finc/templates/header.phtml b/themes/finc/templates/header.phtml
index bd33cef76b89153af2c422eddb5453aee23295bb..e6ba0f2f2d3a823d6b58eb71225d8c374726a022 100644
--- a/themes/finc/templates/header.phtml
+++ b/themes/finc/templates/header.phtml
@@ -10,14 +10,14 @@
<?php /* This element only holds the mobile toggler and the navbar-brand/library name - CK */ ?>
<div class="navbar-header">
<?php /* mobile navigation toggler - CK */ ?>
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#header-collapse" aria-label="<?=$this->transEsc("mobile_toggle_navigation_text")?>">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#header-collapse" aria-label="<?=$this->transEscAttr("mobile_toggle_navigation_text")?>">
<i class="fa fa-bars" aria-hidden="true"></i>
</button>
<?php /* remove h1 from header and use h1 in content area instead - CK*/ ?>
- <a class="navbar-brand lang-<?=$this->layout()->userLang?>" href="<?=$this->url('home')?>" aria-label="<?=$this->transEsc('Home')?>">
+ <a class="navbar-brand lang-<?=$this->layout()->userLang?>" href="<?=$this->url('home')?>" aria-label="<?=$this->transEscAttr('Home')?>">
<?php /* Custom finc header - make sure that one variant of Library name is readable on any device - CK*/ ?>
<span class="hidden-sm-up"><?=$this->transEsc("LibraryName")?></span>
- <img src="<?=$this->imageLink('headerlogo.png')?>" class="hidden-xs" alt="Logo <?=$this->transEsc('LibraryName')?>" aria-hidden="true">
+ <img src="<?=$this->imageLink('headerlogo.png')?>" class="hidden-xs" alt="Logo <?=$this->transEscAttr('LibraryName')?>" aria-hidden="true">
<?php /* Custom finc header - END */ ?>
</a>
</div>
@@ -30,17 +30,17 @@
?>
<?php /* finc: class 'btn' never showed up in BS, so it probably was added for a reason to the following a-elements in #13547 */ ?>
<?php /* finc: element 'span' never showed up in BS, so it probably was added for a reason to the following elements in #9844 */ ?>
- <nav aria-label="<?=$this->transEsc('main_navigation')?>">
+ <nav aria-label="<?=$this->transEscAttr('main_navigation')?>">
<ul class="nav navbar-nav navbar-right flip">
<?php if ($this->feedback()->tabEnabled()): ?>
<li>
<?php /* finc: BARF bookbag, #1999 */?>
- <a id="feedbackLink" data-lightbox href="<?=$this->url('feedback-home')?>" class="btn" aria-label="<?=$this->transEsc("Feedback")?>"> <i class="fa fa-envelope" aria-hidden="true"></i></a>
+ <a id="feedbackLink" data-lightbox href="<?=$this->url('feedback-home')?>" class="btn" aria-label="<?=$this->transEscAttr("Feedback")?>"> <i class="fa fa-envelope" aria-hidden="true"></i></a>
</li>
<?php endif; ?>
<?php $cart = $this->cart(); if ($cart->isActive()): ?>
<li id="cartSummary">
- <a id="cartItems" class="btn" data-lightbox title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>">
+ <a id="cartItems" class="btn" data-lightbox title="<?=$this->transEscAttr('View Book Bag')?>" href="<?=$this->url('cart-home')?>">
<i class="fa fa-clipboard" aria-hidden="true"></i>
<span role="status">
<span class="sr-only"><?=$this->transEsc('Book Bag')?>:</span> <strong><?=count($cart->getItems())?></strong> <span class="cart-label"><?=$this->transEsc('items')?></span>
diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml
index 8438e27dd6d2e1ac1c105999c8e30dc7d295413f..1fa8f7284374bf5ef2b148730294a0cdae68372d 100644
--- a/themes/finc/templates/layout/layout.phtml
+++ b/themes/finc/templates/layout/layout.phtml
@@ -207,7 +207,7 @@ if (!isset($this->layout()->searchbox)) {
<?php endif; ?>
<?php /* Add landmark role to avoid 'all content must be inside landmarks error', CK */ ?>
- <div role="navigation" aria-label="<?=$this->transEsc('Skip_navigation_links')?>">
+ <div role="navigation" aria-label="<?=$this->transEscAttr('Skip_navigation_links')?>">
<?php /* Show skip to search link only when page is not "advanced" search, CK */ ?>
<?php if (strtolower($this->layout()->templateName) !== 'advanced'): ?>
<a class="sr-only" href="#searchForm_lookfor"><?=$this->transEsc('Skip to search')?></a>
@@ -232,7 +232,7 @@ if (!isset($this->layout()->searchbox)) {
<?=$this->render('header.phtml')?>
</header>
-<nav class="breadcrumbs" aria-label="<?=$this->transEsc('Breadcrumbs')?>">
+<nav class="breadcrumbs" aria-label="<?=$this->transEscAttr('Breadcrumbs')?>">
<?php /* finc: DON'T use .container here or the breadcrumbs will get a left+right padding - CK */ ?>
<?php if ((!isset($this->layout()->showBreadcrumbs) || $this->layout()->showBreadcrumbs == true)
&& !empty($this->layout()->breadcrumbs)
diff --git a/themes/finc/templates/myresearch/acquisition.phtml b/themes/finc/templates/myresearch/acquisition.phtml
index 838155730d28456202304eed954b050721a47d3e..12941f10fabe5f36ec0e2574908cb1d74d38408a 100644
--- a/themes/finc/templates/myresearch/acquisition.phtml
+++ b/themes/finc/templates/myresearch/acquisition.phtml
@@ -40,7 +40,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
</div>
<div class="form-group">
- <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Submit')?>"/>
+ <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEscAttr('Submit')?>"/>
</div>
<div class="form-group">
diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml
index f69d67322c160a58937634be8dde154c1aa0edec..bddc6202efb3129a7039bcf4f5c976b65ca77dee 100644
--- a/themes/finc/templates/myresearch/checkedout.phtml
+++ b/themes/finc/templates/myresearch/checkedout.phtml
@@ -89,7 +89,7 @@
<?php if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
<?php $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
<label>
- <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_checked_out_renew')?>" />
+ <input class="checkbox-select-item" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEscAttr('select_item_checked_out_renew')?>" />
</label>
<input type="hidden" name="selectAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" />
<input type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" />
diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml
index 10073a15f230b1da314edd69a1628cb951183bb3..09ba8a84b334101f7fec0c2c8ca2537a7dcd9ea1 100644
--- a/themes/finc/templates/myresearch/fines.phtml
+++ b/themes/finc/templates/myresearch/fines.phtml
@@ -78,7 +78,7 @@
<?php for ($row = 0; $row < $rowCount; $row++): ?>
<tr>
<?php foreach ($columns as $column): ?>
- <td data-title="<?=$this->transEsc($column)?>" lang=""><?=$tableData[$column][$row]?></td>
+ <td data-title="<?=$this->transEscAttr($column)?>" lang=""><?=$tableData[$column][$row]?></td>
<?php endforeach; ?>
</tr>
<?php endfor; ?>
diff --git a/themes/finc/templates/myresearch/historicloans.phtml b/themes/finc/templates/myresearch/historicloans.phtml
index fdea2b9b7d420e421784266cf058652878b6f754..259aa9e113d8cff1e815ba82225f66d65d6207ad 100644
--- a/themes/finc/templates/myresearch/historicloans.phtml
+++ b/themes/finc/templates/myresearch/historicloans.phtml
@@ -19,7 +19,7 @@
<?php if (!empty($this->transactions)): ?>
<?php /* finc adds aria-label */ ?>
- <nav class="search-header hidden-print" aria-label="<?=$this->transEsc('aria_search_header')?>">
+ <nav class="search-header hidden-print" aria-label="<?=$this->transEscAttr('aria_search_header')?>">
<?php if ($this->paginator): ?>
<div class="search-stats">
<?php
diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml
index 1f3e8fd31d6698fab2bc45004132eb01021b6c9b..79a1e8e0f511d26b522df518ef1d41bd2ec4ae2b 100644
--- a/themes/finc/templates/myresearch/illrequests.phtml
+++ b/themes/finc/templates/myresearch/illrequests.phtml
@@ -58,7 +58,7 @@
<div class="checkbox">
<input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
<label>
- <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_ill_request_cancel')?>" />
+ <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEscAttr('select_item_ill_request_cancel')?>" />
</label>
</div>
<?php endif; ?>
diff --git a/themes/finc/templates/myresearch/setpin.phtml b/themes/finc/templates/myresearch/setpin.phtml
index 6a0f59723010591b0c9943ecc258a651110181a6..af4506605434308ffeddaa6c857aef4a813bcfc5 100644
--- a/themes/finc/templates/myresearch/setpin.phtml
+++ b/themes/finc/templates/myresearch/setpin.phtml
@@ -50,7 +50,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
</div>
<div class="form-group">
- <input class="btn btn-primary" name="submit" type="submit" value="<?=$this->transEsc('LiberoAccount::change_user_pin')?>"/>
+ <input class="btn btn-primary" name="submit" type="submit" value="<?=$this->transEscAttr('LiberoAccount::change_user_pin')?>"/>
</div>
</form>
<?php endif; ?>
diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
index 86c4cc3cc0f2a3d86de7d9da0b6f97a9a331d3bc..79c3aab525182ab51db74bb9386ec3d86c376b75 100644
--- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
@@ -57,7 +57,7 @@
<div class="checkbox">
<input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
<label class="pull-left flip">
- <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEsc('select_item_storage_retrieval_request_cancel')?>" />
+ <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" aria-describedby="<?=$describedById?>" aria-label="<?=$this->transEscAttr('select_item_storage_retrieval_request_cancel')?>" />
</label>
</div>
<?php endif; ?>
diff --git a/themes/finc/templates/record/emailhold.phtml b/themes/finc/templates/record/emailhold.phtml
index 055704bd267bac7fd6c0c709bb8b3ace456785e6..2041c1a7d596c23ba0fe696dd1be082dc67456f1 100644
--- a/themes/finc/templates/record/emailhold.phtml
+++ b/themes/finc/templates/record/emailhold.phtml
@@ -73,7 +73,7 @@ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink
class="form-control"><?=isset($this->gatheredDetails['comment']) ? $this->escapeHtml($this->gatheredDetails['comment']) : ''?></textarea>
<?php endif; ?>
- <input class="btn btn-primary" type="submit" name="placeEmailHold" role="button" value="<?=$this->transEsc('EmailHold::email_hold_submit_text')?>"/>
+ <input class="btn btn-primary" type="submit" name="placeEmailHold" role="button" value="<?=$this->transEscAttr('EmailHold::email_hold_submit_text')?>"/>
</form>
</div>
diff --git a/themes/finc/templates/record/pdaform.phtml b/themes/finc/templates/record/pdaform.phtml
index 6b09422077c261c0ff45a523db8c12ed5f953b5f..b3150b16d1d3e0d82019010116cac3d3980f2616 100644
--- a/themes/finc/templates/record/pdaform.phtml
+++ b/themes/finc/templates/record/pdaform.phtml
@@ -35,7 +35,7 @@ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink
<span>
<?=$this->captcha()->html($this->useCaptcha)?>
</span>
- <input type="submit" class="btn btn-primary" role="button" name="submit" value="<?=$this->transEsc('Submit')?>"/>
+ <input type="submit" class="btn btn-primary" role="button" name="submit" value="<?=$this->transEscAttr('Submit')?>"/>
<?= $this->externalLink(
$this->interlibraryloan()->getSwbLink($this->driver),
$this->translate('PDA::pda_tab_interlibrary_button'),
diff --git a/themes/finc/templates/record/reporterrorsform.phtml b/themes/finc/templates/record/reporterrorsform.phtml
index 839a618355e145cb04ea9c2667217114804c01f4..dff0a504f48a9f4d9bfad0eb6012235b40148703 100644
--- a/themes/finc/templates/record/reporterrorsform.phtml
+++ b/themes/finc/templates/record/reporterrorsform.phtml
@@ -24,7 +24,7 @@ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink
<textarea id="comment" name="comment" class="form-control" required><?=(!empty($this->comment)) ? $this->comment : ''?></textarea>
</div>
<div class="form-group">
- <input type="submit" class="btn btn-primary" role="button" name="submit" value="<?=$this->transEsc('Send')?>"/>
+ <input type="submit" class="btn btn-primary" role="button" name="submit" value="<?=$this->transEscAttr('Send')?>"/>
</div>
</form>
<?php $script = <<<JS
diff --git a/themes/finc/templates/record/save.phtml b/themes/finc/templates/record/save.phtml
index 3b8f0f5bcb390a768d4c3c92a7de3723d85f757e..a74f3371334ba1aec7e93b4b0718af3e6c34d6aa 100644
--- a/themes/finc/templates/record/save.phtml
+++ b/themes/finc/templates/record/save.phtml
@@ -57,7 +57,7 @@
<textarea class="form-control" id="add_notes" name="notes" rows="3"></textarea>
</div>
<div class="form-group">
- <input class="btn btn-primary" type="submit" value="<?=$this->transEsc('Save') ?>"/>
+ <input class="btn btn-primary" type="submit" value="<?=$this->transEscAttr('Save') ?>"/>
</div>
<?php endif; ?>
</form>
diff --git a/themes/finc/templates/search/filters.phtml b/themes/finc/templates/search/filters.phtml
index b5f61fc369ed2365249fb1bf405a213ffeb0302b..c9e0f82893f13f4a7d36474d25e5857a73e33f94 100644
--- a/themes/finc/templates/search/filters.phtml
+++ b/themes/finc/templates/search/filters.phtml
@@ -94,7 +94,7 @@
? $urlQuery->removeFacet($value['field'], $value['value'], $value['operator'])
: $this->searchMemory()->getEditLink($this->searchClassId, 'removeFacet', $value);
?>
- <a class="search-filter-remove" aria-label="<?=$this->transEsc('clear_tag_filter') ?> – <?=$this->transEsc('page_reload_on_deselect_hint', ['%%filter_name%%' => $value['displayText']])?>"
+ <a class="search-filter-remove" aria-label="<?=$this->transEscAttr('clear_tag_filter') ?> – <?=$this->transEscAttr('page_reload_on_deselect_hint', ['%%filter_name%%' => $value['displayText']])?>"
href="<?=$removeLink?>">
<span class="text">
<?=$this->escapeHtml($value['displayText'])?>
@@ -130,7 +130,7 @@
<?php if ($resetLink && !empty($value)/* && $options->getRetainFilterSetting()*/): ?>
<?php /* finc adds verbose reload warning via aria-label */ ?>
<a class="reset-filters-btn active" href="<?=$resetLink?>"
- aria-label="<?=$this->transEsc('clear_tag_filter') ?> – <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>">
+ aria-label="<?=$this->transEscAttr('clear_tag_filter') ?> – <?=$this->transEscAttr('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>">
<?=$this->transEsc('reset_filters_button')?>
</a>
<?php endif; ?>
diff --git a/themes/finc/templates/search/list-authorfacets.phtml b/themes/finc/templates/search/list-authorfacets.phtml
index 438eacc056e4d064e08d4e3119b2efb4b111345b..6f6535a7e07724c61d86c06d43d0614742dc4185 100644
--- a/themes/finc/templates/search/list-authorfacets.phtml
+++ b/themes/finc/templates/search/list-authorfacets.phtml
@@ -7,8 +7,8 @@
</tr>
<?php foreach ($this->results->getResults() as $record): ?>
<tr>
- <td data-title="<?=$this->transEsc('Author')?>"><a href="<?=$this->url('author-home')?>?author=<?=urlencode($record['value'])?>"><?=$this->escapeHtml($record['value'])?></a></td>
- <td data-title="<?= $this->transEsc('sort_author_relevance') ?>:"><?=$this->escapeHtml($record['count'])?></td>
+ <td data-title="<?=$this->transEscAttr('Author')?>"><a href="<?=$this->url('author-home')?>?author=<?=urlencode($record['value'])?>"><?=$this->escapeHtml($record['value'])?></a></td>
+ <td data-title="<?= $this->transEscAttr('sort_author_relevance') ?>:"><?=$this->escapeHtml($record['count'])?></td>
</tr>
<?php endforeach; ?>
</tbody>
diff --git a/themes/finc/templates/search/searchTabs.phtml b/themes/finc/templates/search/searchTabs.phtml
index 24b1bf1f50ceb59a2a239d820d0a021ac29c2f68..e5d46237e7f3a1936d27dd283ddcb59a95839360 100644
--- a/themes/finc/templates/search/searchTabs.phtml
+++ b/themes/finc/templates/search/searchTabs.phtml
@@ -1,7 +1,7 @@
<!-- finc: search - searchTabs -->
<?php /* finc: check isset($searchTabs) */ ?>
<?php if (isset($searchTabs) && count($searchTabs) > 0): ?>
- <ul class="nav nav-tabs" aria-label="<?=$this->transEsc('Selected')?>">
+ <ul class="nav nav-tabs" aria-label="<?=$this->transEscAttr('Selected')?>">
<?php foreach ($searchTabs as $tab): ?>
<?php if ($this->permission()->allowDisplay($tab['permission'])): ?>
<li<?=$tab['selected'] ? ' class="active"' : ''?>>