From 9a1d1c20e833317b4cc03bd0ee973cb0a6f121f6 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Tue, 24 Oct 2017 15:50:28 -0400 Subject: [PATCH] Normalize concat spacing. --- .../templates/Recommend/FavoriteFacets.phtml | 4 ++-- .../templates/Recommend/SideFacets/cluster-list.phtml | 6 +++--- themes/bootstrap3/templates/Recommend/TopFacets.phtml | 10 +++++----- .../templates/RecordDriver/EDS/result-list.phtml | 2 +- .../templates/RecordDriver/Pazpar2/result-list.phtml | 2 +- .../RecordDriver/SolrDefault/list-entry.phtml | 2 +- .../RecordDriver/SolrDefault/result-grid.phtml | 2 +- .../RecordDriver/SolrDefault/result-list.phtml | 2 +- themes/bootstrap3/templates/ajax/resolverLinks.phtml | 6 +++--- themes/bootstrap3/templates/browse/home.phtml | 4 ++-- themes/bootstrap3/templates/cart/email.phtml | 4 ++-- themes/bootstrap3/templates/cart/export.phtml | 4 ++-- themes/bootstrap3/templates/cart/save.phtml | 2 +- themes/bootstrap3/templates/collection/view.phtml | 2 +- themes/bootstrap3/templates/collections/home.phtml | 4 ++-- themes/bootstrap3/templates/install/disabled.phtml | 2 +- themes/bootstrap3/templates/install/done.phtml | 2 +- .../bootstrap3/templates/install/fixbasicconfig.phtml | 2 +- themes/bootstrap3/templates/install/fixcache.phtml | 2 +- themes/bootstrap3/templates/install/fixdatabase.phtml | 2 +- .../bootstrap3/templates/install/fixdependencies.phtml | 2 +- themes/bootstrap3/templates/install/fixils.phtml | 2 +- themes/bootstrap3/templates/install/fixsecurity.phtml | 2 +- themes/bootstrap3/templates/install/fixsolr.phtml | 2 +- themes/bootstrap3/templates/install/fixsslcerts.phtml | 2 +- .../bootstrap3/templates/myresearch/checkedout.phtml | 2 +- themes/bootstrap3/templates/myresearch/holds.phtml | 2 +- .../bootstrap3/templates/myresearch/illrequests.phtml | 2 +- themes/bootstrap3/templates/myresearch/mylist.phtml | 2 +- .../myresearch/storageretrievalrequests.phtml | 2 +- themes/bootstrap3/templates/record/view.phtml | 2 +- themes/bootstrap3/templates/search/advanced/eds.phtml | 4 ++-- .../bootstrap3/templates/search/advanced/layout.phtml | 4 ++-- .../bootstrap3/templates/search/controls/showing.phtml | 2 +- themes/bootstrap3/templates/search/history.phtml | 2 +- .../bootstrap3/templates/search/reservessearch.phtml | 2 +- themes/bootstrap3/templates/upgrade/error.phtml | 2 +- .../templates/upgrade/fixanonymoustags.phtml | 2 +- .../templates/upgrade/fixduplicatetags.phtml | 2 +- themes/bootstrap3/templates/upgrade/fixmetadata.phtml | 2 +- .../templates/upgrade/getdbcredentials.phtml | 2 +- .../templates/upgrade/getdbencodingpreference.phtml | 2 +- themes/bootstrap3/templates/upgrade/getsourcedir.phtml | 2 +- themes/bootstrap3/templates/upgrade/showsql.phtml | 2 +- .../RecordDriver/AbstractBase/export-bibtex.phtml | 2 +- .../RecordDriver/AbstractBase/export-endnote.phtml | 2 +- .../RecordDriver/AbstractBase/export-endnoteweb.phtml | 2 +- .../RecordDriver/AbstractBase/export-refworks.phtml | 2 +- .../RecordDriver/AbstractBase/export-ris.phtml | 2 +- 49 files changed, 64 insertions(+), 64 deletions(-) diff --git a/themes/bootstrap3/templates/Recommend/FavoriteFacets.phtml b/themes/bootstrap3/templates/Recommend/FavoriteFacets.phtml index c01e8718b40..5b940b1d7df 100644 --- a/themes/bootstrap3/templates/Recommend/FavoriteFacets.phtml +++ b/themes/bootstrap3/templates/Recommend/FavoriteFacets.phtml @@ -9,7 +9,7 @@ <? if (!empty($tagFilterList)): ?> <? $field = $sideFacetSet['tags']['label']; ?> <? foreach ($tagFilterList as $filter): ?> - <? $removeLink = $this->currentPath().$results->getUrlQuery()->removeFacet($filter['field'], $filter['value']); ?> + <? $removeLink = $this->currentPath() . $results->getUrlQuery()->removeFacet($filter['field'], $filter['value']); ?> <a class="list-group-item active" href="<?=$removeLink?>"> <span class="pull-right flip"><i class="fa fa-minus-circle" aria-hidden="true"></i></span> <?=$this->escapeHtml($filter['displayText'])?> @@ -18,7 +18,7 @@ <? endif; ?> <? foreach($sideFacetSet['tags']['list'] as $thisFacet): ?> <? if(!$thisFacet['isApplied']): ?> - <a class="list-group-item" href="<?=$this->currentPath().$results->getUrlQuery()->addFacet('tags', $thisFacet['value'])?>"> + <a class="list-group-item" href="<?=$this->currentPath() . $results->getUrlQuery()->addFacet('tags', $thisFacet['value'])?>"> <span class="badge"><?=$this->escapeHtml($thisFacet['count'])?></span> <?=$this->escapeHtml($thisFacet['displayText'])?> </a> diff --git a/themes/bootstrap3/templates/Recommend/SideFacets/cluster-list.phtml b/themes/bootstrap3/templates/Recommend/SideFacets/cluster-list.phtml index d3d6b733e1a..e173ecfeabe 100644 --- a/themes/bootstrap3/templates/Recommend/SideFacets/cluster-list.phtml +++ b/themes/bootstrap3/templates/Recommend/SideFacets/cluster-list.phtml @@ -1,5 +1,5 @@ -<? $idAndClass = 'id="more-narrowGroupHidden-'.$this->escapeHtmlAttr($this->title).'" class="facet narrow-toggle"'; ?> -<? $moreClass = 'narrowGroupHidden-'.$this->escapeHtmlAttr($this->title).' hidden'; ?> +<? $idAndClass = 'id="more-narrowGroupHidden-' . $this->escapeHtmlAttr($this->title) . '" class="facet narrow-toggle"'; ?> +<? $moreClass = 'narrowGroupHidden-' . $this->escapeHtmlAttr($this->title) . ' hidden'; ?> <? foreach ($this->cluster['list'] as $i => $thisFacet): ?> <? if(empty($thisFacet['displayText'])) { @@ -66,7 +66,7 @@ <? /* LESS and SEE MORE links */ ?> <? if (isset($i) && $i >= $this->facets_before_more): ?> <? if ($this->showMoreInLightbox === 'more' && $facetLightbox = $options->getFacetListAction()): ?> - <? $moreUrl = $this->url($facetLightbox) . $results->getUrlQuery()->getParams().'&facet='.$this->title.'&facetop='.$thisFacet['operator'].'&facetexclude='.($this->allowExclude ? 1 : 0); ?> + <? $moreUrl = $this->url($facetLightbox) . $results->getUrlQuery()->getParams() . '&facet=' . $this->title . '&facetop=' . $thisFacet['operator'] . '&facetexclude=' . ($this->allowExclude ? 1 : 0); ?> <a class="facet narrow-toggle <?=$moreClass ?>" data-lightbox href="<?=$moreUrl ?>" rel="nofollow"><?=$this->transEsc('see all')?> ...</a> <? endif; ?> <a class="facet narrow-toggle <?=$moreClass ?>" href="#" onclick="return lessFacets('narrowGroupHidden-<?=$this->escapeHtmlAttr($this->title) ?>')"><?=$this->transEsc('less')?> ...</a> diff --git a/themes/bootstrap3/templates/Recommend/TopFacets.phtml b/themes/bootstrap3/templates/Recommend/TopFacets.phtml index 0bfa2161658..94f75f0d110 100644 --- a/themes/bootstrap3/templates/Recommend/TopFacets.phtml +++ b/themes/bootstrap3/templates/Recommend/TopFacets.phtml @@ -6,7 +6,7 @@ ?> <? if (isset($topFacetSet)): ?> <? foreach($topFacetSet as $title => $cluster): ?> - <? $moreClass = ' NarrowGroupHidden_'.$this->escapeHtml($title).' hidden'; ?> + <? $moreClass = ' NarrowGroupHidden_' . $this->escapeHtml($title) . ' hidden'; ?> <? $allowExclude = $this->recommend->excludeAllowed($title); ?> <div class="top-facets"> <!--Toggle for mobile collapse --> @@ -20,20 +20,20 @@ <span class="facet <?=$index > $limit ? $moreClass : '' ?>"> <? if ($thisFacet['isApplied']): if (isset($thisFacet['specialType']) && $thisFacet['specialType'] == 'keyword') { - $removeLink = $this->currentPath().$results->getUrlQuery()->replaceTerm($thisFacet['value'], ''); + $removeLink = $this->currentPath() . $results->getUrlQuery()->replaceTerm($thisFacet['value'], ''); } else { - $removeLink = $this->currentPath().$results->getUrlQuery()->removeFacet($title, $thisFacet['value'], $thisFacet['operator']); + $removeLink = $this->currentPath() . $results->getUrlQuery()->removeFacet($title, $thisFacet['value'], $thisFacet['operator']); } ?> <a href="<?=$removeLink ?>" class="applied"> <?=$this->escapeHtml($thisFacet['displayText'])?> <i class="fa fa-check" aria-hidden="true"></i><!-- --></a> <? else: ?> - <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"> + <a href="<?=$this->currentPath() . $results->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"> <?=$this->escapeHtml($thisFacet['displayText'])?><!-- --></a> <span class="badge"><?=$this->localizedNumber($thisFacet['count']) ?> <? if ($allowExclude): ?> - <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], 'NOT')?>" title="<?=$this->transEsc('exclude_facet')?>"><i class="fa fa-times" aria-hidden="true"></i></a> + <a href="<?=$this->currentPath() . $results->getUrlQuery()->addFacet($title, $thisFacet['value'], 'NOT')?>" title="<?=$this->transEsc('exclude_facet')?>"><i class="fa fa-times" aria-hidden="true"></i></a> <? endif; ?> </span> <? endif; ?> diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml index c04806ad629..0376e35e24c 100644 --- a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml +++ b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml @@ -83,7 +83,7 @@ <? endif; ?> <? if ($this->driver->hasPdfAvailable()): ?> - <a href="<?= $this->recordLink()->getUrl($this->driver).'/PDF'; ?>" class="icon pdf fulltext" target="_blank"> + <a href="<?= $this->recordLink()->getUrl($this->driver) . '/PDF'; ?>" class="icon pdf fulltext" target="_blank"> <?=$this->transEsc('PDF Full Text')?> </a> <? endif; ?> diff --git a/themes/bootstrap3/templates/RecordDriver/Pazpar2/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/Pazpar2/result-list.phtml index 5d5ca176904..c31afd048a0 100644 --- a/themes/bootstrap3/templates/RecordDriver/Pazpar2/result-list.phtml +++ b/themes/bootstrap3/templates/RecordDriver/Pazpar2/result-list.phtml @@ -108,7 +108,7 @@ <?=$this->record($this->driver)->getPreviews()?> </div> - <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()) . '"></span>':''?> </div> </div> <? if ($thumbnail && $thumbnailAlignment == 'right'): ?> diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml index 7129820258f..83c553850f3 100644 --- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml +++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml @@ -186,7 +186,7 @@ </ul> </div> - <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()) . '"></span>':''?> </div> </div> <? if ($thumbnail && $thumbnailAlignment == 'right'): ?> diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-grid.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-grid.phtml index 4b3774ae79f..fe67d3fd39a 100644 --- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-grid.phtml +++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-grid.phtml @@ -42,6 +42,6 @@ $urls = $this->record($this->driver)->getLinkDetails($openUrlActive); </div> </div> - <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()) . '"></span>':''?> </div> diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml index d2a8d52860c..650301e3341 100644 --- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml +++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml @@ -199,7 +199,7 @@ <? endforeach; ?> <? endif; ?> - <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenUrl()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenUrl()) . '"></span>':''?> </div> </div> <? if ($thumbnail && $thumbnailAlignment == 'right'): ?> diff --git a/themes/bootstrap3/templates/ajax/resolverLinks.phtml b/themes/bootstrap3/templates/ajax/resolverLinks.phtml index 2a602e55378..5d1dc2e81ed 100644 --- a/themes/bootstrap3/templates/ajax/resolverLinks.phtml +++ b/themes/bootstrap3/templates/ajax/resolverLinks.phtml @@ -6,7 +6,7 @@ <? foreach ($this->electronic as $link): ?> <li> <? if (!empty($link['href'])): ?> - <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> + <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-' . $link['access'] . '"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> <? else: ?> <?=isset($link['title'])?$this->escapeHtml($link['title']):''?> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> <? endif; ?> @@ -22,7 +22,7 @@ <? foreach ($this->print as $link): ?> <li> <? if (!empty($link['href'])): ?> - <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> + <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-' . $link['access'] . '"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> <? else: ?> <?=isset($link['title'])?$this->escapeHtml($link['title']):''?> <?=isset($link['coverage'])?$this->escapeHtml($link['coverage']):''?> <? endif; ?> @@ -38,7 +38,7 @@ <? foreach ($this->services as $link): ?> <? if (!empty($link['href'])): ?> <li> - <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> + <a href="<?=$this->escapeHtmlAttr($link['href'])?>" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-' . $link['access'] . '"':''?>><?=isset($link['title'])?$this->escapeHtml($link['title']):''?></a> </li> <? endif; ?> <? endforeach; ?> diff --git a/themes/bootstrap3/templates/browse/home.phtml b/themes/bootstrap3/templates/browse/home.phtml index 735cd6c0362..0773673096d 100644 --- a/themes/bootstrap3/templates/browse/home.phtml +++ b/themes/bootstrap3/templates/browse/home.phtml @@ -47,13 +47,13 @@ } if ($this->secondaryParams) { foreach($this->secondaryParams as $var => $val) { - $url .= '&' . $var .'=' . urlencode($val); + $url .= '&' . $var . '=' . urlencode($val); } } $viewRecord = !empty($this->categoryList) && $this->currentAction != 'Tag' && $this->findby != 'alphabetical'; $hasBadge = $this->findby != 'alphabetical' && isset($secondary['count']); ?> - <a href="<?=$url ?>" class="browse-item<? if ($hasBadge): ?> with-badge<? endif; ?><? if ($this->query == $secondary['value'].'' || $this->query == $secondary['value'].'*'): ?> active<? endif; ?>"> + <a href="<?=$url ?>" class="browse-item<? if ($hasBadge): ?> with-badge<? endif; ?><? if ($this->query == $secondary['value'] . '' || $this->query == $secondary['value'] . '*'): ?> active<? endif; ?>"> <?=$this->escapeHtml($secondary['displayText']) ?> <? if ($hasBadge): ?> <span class="badge"><?=number_format($secondary['count']) ?></span> diff --git a/themes/bootstrap3/templates/cart/email.phtml b/themes/bootstrap3/templates/cart/email.phtml index bbea929f5ae..26f5169ec96 100644 --- a/themes/bootstrap3/templates/cart/email.phtml +++ b/themes/bootstrap3/templates/cart/email.phtml @@ -4,7 +4,7 @@ // Set up breadcrumbs: $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') - . '<li><a href="' .$this->url('cart-home'). '">' .$this->transEsc('Cart'). '</a></li> ' + . '<li><a href="' . $this->url('cart-home') . '">' . $this->transEsc('Cart') . '</a></li> ' . '<li class="active">' . $this->transEsc('email_selected_favorites') . '</li>'; ?> <h2><?=$this->transEsc('bookbag_email_selected') ?></h2> @@ -17,7 +17,7 @@ <label class="control-label"><?=$this->transEsc('Title')?>:</label> <? if(count($this->records) > 1): ?> <button type="button" class="btn btn-default hidden" data-toggle="collapse" data-target="#itemhide"> - <?=count($this->records).' '.$this->transEsc('items') ?> + <?=count($this->records) . ' ' . $this->transEsc('items') ?> </button> <div id="itemhide" class="collapse in"> <ul> diff --git a/themes/bootstrap3/templates/cart/export.phtml b/themes/bootstrap3/templates/cart/export.phtml index 9a218882ca4..becee02e7a7 100644 --- a/themes/bootstrap3/templates/cart/export.phtml +++ b/themes/bootstrap3/templates/cart/export.phtml @@ -4,7 +4,7 @@ // Set up breadcrumbs: $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink($this->transEsc('Search'), '', '</li> ') - . '<li><a href="' .$this->url('cart-home'). '">' .$this->transEsc('Cart'). '</a></li> ' + . '<li><a href="' . $this->url('cart-home') . '">' . $this->transEsc('Cart') . '</a></li> ' . '<li class="active">' . $this->transEsc('Export Favorites') . '</li>'; ?> <h2><?=$this->transEsc('Export Favorites')?></h2> @@ -20,7 +20,7 @@ <label class="control-label"><?=$this->transEsc('Title')?>:</label> <? if(count($this->records) > 1): ?> <button type="button" class="btn btn-default hidden" data-toggle="collapse" data-target="#itemhide"> - <?=count($this->records).' '.$this->transEsc('items') ?> + <?=count($this->records) . ' ' . $this->transEsc('items') ?> </button> <div id="itemhide" class="collapse in"> <ul> diff --git a/themes/bootstrap3/templates/cart/save.phtml b/themes/bootstrap3/templates/cart/save.phtml index 256857b6562..15e5455d858 100644 --- a/themes/bootstrap3/templates/cart/save.phtml +++ b/themes/bootstrap3/templates/cart/save.phtml @@ -20,7 +20,7 @@ <label class="control-label"><?=$this->transEsc('Title')?>:</label> <? if(count($this->records) > 1): ?> <button type="button" class="btn btn-default hidden" data-toggle="collapse" data-target="#itemhide"> - <?=count($this->records).' '.$this->transEsc('items') ?> + <?=count($this->records) . ' ' . $this->transEsc('items') ?> </button> <div id="itemhide" class="collapse in"> <ul> diff --git a/themes/bootstrap3/templates/collection/view.phtml b/themes/bootstrap3/templates/collection/view.phtml index ac0f1fad772..e2df2d8dc67 100644 --- a/themes/bootstrap3/templates/collection/view.phtml +++ b/themes/bootstrap3/templates/collection/view.phtml @@ -107,7 +107,7 @@ </div> <? endif; ?> - <?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenURL()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>':''?> </div> <? if (isset($activeTabObj) && is_callable([$activeTabObj, 'getSideRecommendations'])): ?> diff --git a/themes/bootstrap3/templates/collections/home.phtml b/themes/bootstrap3/templates/collections/home.phtml index 059504c236a..3140eaa4dab 100644 --- a/themes/bootstrap3/templates/collections/home.phtml +++ b/themes/bootstrap3/templates/collections/home.phtml @@ -6,7 +6,7 @@ foreach (isset($filters['Other']) ? $filters['Other'] : [] as $filter) { $filter['urlPart'] = $filter['field'] . ':' . $filter['value']; $filterList[] = $filter; - $filterString .= '&' . urlencode('filter[]') . '=' . urlencode($filter['urlPart']); + $filterString .= '&' . urlencode('filter[]') . '=' . urlencode($filter['urlPart']); } ?> @@ -42,7 +42,7 @@ $removalUrl = $this->url('collections-home') . '?from=' . urlencode($from); foreach ($filterList as $current) { if ($current['urlPart'] != $filter['urlPart']) { - $removalUrl .= '&' . urlencode('filter[]') . '=' . urlencode($current['urlPart']); + $removalUrl .= '&' . urlencode('filter[]') . '=' . urlencode($current['urlPart']); } } ?> diff --git a/themes/bootstrap3/templates/install/disabled.phtml b/themes/bootstrap3/templates/install/disabled.phtml index 6da3c47c0a0..dad2251b86a 100644 --- a/themes/bootstrap3/templates/install/disabled.phtml +++ b/themes/bootstrap3/templates/install/disabled.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a><li> <li class="active">' . $this->transEsc('Disabled') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a><li> <li class="active">' . $this->transEsc('Disabled') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/done.phtml b/themes/bootstrap3/templates/install/done.phtml index f1a18df6480..52faf30cff8 100644 --- a/themes/bootstrap3/templates/install/done.phtml +++ b/themes/bootstrap3/templates/install/done.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a>'; + $this->layout()->breadcrumbs = '<a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixbasicconfig.phtml b/themes/bootstrap3/templates/install/fixbasicconfig.phtml index e3c2783114b..0f880ec9dce 100644 --- a/themes/bootstrap3/templates/install/fixbasicconfig.phtml +++ b/themes/bootstrap3/templates/install/fixbasicconfig.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Basic Config') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Basic Config') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixcache.phtml b/themes/bootstrap3/templates/install/fixcache.phtml index 9c9dc4c9b48..16ce644addf 100644 --- a/themes/bootstrap3/templates/install/fixcache.phtml +++ b/themes/bootstrap3/templates/install/fixcache.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Cache') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Cache') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixdatabase.phtml b/themes/bootstrap3/templates/install/fixdatabase.phtml index deef34c3814..c2752823070 100644 --- a/themes/bootstrap3/templates/install/fixdatabase.phtml +++ b/themes/bootstrap3/templates/install/fixdatabase.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Database') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Database') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixdependencies.phtml b/themes/bootstrap3/templates/install/fixdependencies.phtml index c2872601b35..bf4443c1510 100644 --- a/themes/bootstrap3/templates/install/fixdependencies.phtml +++ b/themes/bootstrap3/templates/install/fixdependencies.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Dependencies') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Dependencies') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixils.phtml b/themes/bootstrap3/templates/install/fixils.phtml index d76829301d7..03a0e70aeee 100644 --- a/themes/bootstrap3/templates/install/fixils.phtml +++ b/themes/bootstrap3/templates/install/fixils.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix ILS') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix ILS') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixsecurity.phtml b/themes/bootstrap3/templates/install/fixsecurity.phtml index 5d5042d401c..2c5617bf85f 100644 --- a/themes/bootstrap3/templates/install/fixsecurity.phtml +++ b/themes/bootstrap3/templates/install/fixsecurity.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Security') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Security') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixsolr.phtml b/themes/bootstrap3/templates/install/fixsolr.phtml index 2a9121c78d1..de0d99baa70 100644 --- a/themes/bootstrap3/templates/install/fixsolr.phtml +++ b/themes/bootstrap3/templates/install/fixsolr.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Solr') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix Solr') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/install/fixsslcerts.phtml b/themes/bootstrap3/templates/install/fixsslcerts.phtml index 043c60bcc2d..268b7624b5a 100644 --- a/themes/bootstrap3/templates/install/fixsslcerts.phtml +++ b/themes/bootstrap3/templates/install/fixsslcerts.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('auto_configure_title')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') .'">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix SSL Certificates') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('install-home') . '">' . $this->transEsc('auto_configure_title') . '</a></li> <li class="active">' . $this->transEsc('Fix SSL Certificates') . '</li>'; ?> <h2><?=$this->transEsc('auto_configure_title')?></h2> diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml index c02a4b95c51..135e3ceb9fe 100644 --- a/themes/bootstrap3/templates/myresearch/checkedout.phtml +++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml @@ -181,7 +181,7 @@ <?=$thumbnail ?> <? endif ?> </div> - <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="'.$this->escapeHtmlAttr($resource->getCoinsOpenUrl()).'"></span>':''?> + <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?> </div> <? endforeach; ?> <? if ($this->renewForm): ?></form><? endif; ?> diff --git a/themes/bootstrap3/templates/myresearch/holds.phtml b/themes/bootstrap3/templates/myresearch/holds.phtml index 666ade221ff..ee90c4aa7c9 100644 --- a/themes/bootstrap3/templates/myresearch/holds.phtml +++ b/themes/bootstrap3/templates/myresearch/holds.phtml @@ -163,7 +163,7 @@ <?=$thumbnail ?> <? endif ?> </div> - <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="'.$this->escapeHtmlAttr($resource->getCoinsOpenUrl()).'"></span>':''?> + <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?> </div> <? endforeach; ?> <? if ($this->cancelForm): ?></form><? endif; ?> diff --git a/themes/bootstrap3/templates/myresearch/illrequests.phtml b/themes/bootstrap3/templates/myresearch/illrequests.phtml index 1623f30384e..88f2266de58 100644 --- a/themes/bootstrap3/templates/myresearch/illrequests.phtml +++ b/themes/bootstrap3/templates/myresearch/illrequests.phtml @@ -163,7 +163,7 @@ <?=$thumbnail ?> <? endif ?> </div> - <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="'.$this->escapeHtmlAttr($resource->getCoinsOpenUrl()).'"></span>':''?> + <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?> </div> <? endforeach; ?> <? if ($this->cancelForm): ?></form><? endif; ?> diff --git a/themes/bootstrap3/templates/myresearch/mylist.phtml b/themes/bootstrap3/templates/myresearch/mylist.phtml index c5e9fd7d902..a7579bdfc7d 100644 --- a/themes/bootstrap3/templates/myresearch/mylist.phtml +++ b/themes/bootstrap3/templates/myresearch/mylist.phtml @@ -7,7 +7,7 @@ // Set up breadcrumbs: $currPage = isset($list) ? 'List' : 'Favorites'; - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc($currPage) . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc($currPage) . '</li>'; // Load Javascript dependencies into header: $this->headScript()->appendFile("check_item_statuses.js"); diff --git a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml index 8c18dd905ea..55d8460a653 100644 --- a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml +++ b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml @@ -160,7 +160,7 @@ <?=$thumbnail ?> <? endif ?> </div> - <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="'.$this->escapeHtmlAttr($resource->getCoinsOpenUrl()).'"></span>':''?> + <?=$resource->tryMethod('supportsCoinsOpenUrl')?'<span class="Z3988" title="' . $this->escapeHtmlAttr($resource->getCoinsOpenUrl()) . '"></span>':''?> </div> <? endforeach; ?> <? if ($this->cancelForm): ?></form><? endif; ?> diff --git a/themes/bootstrap3/templates/record/view.phtml b/themes/bootstrap3/templates/record/view.phtml index e91119ba4e7..1ddf0c02d6d 100644 --- a/themes/bootstrap3/templates/record/view.phtml +++ b/themes/bootstrap3/templates/record/view.phtml @@ -101,7 +101,7 @@ </div> <? endif; ?> - <?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenURL()).'"></span>':''?> + <?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>':''?> </div> <div class="<?=$this->layoutClass('sidebar')?>"> diff --git a/themes/bootstrap3/templates/search/advanced/eds.phtml b/themes/bootstrap3/templates/search/advanced/eds.phtml index 7ce6f0f61fa..a437c9d6622 100644 --- a/themes/bootstrap3/templates/search/advanced/eds.phtml +++ b/themes/bootstrap3/templates/search/advanced/eds.phtml @@ -33,7 +33,7 @@ <select id="limit_<?=$this->escapeHtmlAttr($field)?>" name="filter[]" multiple="multiple" size="10" class="form-control"> <? foreach ($facet['LimiterValues'] as $id => $facetValue): ?> <? $value = $facetValue['Value']; ?> - <option value="<?='LIMIT|'.$this->escapeHtmlAttr($field . ':' . $facetValue['Value'])?>"<?=(isset($facetValue['selected']) && $facetValue['selected'])?' selected="selected"':''?>><?=$this->escapeHtml($facetValue['Value'])?></option> + <option value="<?='LIMIT|' . $this->escapeHtmlAttr($field . ':' . $facetValue['Value'])?>"<?=(isset($facetValue['selected']) && $facetValue['selected'])?' selected="selected"':''?>><?=$this->escapeHtml($facetValue['Value'])?></option> <? endforeach; ?> </select> <!-- <br/> --> @@ -42,7 +42,7 @@ $value = $facet['LimiterValues'][0]['Value'] ?> <div class="checkbox"> <label for="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>"> - <input id="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($facet['LimiterValues'][0]['selected']) && $facet['LimiterValues'][0]['selected'])?'checked="checked"':''?> name="filter[]" value="<?=$this->escapeHtmlAttr('LIMIT|'.$field . ':' . $value)?>"> + <input id="limit_<?=$this->escapeHtmlAttr(str_replace(' ', '+', $field))?>" type="checkbox" <?=(isset($facet['LimiterValues'][0]['selected']) && $facet['LimiterValues'][0]['selected'])?'checked="checked"':''?> name="filter[]" value="<?=$this->escapeHtmlAttr('LIMIT|' . $field . ':' . $value)?>"> <?=$this->transEsc('eds_limiter_' . $field, [], $facet['Label'])?> </label> </div> diff --git a/themes/bootstrap3/templates/search/advanced/layout.phtml b/themes/bootstrap3/templates/search/advanced/layout.phtml index aba0b5e19e7..86b1f239c0b 100644 --- a/themes/bootstrap3/templates/search/advanced/layout.phtml +++ b/themes/bootstrap3/templates/search/advanced/layout.phtml @@ -104,8 +104,8 @@ <? if($group == 0 && $search == 0): ?> <div id="new_search_template"> <? endif; ?> - <div id="search<?=$group.'_'.$search ?>" class="adv-search"> - <input name="lookfor<?=$group ?>[]" id="search_lookfor<?=$group.'_'.$search ?>" class="adv-term-input form-control" type="text"<?if(isset($setQueries[$group][$search])):?> value="<?=$this->escapeHtml($setQueries[$group][$search]->getString())?>"<?endif;?>> + <div id="search<?=$group . '_' . $search ?>" class="adv-search"> + <input name="lookfor<?=$group ?>[]" id="search_lookfor<?=$group . '_' . $search ?>" class="adv-term-input form-control" type="text"<?if(isset($setQueries[$group][$search])):?> value="<?=$this->escapeHtml($setQueries[$group][$search]->getString())?>"<?endif;?>> <select class="adv-term-type form-control" name="type<?=$group ?>[]"> <? foreach ($this->options->getAdvancedHandlers() as $searchVal => $searchDesc): ?> <option value="<?=$this->escapeHtml($searchVal)?>"<?if(isset($setQueries[$group][$search]) && $searchVal == $setQueries[$group][$search]->getHandler()):?> selected<?endif;?>><?=$this->transEsc($searchDesc)?></option> diff --git a/themes/bootstrap3/templates/search/controls/showing.phtml b/themes/bootstrap3/templates/search/controls/showing.phtml index e2cb68cd504..cb8c4d933cf 100644 --- a/themes/bootstrap3/templates/search/controls/showing.phtml +++ b/themes/bootstrap3/templates/search/controls/showing.phtml @@ -22,7 +22,7 @@ <? endif; ?> <? $this->layout()->srmessage = $showingResults; ?> <? if ($qtime = $this->results->getQuerySpeed()): ?> - <?=$showingResults; ?><span class="search-query-time">, <?=$this->transEsc('query time')?>: <?=$this->localizedNumber($qtime, 2).$this->transEsc('seconds_abbrev')?></span> + <?=$showingResults; ?><span class="search-query-time">, <?=$this->transEsc('query time')?>: <?=$this->localizedNumber($qtime, 2) . $this->transEsc('seconds_abbrev')?></span> <? else: ?> <?=$showingResults; ?> <? endif; ?> diff --git a/themes/bootstrap3/templates/search/history.phtml b/themes/bootstrap3/templates/search/history.phtml index 698b505a2b5..9d6090d139b 100644 --- a/themes/bootstrap3/templates/search/history.phtml +++ b/themes/bootstrap3/templates/search/history.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Search History')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>' + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>' . '<li class="active">' . $this->transEsc('History') . '</li>'; $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enabled'; diff --git a/themes/bootstrap3/templates/search/reservessearch.phtml b/themes/bootstrap3/templates/search/reservessearch.phtml index 71e4eb67f35..b618c9a0191 100644 --- a/themes/bootstrap3/templates/search/reservessearch.phtml +++ b/themes/bootstrap3/templates/search/reservessearch.phtml @@ -35,7 +35,7 @@ <?=$this->translate('showing_results_of_for_html', $transParams); ?><? if($qtime): ?>,<? endif; ?> <? endif; ?> <? if ($qtime): ?> - <?=$this->transEsc('query time')?>: <?=$this->localizedNumber($qtime, 2).$this->transEsc('seconds_abbrev')?> + <?=$this->transEsc('query time')?>: <?=$this->localizedNumber($qtime, 2) . $this->transEsc('seconds_abbrev')?> <? endif; ?> </div> diff --git a/themes/bootstrap3/templates/upgrade/error.phtml b/themes/bootstrap3/templates/upgrade/error.phtml index ef4b9e2b55f..5437ff7d292 100644 --- a/themes/bootstrap3/templates/upgrade/error.phtml +++ b/themes/bootstrap3/templates/upgrade/error.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/fixanonymoustags.phtml b/themes/bootstrap3/templates/upgrade/fixanonymoustags.phtml index 9ac6a5a13b8..15e5cbddb38 100644 --- a/themes/bootstrap3/templates/upgrade/fixanonymoustags.phtml +++ b/themes/bootstrap3/templates/upgrade/fixanonymoustags.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/fixduplicatetags.phtml b/themes/bootstrap3/templates/upgrade/fixduplicatetags.phtml index e49f008ff91..a110789226c 100644 --- a/themes/bootstrap3/templates/upgrade/fixduplicatetags.phtml +++ b/themes/bootstrap3/templates/upgrade/fixduplicatetags.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/fixmetadata.phtml b/themes/bootstrap3/templates/upgrade/fixmetadata.phtml index 389dda8bcb5..eeb09e771a1 100644 --- a/themes/bootstrap3/templates/upgrade/fixmetadata.phtml +++ b/themes/bootstrap3/templates/upgrade/fixmetadata.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/getdbcredentials.phtml b/themes/bootstrap3/templates/upgrade/getdbcredentials.phtml index f13e695155a..73966233ae4 100644 --- a/themes/bootstrap3/templates/upgrade/getdbcredentials.phtml +++ b/themes/bootstrap3/templates/upgrade/getdbcredentials.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/getdbencodingpreference.phtml b/themes/bootstrap3/templates/upgrade/getdbencodingpreference.phtml index d9c735d9c64..f1bdc903409 100644 --- a/themes/bootstrap3/templates/upgrade/getdbencodingpreference.phtml +++ b/themes/bootstrap3/templates/upgrade/getdbencodingpreference.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml index c7f6b16d7e6..4e9d4cee272 100644 --- a/themes/bootstrap3/templates/upgrade/getsourcedir.phtml +++ b/themes/bootstrap3/templates/upgrade/getsourcedir.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; ?> <h2><?=$this->transEsc('Upgrade VuFind')?></h2> <?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/upgrade/showsql.phtml b/themes/bootstrap3/templates/upgrade/showsql.phtml index 094ce028020..be3665472b6 100644 --- a/themes/bootstrap3/templates/upgrade/showsql.phtml +++ b/themes/bootstrap3/templates/upgrade/showsql.phtml @@ -3,7 +3,7 @@ $this->headTitle($this->translate('Upgrade VuFind')); // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="'.$this->url('upgrade-home').'">'.$this->transEsc('Upgrade').'</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('upgrade-home') . '">' . $this->transEsc('Upgrade') . '</a></li> <li class="active">' . $this->transEsc('Upgrade VuFind') . '</li>'; // Set up styles: $this->headstyle()->appendStyle( diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-bibtex.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-bibtex.phtml index 9f0463c7f1c..3c8d23282e8 100644 --- a/themes/root/templates/RecordDriver/AbstractBase/export-bibtex.phtml +++ b/themes/root/templates/RecordDriver/AbstractBase/export-bibtex.phtml @@ -25,7 +25,7 @@ if ($marcProceedingsField) { echo '@' . $format . "{\n"; // Citation key: -echo $this->driver->getSourceIdentifier() . '-' . $this->driver->getUniqueId() . ",\n"; +echo $this->driver->getSourceIdentifier() . '-' . $this->driver->getUniqueId() . ",\n"; $title = rtrim($this->driver->getTitle(), " /"); echo "title = {{$title}},\n"; diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-endnote.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-endnote.phtml index 155d855b6c9..90a66cc448c 100644 --- a/themes/root/templates/RecordDriver/AbstractBase/export-endnote.phtml +++ b/themes/root/templates/RecordDriver/AbstractBase/export-endnote.phtml @@ -43,7 +43,7 @@ if (is_array($pubPlaces) && is_array($pubDates) && is_array($pubNames)) { echo "%D $date\n"; } if (isset($pubPlaces[$i])) { - echo "%C " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': '). "\n"; + echo "%C " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': ') . "\n"; } } } diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml index 31fd0d1592c..585a8509c5a 100644 --- a/themes/root/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml +++ b/themes/root/templates/RecordDriver/AbstractBase/export-endnoteweb.phtml @@ -84,7 +84,7 @@ if (is_array($pubPlaces) && is_array($pubDates) && is_array($pubNames)) { } for ($i = 0; $i < $total; $i++) { if (isset($pubPlaces[$i])) { - echo "PP - " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': '). "\n"; + echo "PP - " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': ') . "\n"; } if (isset($pubNames[$i])) { echo "PB - " . rtrim($pubNames[$i], ", ") . "\n"; diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-refworks.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-refworks.phtml index 54187639d22..e1628230328 100644 --- a/themes/root/templates/RecordDriver/AbstractBase/export-refworks.phtml +++ b/themes/root/templates/RecordDriver/AbstractBase/export-refworks.phtml @@ -68,7 +68,7 @@ if (is_array($pubPlaces) && is_array($pubDates) && is_array($pubNames)) { } for ($i = 0; $i < $total; $i++) { if (isset($pubPlaces[$i])) { - echo "PP " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': '). "\n"; + echo "PP " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': ') . "\n"; } if (isset($pubNames[$i])) { echo "PB " . rtrim($pubNames[$i], ", ") . "\n"; diff --git a/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml b/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml index 3ec5e9f2001..799432a902a 100644 --- a/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml +++ b/themes/root/templates/RecordDriver/AbstractBase/export-ris.phtml @@ -86,7 +86,7 @@ if (is_array($pubPlaces) && is_array($pubDates) && is_array($pubNames)) { } for ($i = 0; $i < $total; $i++) { if (isset($pubPlaces[$i])) { - echo "CY - " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': '). "\r\n"; + echo "CY - " . rtrim(str_replace(['[', ']'], '', $pubPlaces[$i]), ': ') . "\r\n"; } if (isset($pubNames[$i])) { echo "PB - " . rtrim($pubNames[$i], ", ") . "\r\n"; -- GitLab