diff --git a/themes/de_105/templates/Recommend/EbscoResults.phtml b/themes/de_105/templates/Recommend/EbscoResults.phtml index 74aa66f3765a5491a198d9e5904625c288fd6f2c..409f764c0d1180fa898cedeed5d28bafcecc9f74 100644 --- a/themes/de_105/templates/Recommend/EbscoResults.phtml +++ b/themes/de_105/templates/Recommend/EbscoResults.phtml @@ -15,7 +15,7 @@ if (is_array($data['results']) && count($data['results']) > 0): ?> </span> <?= $this->externalLink( $this->escapeHtmlAttr($result['url']), - $this->escapeHtml($this->truncate($this->transEsc('Ebsco::'.$result['database']), 90)) + $this->truncate($this->translate('Ebsco::'.$result['database']), 90) ) ?> </div> <?php endforeach; ?> diff --git a/themes/de_105/templates/RecordDriver/DefaultRecord/list-entry.phtml b/themes/de_105/templates/RecordDriver/DefaultRecord/list-entry.phtml index 3c76254324db490164d3c93d570048fea82e8f4d..9d64f2bdbda7f64a267eee09b4fb2496a67f928d 100644 --- a/themes/de_105/templates/RecordDriver/DefaultRecord/list-entry.phtml +++ b/themes/de_105/templates/RecordDriver/DefaultRecord/list-entry.phtml @@ -165,8 +165,13 @@ if (isset($this->list) && is_object($this->list)) { } if (!$this->driver->isCollection()): foreach ($urls as $current): ?> - <a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>" class="fulltext" target="new"><i class="fa fa-external-link" aria-hidden="true"></i> <?=($current['url'] == $current['desc']) ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])?> - </a> + <?= $this->externalLink( + $this->escapeHtmlAttr($this->proxyUrl($current['url'])), + '<i class="fa fa-external-link" aria-hidden="true"></i>' + . ($current['url'] == $current['desc'] ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])), + ['class' => 'fulltext'], + true + ) ?> <?php endforeach; ?> <?php endif; ?> <?php endif; ?> @@ -184,10 +189,13 @@ if (isset($this->list) && is_object($this->list)) { echo "<a class='format result-isCollection-links-toggle' data-toggle='collapse' href='#result-isCollection-links-" . $this->driver->getUniqueId() . "'>Online</a>"; echo "<div id='result-isCollection-links-" . $this->driver->getUniqueId() . "' class='result-isCollection-links collapse'>"; foreach ($urls as $current): ?> - <a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>" class="fulltext" target="new"> - <i class="fa fa-external-link" aria-hidden="true"></i> - <?=($current['url'] == $current['desc']) ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])?> - </a> + <?= $this->externalLink( + $this->escapeHtmlAttr($this->proxyUrl($current['url'])), + '<i class="fa fa-external-link" aria-hidden="true"></i>' + . ($current['url'] == $current['desc'] ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])), + ['class' => 'fulltext'], + true + ) ?> <br/> <?php endforeach; ?> <?php echo "</div>"; ?> diff --git a/themes/de_105/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/de_105/templates/RecordDriver/DefaultRecord/result-list.phtml index bb9d9f978aef7c1811680a30ab536b2d1a5892a9..9cccc7878a04af83eb80209758b4b430e07c5bde 100644 --- a/themes/de_105/templates/RecordDriver/DefaultRecord/result-list.phtml +++ b/themes/de_105/templates/RecordDriver/DefaultRecord/result-list.phtml @@ -159,10 +159,13 @@ $describedById = $driver->getSourceIdentifier() . '|' . $driver->getUniqueId(); echo "<ul id='result-isCollection-links-".$this->driver->getUniqueId()."' class='result-isCollection-links collapse'>"; foreach ($urls as $current): ?> <li> - <a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>" class="fulltext" target="new"> - <i class="fa fa-external-link" aria-hidden="true"></i> - <?=($current['url'] == $current['desc']) ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])?> - </a> + <?= $this->externalLink( + $this->escapeHtmlAttr($this->proxyUrl($current['url'])), + '<i class="fa fa-external-link" aria-hidden="true"></i>' + . ($current['url'] == $current['desc'] ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])), + ['class' => 'fulltext'], + true + ) ?> </li> <?php endforeach; ?> <?php echo "</ul>"; ?> diff --git a/themes/de_105/templates/RecordDriver/SolrAI/result-list.phtml b/themes/de_105/templates/RecordDriver/SolrAI/result-list.phtml index 4962a0787d1cc452fbbd86c0e60e5be1fdde48c9..772422b4de1af60f5f666e2c1a026fd4b15a7624 100644 --- a/themes/de_105/templates/RecordDriver/SolrAI/result-list.phtml +++ b/themes/de_105/templates/RecordDriver/SolrAI/result-list.phtml @@ -156,10 +156,13 @@ if ($cover): echo "<a class='format result-isCollection-links-toggle' data-toggle='collapse' href='#result-isCollection-links-".$this->driver->getUniqueId()."'>Online</a>"; echo "<div id='result-isCollection-links-".$this->driver->getUniqueId()."' class='result-isCollection-links collapse'>"; foreach ($urls as $current): ?> - <a href="<?=$this->escapeHtmlAttr($this->proxyUrl($current['url']))?>" class="fulltext" target="new"> - <i class="fa fa-external-link" aria-hidden="true"></i> - <?=($current['url'] == $current['desc']) ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])?> - </a> + <?= $this->externalLink( + $this->escapeHtmlAttr($this->proxyUrl($current['url'])), + '<i class="fa fa-external-link" aria-hidden="true"></i>' + . ($current['url'] == $current['desc'] ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])), + ['class' => 'fulltext'], + true + ) ?> <br/> <?php endforeach; ?> <?php echo "</div>"; ?> diff --git a/themes/de_105/templates/RecordTab/holdingsils.phtml b/themes/de_105/templates/RecordTab/holdingsils.phtml index 3c9130ed246f4196730b69d377a061dc35c383e7..63ce8a481cce07c74b63d73af065f818c4abfe07 100644 --- a/themes/de_105/templates/RecordTab/holdingsils.phtml +++ b/themes/de_105/templates/RecordTab/holdingsils.phtml @@ -92,7 +92,7 @@ if (!empty($holdingTitleHold)): ?> <?php if (!empty($urls)): ?> <?php foreach ($urls as $current): ?> <?php /* de_105: show url instead of desc #13980 - VE */ ?> - <?= $this->externalLink($this->escapeHtmlAttr($this->proxyUrl($current['url'])), $this->escapeHtml($current['url'])) ?><br/> + <?= $this->externalLink($this->escapeHtmlAttr($this->proxyUrl($current['url'])), $current['url']) ?><br/> <?php endforeach; ?> <?php endif; ?> <?php /* finc-specific snippet - #9274 - replaces if ($openUrlActive): - CK */ ?> @@ -103,7 +103,7 @@ if (!empty($holdingTitleHold)): ?> <span id="urlsHideable" style="display: none"> <?php foreach ($fallbackUrls as $current): ?> <?php /* de_105: show url instead of desc #13980 - VE */ ?> - <?= $this->externalLink($this->escapeHtmlAttr($this->proxyUrl($current['url'])), $this->escapeHtml($current['url'])) ?><br/> + <?= $this->externalLink($this->escapeHtmlAttr($this->proxyUrl($current['url'])), $current['url']) ?><br/> <?php endforeach; ?> </span> <?php endif; ?> @@ -124,7 +124,7 @@ if (!empty($holdingTitleHold)): ?> <?php $holdingsEmpty = false; ?> <?php /* this next line produces an empty h2 heading in some cases - should be solved more elegantly - Fixme - CK*/ ?> <h2> - <?php $locationText = $this->transEsc('location_' . $holding['location'], [], $holding['location']); ?> + <?php $locationText = $this->translate('location_' . $holding['location'], [], $holding['location']); ?> <?php if (isset($holding['locationhref']) && $holding['locationhref']): ?> <?= $this->externalLink($holding['locationhref'], $locationText) ?> <?php else: ?> diff --git a/themes/de_105/templates/footer.phtml b/themes/de_105/templates/footer.phtml index a0608fc6b5d6c6156c68098f8ad0d07267f0f7e0..a0d417f15d7621b3e02e6b099576f43228f88112 100644 --- a/themes/de_105/templates/footer.phtml +++ b/themes/de_105/templates/footer.phtml @@ -34,10 +34,10 @@ <li><?=$this->externalLink('https://tu-freiberg.de/ub/a-z', $this->transEsc('FAQs')) ?></li> </ul> <ul class='de105-footer-socialmedia'> - <li><?=$this->externalLink('https://blogs.hrz.tu-freiberg.de/ub', '<i class="fa fa-fw fa-wordpress"></i>', ['title' => $this->translate('footer_ubblog')]) ?></li> - <li><?=$this->externalLink('https://facebook.com/unibibfreiberg', '<i class="fa fa-fw fa-facebook"></i>', ['title' => $this->translate('footer_facebook')]) ?></li> - <li><?=$this->externalLink('https://instagram.com/ubfreiberg', '<i class="fa fa-fw fa-instagram"></i>', ['title' => $this->translate('footer_instagram')]) ?></li> - <li><?=$this->externalLink('https://twitter.com/ubfreiberg', '<i class="fa fa-fw fa-twitter"></i>', ['title' => $this->translate('footer_twitter')]) ?></li> + <li><?=$this->externalLink('https://blogs.hrz.tu-freiberg.de/ub', '<i class="fa fa-fw fa-wordpress"></i>', ['title' => $this->translate('footer_ubblog')], true) ?></li> + <li><?=$this->externalLink('https://facebook.com/unibibfreiberg', '<i class="fa fa-fw fa-facebook"></i>', ['title' => $this->translate('footer_facebook')], true) ?></li> + <li><?=$this->externalLink('https://instagram.com/ubfreiberg', '<i class="fa fa-fw fa-instagram"></i>', ['title' => $this->translate('footer_instagram')], true) ?></li> + <li><?=$this->externalLink('https://twitter.com/ubfreiberg', '<i class="fa fa-fw fa-twitter"></i>', ['title' => $this->translate('footer_twitter')], true) ?></li> </ul> </div> </div> @@ -49,8 +49,8 @@ <span> <?= $this->transEsc('Footer-Powered-By-Text') ?> </span> - <?= $this->externalLink('https://vufind.org', '<img src="' . $this->imageLink('vufind_logo.png') . '" alt="' . $this->translate('vufind-logo_alt') . '" aria-hidden="true"/>', ['title' => $this->translate('vufind-logo_title')]) ?> - <?= $this->externalLink('https://finc.info/', '<img src="' . $this->imageLink('finc_logo.png') . '" alt="' . $this->translate('finc-logo_alt') . '" aria-hidden="true"/>', ['title' => $this->translate('finc-logo_title'), 'aria-hidden' => 'true']) ?> + <?= $this->externalLink('https://vufind.org', '<img src="' . $this->imageLink('vufind_logo.png') . '" alt="' . $this->translate('vufind-logo_alt') . '" aria-hidden="true"/>', ['title' => $this->translate('vufind-logo_title')], true) ?> + <?= $this->externalLink('https://finc.info/', '<img src="' . $this->imageLink('finc_logo.png') . '" alt="' . $this->translate('finc-logo_alt') . '" aria-hidden="true"/>', ['title' => $this->translate('finc-logo_title'), 'aria-hidden' => 'true'], true) ?> </div> </div> </footer> diff --git a/themes/de_105/templates/search/results.phtml b/themes/de_105/templates/search/results.phtml index 652c099d705f262c202b2e5b3d4099ef7c88e68c..1ef21bc965a7fe6eef68486f16d26a473f71168c 100644 --- a/themes/de_105/templates/search/results.phtml +++ b/themes/de_105/templates/search/results.phtml @@ -115,12 +115,14 @@ $this->headScript()->appendFile("check_save_statuses.js"); </div> <p><strong><?=$this->translate('de105_noresults_moreoptions_headline'); ?></strong></p> <ul> - <li><?=$this->translate('de105_noresults_moreoptions_help'); ?>: <a target='_blank' href='<?=$this->url('help-home')?>?topic=search&_=1532679998'><?=$this->translate("de105_noresults_moreoptions_help_link"); ?></a></li> - <?php if ($this->de105ChatAvailability): ?><li><?=$this->translate('de105_noresults_moreoptions_chat'); ?>: <a target='_blank' href='https://tu-freiberg.de/ub'><?=$this->translate("de105_noresults_moreoptions_chat_link"); ?></a></li><?php endif; ?> - <li><?=$this->translate('de105_noresults_moreoptions_etutorial'); ?>: <a target='_blank' href='https://tu-freiberg.de/ub/bmik'><?=$this->translate("de105_noresults_moreoptions_etutorial_link"); ?></a></li> - <li><?=$this->translate('de105_noresults_moreoptions_informationliteracy'); ?>: <a target='_blank' href='https://tu-freiberg.de/ub/service/informationskompetenz'><?=$this->translate("de105_noresults_moreoptions_informationliteracy_link"); ?></a></li> - <li><?=$this->translate('de105_noresults_moreoptions_moresearches'); ?>: <a target='_blank' href='<?=$this->url('help-home')?>?topic=search#OtherResources'><?=$this->translate("de105_noresults_moreoptions_moresearches_link"); ?></a></li> - <li><?=$this->translate('de105_noresults_moreoptions_acquisition'); ?>: <a target='_blank' href='https://tu-freiberg.de/ub/service/anschaffungsvorschlag'><?=$this->translate("de105_noresults_moreoptions_acquisition_link"); ?></a></li> + <li><?=$this->translate('de105_noresults_moreoptions_help'); ?>: <?=$this->externalLink($this->url('help-home').'?topic=search&_=1532679998', $this->translate("de105_noresults_moreoptions_help_link"))?></li> + <?php if ($this->de105ChatAvailability): ?> + <li><?=$this->translate('de105_noresults_moreoptions_chat'); ?>: <?=$this->externalLink('https://tu-freiberg.de/ub', $this->translate("de105_noresults_moreoptions_chat_link"))?></li> + <?php endif; ?> + <li><?=$this->translate('de105_noresults_moreoptions_etutorial'); ?>: <?=$this->externalLink('https://tu-freiberg.de/ub/bmik', $this->translate("de105_noresults_moreoptions_etutorial_link"))?></li> + <li><?=$this->translate('de105_noresults_moreoptions_informationliteracy'); ?>: <?=$this->externalLink('https://tu-freiberg.de/ub/service/informationskompetenz', $this->translate("de105_noresults_moreoptions_informationliteracy_link"))?></li> + <li><?=$this->translate('de105_noresults_moreoptions_moresearches'); ?>: <?=$this->externalLink($this->url('help-home').'?topic=search#OtherResources', $this->translate("de105_noresults_moreoptions_moresearches_link"))?></li> + <li><?=$this->translate('de105_noresults_moreoptions_acquisition'); ?>: <?=$this->externalLink('https://tu-freiberg.de/ub/service/anschaffungsvorschlag', $this->translate("de105_noresults_moreoptions_acquisition_link"))?></li> </ul> <?php endif; ?> </p>