diff --git a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
index b5c987a637268cc974714bcf62d0c8a5c651cb2b..af7e778125e412b67ea3ce4d3f3d28c2154e3cfc 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml
@@ -17,8 +17,10 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? /* Display thumbnail if appropriate: */ ?>
<? if($cover): ?>
<?=$cover?>
+ <? /* BOF - finc-specific StyleBasedIcons */ ?>
<? elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
<?=$this->record($this->driver)->getFormatIcon()?>
+ <? /* EOF - finc-specific StyleBasedIcons */ ?>
<? endif; ?>
<? /* Display qrcode if appropriate: */ ?>
@@ -40,7 +42,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? else: ?>
<div class="medium-12 columns">
<? endif; ?>
- <? /* This following line is a finc-specific change */ ?>
+
<h3 property="name"><?=$this->escapeHtml($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection())?></h3>
<? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?>
@@ -54,7 +56,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Display the lists that this record is saved to */ ?>
- <div class="savedLists hide alert-box info" id="savedLists" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
+ <div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
<strong><?=$this->transEsc("Saved in")?>:</strong>
</div>
<? endif; ?>
@@ -261,7 +263,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<th><?=$this->transEsc('Tags')?>: </th>
<td>
<span class="right hide-for-print">
- <a id="tagRecord" class="modal-link" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
+ <a class="tagRecord modal-link right" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
</span>
<?=$this->context($this)->renderInContext('record/taglist', array('tagList'=>$tagList, 'loggedin'=>$loggedin)) ?>
</td>
diff --git a/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml b/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
index f0e80f846de1fe9392ec6a57e9e753c03c0122d8..33d76738124a14951f48884b3cbf6f4db3620730 100644
--- a/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml
@@ -2,17 +2,19 @@
<div class="<?=$this->driver->supportsAjaxStatus() ? 'ajaxItem ' : ''?> small-11 columns">
<div class="row">
<div>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId"/>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource"/>
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId" />
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
</div>
<? if ($cover = $this->record($this->driver)->getCover('result-list', 'medium', $this->recordLink()->getUrl($this->driver))): ?>
<div class="small-3 medium-2 columns left"><?=$cover?></div>
+ <? /* BOF - finc-specific StyleBasedIcons */ ?>
<div class="small-6 medium-7 columns middle">
<? elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
<div class="small-3 medium-2 columns left"><?=$this->record($this->driver)->getRecordIcon()?></div>
<div class="small-6 medium-7 columns middle">
<? else : ?>
<div class="small-9 columns middle">
+ <? /* EOF - finc-specific StyleBasedIcons */ ?>
<? endif ?>
<div>
<a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title">
@@ -49,8 +51,7 @@
<?=!empty($summAuthor) ? '<br />' : ''?>
<?=$this->transEsc('Published') . ' ' . $this->escapeHtml($summDate[0])?>
<? endif; ?>
- <? $summInCollection = $this->driver->getContainingCollections();
- if (!empty($summInCollection)): ?>
+ <? $summInCollection = $this->driver->getContainingCollections(); if (!empty($summInCollection)): ?>
<? foreach ($summInCollection as $collId => $collText): ?>
<div>
<b><?=$this->transEsc("in_collection_label")?></b>
@@ -110,8 +111,7 @@
</span>
<div class="locationDetails"></div>
<? else: ?>
- <? $summCallNo = $this->driver->getCallNumber();
- if (!empty($summCallNo)): ?>
+ <? $summCallNo = $this->driver->getCallNumber(); if (!empty($summCallNo)): ?>
<strong><?=$this->transEsc('Call Number')?>:</strong> <?=$this->escapeHtml($summCallNo)?>
<? endif; ?>
<? endif; ?>
@@ -175,8 +175,7 @@
<? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Add to favorites */ ?>
- <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" id="<?=$this->driver->getUniqueId()?>"
- title="<?=$this->transEsc('Add to favorites')?>"><i class="fa fa-fw fa-star"></i><?=$this->transEsc('Add to favorites')?></a><br/>
+ <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" id="<?=$this->driver->getUniqueId()?>" title="<?=$this->transEsc('Add to favorites')?>"><i class="fa fa-fw fa-star"></i><?=$this->transEsc('Add to favorites')?></a><br/>
<? /* Saved lists */ ?>
<div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
@@ -189,10 +188,9 @@
if (!empty($trees)): ?>
<? foreach ($trees as $hierarchyID => $hierarchyTitle): ?>
<div class="hierarchyTreeLink">
- <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId"/>
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($hierarchyID)?>" class="hiddenHierarchyId" />
<i class="fa fa-fw fa-sitemap"></i>
- <a class="hierarchyTreeLinkText modal-link" href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>"
- title="<?=$this->transEsc('hierarchy_tree')?>">
+ <a class="hierarchyTreeLinkText modal-link" href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchyID)?>" title="<?=$this->transEsc('hierarchy_tree')?>">
<?=$this->transEsc('hierarchy_view_context')?><? if (count($trees) > 1): ?>: <?=$this->escapeHtml($hierarchyTitle)?><? endif; ?>
</a>
</div>
diff --git a/themes/finc/templates/collection/view.phtml b/themes/finc/templates/collection/view.phtml
index 4b27b6afdaecfd4f8170cd6839aab0d7b4052ebf..2d6c9e5d0032017f43161b1c8aa48f125234eae3 100644
--- a/themes/finc/templates/collection/view.phtml
+++ b/themes/finc/templates/collection/view.phtml
@@ -34,7 +34,7 @@
<? else: ?>
<li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
<? endif; ?>
- #<?=$this->localizedNumber($this->scrollData['currentPosition']) . ' ' . $this->transEsc('of') . ' ' . $this->localizedNumber($this->scrollData['resultTotal']) . ' ' . $this->transEsc('results') ?>
+ #<?=$this->localizedNumber($this->scrollData['currentPosition']) . ' ' . $this->transEsc('of') . ' ' . $this->localizedNumber($this->scrollData['resultTotal']) . ' ' . $this->transEsc('results')?>
<? if ($this->scrollData['nextRecord']): ?>
<li>
<a href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>"><?=$this->transEsc('Next')?> »</a>
@@ -48,7 +48,7 @@
<?=$this->record($this->driver)->getToolbar()?>
<div class="row">
- <div class="<?=$tree ? 'medium-12 columns' : $this->layoutClass('mainbody') ?>">
+ <div class="<?=$tree ? 'medium-12 columns' : $this->layoutClass('mainbody')?>">
<div class="record">
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" id="record_id" />
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
@@ -59,14 +59,16 @@
<? if (count($this->tabs) > 0): ?>
<a name="tabnav"></a>
<div class="record-tabs">
- <ul class="recordTabs tabs">
- <? /*<!-- DO NOT use standard data-tab option (<ul class= ... data-tab>) here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
+ <ul class="recordTabs tabs"><? /*<!-- DO NOT use standard data-tab option here as it triggers Foundation's normal tab behaviour while Vufind only uses tab appearance! FIXME CK */ ?>
<? foreach ($this->tabs as $tab => $obj): ?>
<? // add current tab to breadcrumbs if applicable:
$desc = $obj->getDescription();
$tab_classes = array();
if (0 === strcasecmp($this->activeTab, $tab)) {
- $tab_classes[] = 'active';
+ if (!$this->ajaxTabs || !$obj->supportsAjax()) {
+ $tab_classes[] = 'active';
+ }
+ $tab_classes[] = 'initiallyActive';
$this->layout()->breadcrumbs .= ' <li class="active">' . $this->transEsc($desc) . '</li>';
$activeTabObj = $obj;
}
@@ -74,20 +76,22 @@
if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
?>
<li<?=count($tab_classes) > 0 ? ' class="tab-title ' . implode(' ', $tab_classes) . '"' : ''?>>
- <a id="<?=strtolower($tab) ?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>"><?=$this->transEsc($desc)?></a>
+ <a class="<?=strtolower($tab)?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>"><?=$this->transEsc($desc)?></a>
</li>
<? endforeach; ?>
</ul>
- <? endif; ?>
-
- <div class="collectionDetails<?=$tree ? 'Tree' : ''?> tabs-content" id="record-tabs">
+ <div class="tabs-content collectionDetails<?=$tree ? 'Tree' : ''?>" id="record-tabs">
+ <? if (!$this->ajaxTabs || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
<div class="content active" id="<?=$this->activeTab ?>-tab">
- <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : '' ?>
+ <?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
</div>
- </div>
+ <? endif; ?>
+ </div>
</div>
- <?=$this->driver->supportsCoinsOpenURL()?'<span class="Z3988" title="'.$this->escapeHtmlAttr($this->driver->getCoinsOpenURL()).'"></span>':''?>
+ <? endif; ?>
+
+ <?=$this->driver->supportsCoinsOpenURL() ? '<span class="Z3988" title="' . $this->escapeHtmlAttr($this->driver->getCoinsOpenURL()) . '"></span>' : ''?>
</div>
<? if (isset($activeTabObj) && is_callable(array($activeTabObj, 'getSideRecommendations'))): ?>
@@ -98,4 +102,5 @@
</div>
<? endif; ?>
</div>
+<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET');?>
<!-- collection - VIEW.phtml end -->
\ No newline at end of file
diff --git a/themes/finc/templates/record/view.phtml b/themes/finc/templates/record/view.phtml
index c75d1ec15c6717ac5a79ff4c6f6cd12e0c8a787a..dc98f9ccb9c92728309e7082cd7519cce8152cff 100644
--- a/themes/finc/templates/record/view.phtml
+++ b/themes/finc/templates/record/view.phtml
@@ -26,15 +26,19 @@
<a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
</li>
<? else: ?>
- <li class="disabled"><a href="#">« <?=$this->transEsc('Prev')?></a></li>
+ <li class="disabled">
+ <a href="#">« <?=$this->transEsc('Prev')?></a>
+ </li>
<? endif; ?>
- #<?=$this->localizedNumber($this->scrollData['currentPosition']) . ' ' . $this->transEsc('of') . ' ' . $this->localizedNumber($this->scrollData['resultTotal']) . ' ' . $this->transEsc('results') ?>
+ #<?=$this->localizedNumber($this->scrollData['currentPosition']) . ' ' . $this->transEsc('of') . ' ' . $this->localizedNumber($this->scrollData['resultTotal']) . ' ' . $this->transEsc('results')?>
<? if ($this->scrollData['nextRecord']): ?>
<li>
<a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
</li>
<? else: ?>
- <li class="disabled"><a href="#"><?=$this->transEsc('Next')?> »</a></li>
+ <li class="disabled">
+ <a href="#"><?=$this->transEsc('Next')?> »</a>
+ </li>
<? endif; ?>
</ul>
<? endif; ?>
@@ -45,7 +49,7 @@
<div class="<?=$this->layoutClass('mainbody')?>">
<div class="record recordId source<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" id="record">
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" id="record_id" />
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource()) ?>" class="hiddenSource" />
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
<?=$this->flashmessages()?>
<?=$this->record($this->driver)->getCoreMetadata()?>
</div>
@@ -69,8 +73,8 @@
if (!$obj->isVisible()) { $tab_classes[] = 'hide'; }
if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
?>
- <li class="tab-title <?=count($tab_classes) > 0 ? ' ' . implode(' ', $tab_classes) . '' : ''?>">
- <a id="<?=strtolower($tab) ?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>"><?=$this->transEsc($desc)?></a>
+ <li class="tab-title <?=count($tab_classes) > 0 ? ' ' . implode(' ', $tab_classes) . ' ' : ' '?>">
+ <a class="<?=strtolower($tab)?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>"><?=$this->transEsc($desc)?></a>
</li>
<? endforeach; ?>
</ul>
@@ -85,7 +89,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/finc/templates/search/searchbox.phtml b/themes/finc/templates/search/searchbox.phtml
index f3c6c077c4e36a27a7f4847c60ec8979c87019c4..07e4108b6d138295232ce716c191378ebf764b3f 100644
--- a/themes/finc/templates/search/searchbox.phtml
+++ b/themes/finc/templates/search/searchbox.phtml
@@ -19,34 +19,27 @@ $lastSort = $options->getLastSort();
$lastLimit = $options->getLastLimit();
?>
<? if ($this->searchType == 'advanced'): ?>
- <div id="searchForm">
+ <div class="searchForm">
<? $tabs = $this->render('search/searchTabs'); ?>
- <? if (!empty($tabs)): ?><?= $tabs ?>
- <div class="tabs-content clearfix"><? endif; ?>
+ <? if (!empty($tabs)): ?><?= $tabs ?><div class="tabs-content clearfix"><? endif; ?>
<p class="adv_search_terms"><?= $this->transEsc("Your search terms") ?> : "<strong><?= $this->escapeHtml($this->lookfor) ?></strong>"</p>
- <ul class="adv_search_links"><!-- this ul-li is better than the original p-a-list - stick to it - CK -->
- <li>
- <a href="<?= $this->url($advSearch) ?>?edit=<?= $this->escapeHtmlAttr($this->searchId) ?>"><?= $this->transEsc("Edit this Advanced Search") ?></a>
- </li>
- <li>
- <a href="<?= $this->url($advSearch) ?>"><?= $this->transEsc("Start a new Advanced Search") ?></a>
- </li>
- <li>
- <a href="<?= $this->url($searchHome) ?>"><?= $this->transEsc("Start a new Basic Search") ?></a>
- </li>
+ <ul class="adv_search_links">
+ <li><a href="<?= $this->url($advSearch) ?>?edit=<?= $this->escapeHtmlAttr($this->searchId) ?>"><?= $this->transEsc("Edit this Advanced Search") ?></a></li>
+ <li><a href="<?= $this->url($advSearch) ?>"><?= $this->transEsc("Start a new Advanced Search") ?></a></li>
+ <li><a href="<?= $this->url($searchHome) ?>"><?= $this->transEsc("Start a new Basic Search") ?></a></li>
</ul>
<? if (!empty($tabs)): ?></div><? endif; ?>
</div>
<? else: ?>
-<form role="search" method="get" action="<?= $this->url($basicSearch) ?>" name="searchForm" id="searchForm" autocomplete="off" class="inline">
+<form class="searchForm inline" role="search" method="get" action="<?= $this->url($basicSearch) ?>" name="searchForm" autocomplete="off">
<?= $this->render('search/searchTabs'); ?>
<ul class="left list-unstyled">
<li class="has-form">
- <input class="search-query<? if ($this->searchbox()->autocompleteEnabled($this->searchClassId)): ?> autocomplete searcher:<?= $this->escapeHtmlAttr($this->searchClassId) ?><? endif ?>" id="searchForm_lookfor" type="text" name="lookfor" value="<?= $this->escapeHtmlAttr($this->lookfor) ?>" required="required"/>
+ <input class="searchForm_lookfor form-control search-query<? if ($this->searchbox()->autocompleteEnabled($this->searchClassId)): ?> autocomplete searcher:<?= $this->escapeHtmlAttr($this->searchClassId) ?><? endif ?>" type="text" name="lookfor" value="<?= $this->escapeHtmlAttr($this->lookfor) ?>" required="required"/>
</li>
<? if ($handlerCount > 1): ?>
<li class="has-form">
- <select id="searchForm_type" name="type" data-native-menu="false">
+ <select class="searchForm_type form-control" name="type" data-native-menu="false">
<? foreach ($handlers as $handler): ?>
<option value="<?= $this->escapeHtmlAttr($handler['value']) ?>"<?= $handler['selected'] ? ' selected="selected"' : '' ?>><?= $handler['indent'] ? '-- ' : '' ?><?= $this->transEsc($handler['label']) ?></option>
<? endforeach; ?>
@@ -60,7 +53,7 @@ $lastLimit = $options->getLastLimit();
</li>
<? if ($advSearch): ?>
<li class="has-form">
- <a href="<?= $this->url($advSearch) ?>" class="button secondary postfix" role="button" rel="nofollow"><?= $this->transEsc("Advanced") ?></a>
+ <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : '')?>" class="button secondary postfix" role="button" rel="nofollow"><?=$this->transEsc("Advanced")?></a>
</li>
<? endif; ?>
</ul>
@@ -87,8 +80,8 @@ $lastLimit = $options->getLastLimit();
<? if ((isset($hasDefaultsApplied) && $hasDefaultsApplied) || !empty($filterDetails)): ?>
<? $defaultFilterState = $options->getRetainFilterSetting() ? ' checked="checked"' : ''; ?>
<div class="checkbox" id="keepfilters">
- <input onChange="$('.applied-filter').click()" type="checkbox"<?= $defaultFilterState ?> id="searchFormKeepFilters"/>
- <label for="searchFormKeepFilters"><?= $this->transEsc("basic_search_keep_filters") ?></label>
+ <input onChange="$('.applied-filter').click()" type="checkbox"<?= $defaultFilterState ?> class="searchFormKeepFilters"/>
+ <label><?=$this->transEsc("basic_search_keep_filters")?></label>
</div>
<div class="hide">
<? foreach ($filterDetails as $current): ?>
@@ -116,6 +109,6 @@ $lastLimit = $options->getLastLimit();
}
?>
</form>
-<script type="text/javascript">$("#searchForm_lookfor").focus()</script>
+<script type="text/javascript">$(".searchForm_lookfor:visible").focus()</script>
<? endif; ?>
<!-- search - searchbox.PHTML end -->
\ No newline at end of file
diff --git a/themes/foundation5/templates/RecordDriver/SolrDefault/core.phtml b/themes/foundation5/templates/RecordDriver/SolrDefault/core.phtml
index f0a24df82603113253180b4deb89e3683af7bcbd..22dab79500bc9b140e0eaa94c83146f0fe2fdfe2 100644
--- a/themes/foundation5/templates/RecordDriver/SolrDefault/core.phtml
+++ b/themes/foundation5/templates/RecordDriver/SolrDefault/core.phtml
@@ -259,7 +259,7 @@ if($loggedin = $this->auth()->isLoggedIn()) {
<th><?=$this->transEsc('Tags')?>: </th>
<td>
<span class="right hide-for-print">
- <a class="tagRecord modal-link right" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i> <?=$this->transEsc('Add Tag')?></a>
+ <a class="tagRecord modal-link right" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><i class="fa fa-plus"></i><?=$this->transEsc('Add Tag')?></a>
</span>
<?=$this->context($this)->renderInContext('record/taglist', array('tagList'=>$tagList, 'loggedin'=>$loggedin)) ?>
</td>
diff --git a/themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml b/themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml
index 450bfadb9bc72297197747791e57e1a31ebb2dae..2f2dbe78ee2f711d528d3362a2428ad273062520 100644
--- a/themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml
+++ b/themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml
@@ -1,12 +1,12 @@
<!-- recordDriver - solrDefault - RESULT-LIST.phtml -->
-<div class="<?=$this->driver->supportsAjaxStatus()?'ajaxItem ':''?> small-11 columns">
+<div class="<?=$this->driver->supportsAjaxStatus() ? 'ajaxItem ' : ''?> small-11 columns">
<div class="row">
<div>
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId" />
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
</div>
<? if ($cover = $this->record($this->driver)->getCover('result-list', 'medium', $this->recordLink()->getUrl($this->driver))): ?>
- <div class="small-3 medium-2 columns left"><?= $cover ?></div>
+ <div class="small-3 medium-2 columns left"><?=$cover?></div>
<? endif ?>
<div class="<?=$cover ? 'small-6 medium-7' : 'small-9'?> columns middle">
<div>
@@ -17,7 +17,7 @@
<div>
<? if ($this->driver->isCollection()): ?>
- <?=implode('<br>', array_map(array($this, 'escapeHtml'), $this->driver->getSummary())); ?>
+ <?=implode('<br>', array_map(array($this, 'escapeHtml'), $this->driver->getSummary()));?>
<? else: ?>
<? $summAuthor = $this->driver->getPrimaryAuthor();
if (!empty($summAuthor)): ?>
@@ -37,7 +37,7 @@
<?=!empty($summAuthor) ? '<br />' : ''?>
<?=$this->transEsc('Published in')?>
<? $containerID = $this->driver->getContainerRecordID(); ?>
- <? /* TODO: handle highlighting more elegantly here: */?>
+ <? /* TODO: handle highlighting more elegantly here: */ ?>
<a href="<?=($containerID ? $this->recordLink()->getUrl("VuFind|$containerID") : $this->record($this->driver)->getLink('journaltitle', str_replace(array('{{{{START_HILITE}}}}', '{{{{END_HILITE}}}}'), '', $journalTitle)))?>"><?=$this->highlight($journalTitle)?></a>
<?=!empty($summDate) ? ' (' . $this->escapeHtml($summDate[0]) . ')' : ''?>
<? elseif (!empty($summDate)): ?>
@@ -60,10 +60,10 @@
<? if (!$this->driver->isCollection()): ?>
<? if ($snippet = $this->driver->getHighlightedSnippet()): ?>
<? if (!empty($snippet['caption'])): ?>
- <strong><?=$this->transEsc($snippet['caption']) ?>:</strong> ';
+ <strong><?=$this->transEsc($snippet['caption'])?>:</strong> ';
<? endif; ?>
<? if (!empty($snippet['snippet'])): ?>
- <span class="quotestart">“</span>...<?=$this->highlight($snippet['snippet']) ?>...<span class="quoteend">”</span><br/>
+ <span class="quotestart">“</span>...<?=$this->highlight($snippet['snippet'])?>...<span class="quoteend">”</span><br/>
<? endif; ?>
<? endif; ?>
<? endif; ?>
@@ -168,7 +168,7 @@
<? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Add to favorites */ ?>
- <i class="fa fa-fw fa-star"></i> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" data-id="<?=$this->driver->getUniqueId() ?>" title="<?=$this->transEsc('Add to favorites')?>"><?=$this->transEsc('Add to favorites')?></a><br/>
+ <i class="fa fa-fw fa-star"></i> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" data-id="<?=$this->driver->getUniqueId()?>" title="<?=$this->transEsc('Add to favorites')?>"><?=$this->transEsc('Add to favorites')?></a><br/>
<? /* Saved lists */ ?>
<div class="savedLists hide alert-box info" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
@@ -190,7 +190,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>
</div>
diff --git a/themes/foundation5/templates/collection/view.phtml b/themes/foundation5/templates/collection/view.phtml
index 407134d9cfddd6be0d8facf6681fd9879cd4fd5b..e14ee03359429f16c786277308c203b39aa403ad 100644
--- a/themes/foundation5/templates/collection/view.phtml
+++ b/themes/foundation5/templates/collection/view.phtml
@@ -50,8 +50,8 @@ $this->layout()->breadcrumbs .= '<li><a href="' . $this->url('collections-home')
<div class="row">
<div class="<?=$tree ? 'medium-12 columns' : $this->layoutClass('mainbody')?>">
<div class="record">
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" id="record_id"/>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource"/>
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" id="record_id" />
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
<?=$this->flashmessages()?>
<?=$this->record($this->driver)->getCollectionMetadata()?>
</div>
@@ -72,22 +72,18 @@ $this->layout()->breadcrumbs .= '<li><a href="' . $this->url('collections-home')
$this->layout()->breadcrumbs .= ' <li class="active">' . $this->transEsc($desc) . '</li>';
$activeTabObj = $obj;
}
- if (!$obj->isVisible()) {
- $tab_classes[] = 'hide';
- }
- if (!$obj->supportsAjax()) {
- $tab_classes[] = 'noajax';
- }
+ if (!$obj->isVisible()) { $tab_classes[] = 'hide'; }
+ if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
?>
- <li<?=count($tab_classes) > 0 ? ' class="' . implode(' ', $tab_classes) . '"' : ''?>>
+ <li<?=count($tab_classes) > 0 ? ' class="tab-title ' . implode(' ', $tab_classes) . '"' : ''?>>
<a class="<?=strtolower($tab)?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>#tabnav"><?=$this->transEsc($desc)?></a>
</li>
<? endforeach; ?>
</ul>
- <div class="tabs-content collectionDetails<?=$tree ? 'Tree' : ''?>">
+ <div class="tabs-content collectionDetails<?=$tree ? 'Tree' : ''?>" id="record-tabs">
<? if (!$this->ajaxTabs || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
- <div class="content active <?=$this->activeTab?>-tab">
+ <div class="content active" id="<?=$this->activeTab ?>-tab">
<?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
</div>
<? endif; ?>
@@ -107,3 +103,4 @@ $this->layout()->breadcrumbs .= '<li><a href="' . $this->url('collections-home')
<? endif; ?>
</div>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(recordDocReady);', 'SET');?>
+<!-- collection - VIEW.phtml end -->
\ No newline at end of file
diff --git a/themes/foundation5/templates/header.phtml b/themes/foundation5/templates/header.phtml
index cd432ec42bb69da48866fddbfbff0fca62c0b017..be26670a1f11a6346c0d4b85f10be996e6190c1e 100644
--- a/themes/foundation5/templates/header.phtml
+++ b/themes/foundation5/templates/header.phtml
@@ -24,7 +24,7 @@
<? endif; ?>
<? $cart = $this->cart(); if ($cart->isActive()): ?>
<li id="cartSummary">
- <a id="cartItems" class="modal-link" title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>"><i class="fa fa-clipboard "></i> <strong><?=count($cart->getItems())?></strong> <?=$this->transEsc('items')?><?=$cart->isFull() ? ' (' . $this->transEsc('bookbag_full') . ')' : ''?></a>
+ <a id="cartItems" class="modal-link" title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>"><i class="fa fa-clipboard"></i> <strong><?=count($cart->getItems())?></strong> <?=$this->transEsc('items')?><?=$cart->isFull() ? ' (' . $this->transEsc('bookbag_full') . ')' : ''?></a>
</li>
<? endif; ?>
<? if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable ?>
diff --git a/themes/foundation5/templates/record/view.phtml b/themes/foundation5/templates/record/view.phtml
index 39c7c1109a72569d7fa1b4cfb440249819da333b..db711cfe888075ecb686866e8627c6865547e171 100644
--- a/themes/foundation5/templates/record/view.phtml
+++ b/themes/foundation5/templates/record/view.phtml
@@ -23,9 +23,7 @@ $this->layout()->title = $this->driver->getShortTitle();
<ul class="pager hide-for-print">
<? if ($this->scrollData['previousRecord']): ?>
<li>
- <a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>"
- rel="nofollow">« <?=$this->transEsc('Prev')?>
- </a>
+ <a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['previousRecord'])?>" title="<?=$this->transEsc('Previous Search Result')?>" rel="nofollow">« <?=$this->transEsc('Prev')?></a>
</li>
<? else: ?>
<li class="disabled">
@@ -35,9 +33,7 @@ $this->layout()->title = $this->driver->getShortTitle();
#<?=$this->localizedNumber($this->scrollData['currentPosition']) . ' ' . $this->transEsc('of') . ' ' . $this->localizedNumber($this->scrollData['resultTotal']) . ' ' . $this->transEsc('results')?>
<? if ($this->scrollData['nextRecord']): ?>
<li>
- <a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>"
- rel="nofollow"><?=$this->transEsc('Next')?> »
- </a>
+ <a class="button" role="button" href="<?=$this->recordLink()->getUrl($this->scrollData['nextRecord'])?>" title="<?=$this->transEsc('Next Search Result')?>" rel="nofollow"><?=$this->transEsc('Next')?> »</a>
</li>
<? else: ?>
<li class="disabled">
@@ -52,8 +48,8 @@ $this->layout()->title = $this->driver->getShortTitle();
<div class="row">
<div class="<?=$this->layoutClass('mainbody')?>">
<div class="record source<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>">
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId"/>
- <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource"/>
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" class="hiddenId" />
+ <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
<?=$this->flashmessages()?>
<?=$this->record($this->driver)->getCoreMetadata()?>
</div>
@@ -78,13 +74,12 @@ $this->layout()->title = $this->driver->getShortTitle();
if (!$obj->supportsAjax()) { $tab_classes[] = 'noajax'; }
?>
<li class="tab-title <?=count($tab_classes) > 0 ? ' ' . implode(' ', $tab_classes) . ' ' : ' '?>">
- <? /* <li<?=count($tab_classes) > 0 ? ' class="' . implode(' ', $tab_classes) . '"' : ''?>>*/ ?>
<a class="<?=strtolower($tab)?>" href="<?=$this->recordLink()->getTabUrl($this->driver, $tab)?>#tabnav"><?=$this->transEsc($desc)?></a>
</li>
<? endforeach; ?>
</ul>
- <div class="tabs-content">
+ <div class="tabs-content" id="record-tabs">
<? if (!$this->ajaxTabs || !isset($activeTabObj) || !$activeTabObj->supportsAjax()): ?>
<div class="content active" id="<?=$this->activeTab?>-tab">
<?=isset($activeTabObj) ? $this->record($this->driver)->getTab($activeTabObj) : ''?>
diff --git a/themes/foundation5/templates/search/searchbox.phtml b/themes/foundation5/templates/search/searchbox.phtml
index be6610336805cd88820fd5af8e68a0ed30468c70..e52852421885e7d8e8206f9d0178d78dc0898d88 100644
--- a/themes/foundation5/templates/search/searchbox.phtml
+++ b/themes/foundation5/templates/search/searchbox.phtml
@@ -31,10 +31,12 @@ $lastLimit = $options->getLastLimit();
<? if (!empty($tabs)): ?></div><? endif; ?>
</div>
<? else: ?>
-<form class="searchForm inline" role="search" method="get" action="<?= $this->url($basicSearch) ?>" name="searchForm" autocomplete="off">
+<form class="searchForm inline" role="search" method="get" action="<?= $this->url($basicSearch) ?>" name="searchForm" autocomplete="off">
<?= $this->render('search/searchTabs'); ?>
<ul class="left list-unstyled">
- <li class="has-form"><input class="searchForm_lookfor form-control search-query<? if ($this->searchbox()->autocompleteEnabled($this->searchClassId)): ?> autocomplete searcher:<?= $this->escapeHtmlAttr($this->searchClassId) ?><? endif ?>" type="text" name="lookfor" value="<?= $this->escapeHtmlAttr($this->lookfor) ?>"/></li>
+ <li class="has-form">
+ <input class="searchForm_lookfor form-control search-query<? if ($this->searchbox()->autocompleteEnabled($this->searchClassId)): ?> autocomplete searcher:<?= $this->escapeHtmlAttr($this->searchClassId) ?><? endif ?>" type="text" name="lookfor" value="<?= $this->escapeHtmlAttr($this->lookfor) ?>"/>
+ </li>
<? if ($handlerCount > 1): ?>
<li class="has-form">
<select class="searchForm_type form-control" name="type" data-native-menu="false">
@@ -51,7 +53,7 @@ $lastLimit = $options->getLastLimit();
</li>
<? if ($advSearch): ?>
<li class="has-form">
- <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : '') ?>" class="button secondary postfix" role="button" rel="nofollow"><?= $this->transEsc("Advanced") ?></a>
+ <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : '')?>" class="button secondary postfix" role="button" rel="nofollow"><?=$this->transEsc("Advanced")?></a>
</li>
<? endif; ?>
</ul>
@@ -78,8 +80,8 @@ $lastLimit = $options->getLastLimit();
<? if ((isset($hasDefaultsApplied) && $hasDefaultsApplied) || !empty($filterDetails)): ?>
<? $defaultFilterState = $options->getRetainFilterSetting() ? ' checked="checked"' : ''; ?>
<div class="checkbox" id="keepfilters">
- <input onChange="$('.applied-filter').click()" type="checkbox"<?= $defaultFilterState ?> class="searchFormKeepFilters"/>
- <label><?= $this->transEsc("basic_search_keep_filters") ?></label>
+ <input onChange="$('.applied-filter').click()" type="checkbox"<?= $defaultFilterState ?> class="searchFormKeepFilters"/>
+ <label><?=$this->transEsc("basic_search_keep_filters")?></label>
</div>
<div class="hide">
<? foreach ($filterDetails as $current): ?>
@@ -107,6 +109,6 @@ $lastLimit = $options->getLastLimit();
}
?>
</form>
- <script type="text/javascript">$(".searchForm_lookfor:visible").focus()</script>
+<script type="text/javascript">$(".searchForm_lookfor:visible").focus()</script>
<? endif; ?>
<!-- search - searchbox.PHTML end -->
\ No newline at end of file