Skip to content
Snippets Groups Projects
Commit 80f1379f authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Merge branch 'release-2.3'

parents aa9c187a 3e239844
No related merge requests found
...@@ -33,48 +33,50 @@ ...@@ -33,48 +33,50 @@
</div> </div>
</div> </div>
<? $facetList = is_object($this->results) ? $this->results->getFacetList() : array(); if (isset($facetList) && is_array($facetList)): ?> <? $facetList = is_object($this->results) ? $this->results->getFacetList() : array(); ?>
<div class="row"> <? if (isset($facetList) && is_array($facetList)): ?>
<? foreach ($facetList as $field => $details): ?> <div class="row">
<? $sortedList = $this->sortFacetList($this->results, $field, $details['list'], $basicSearch); ?> <? foreach ($facetList as $field => $details): ?>
<div class="<?=$field=='callnumber-first' ? 'col-sm-6' : 'col-sm-3' ?>"> <? $sortedList = $this->sortFacetList($this->results, $field, $details['list'], $basicSearch); ?>
<p class="lead"><?=$this->transEsc('home_browse') . ' ' . $this->transEsc($details['label'])?></p> <div class="<?=$field=='callnumber-first' ? 'col-sm-6' : 'col-sm-3' ?>">
<div class="row"> <p class="lead"><?=$this->transEsc('home_browse') . ' ' . $this->transEsc($details['label'])?></p>
<ul class="list-unstyled <?=$field == "callnumber-first" ? 'col-sm-6' : 'col-sm-12' ?>"> <div class="row">
<? /* Special case: two columns for LC call numbers... */ ?> <ul class="list-unstyled <?=$field == "callnumber-first" ? 'col-sm-6' : 'col-sm-12' ?>">
<? if ($field == "callnumber-first"): ?> <? /* Special case: two columns for LC call numbers... */ ?>
<? $i = 0; foreach ($sortedList as $url => $value): ?> <? if ($field == "callnumber-first"): ?>
<? if (!empty($value)): ?> <? $i = 0; foreach ($sortedList as $url => $value): ?>
<li><a href="<?=$url?>"><?=$this->escapeHtml($value)?></a></li> <? if (!empty($value)): ?>
<? else: $i--; ?> <li><a href="<?=$url?>"><?=$this->escapeHtml($value)?></a></li>
<? endif; ?> <? else: $i--; ?>
<? if (++$i == 10): ?> <? endif; ?>
</ul><ul class="list-unstyled col-sm-6"> <? if (++$i == 10): ?>
<? endif; ?> </ul><ul class="list-unstyled col-sm-6">
<? endforeach; ?> <? endif; ?>
<? /* Special case: collections */ ?> <? endforeach; ?>
<? elseif ($field == 'hierarchy_top_title'): ?> <? /* Special case: collections */ ?>
<? $i = 0; foreach ($sortedList as $url => $value): ?> <? elseif ($field == 'hierarchy_top_title'): ?>
<? if (++$i > 10): ?> <? $i = 0; foreach ($sortedList as $url => $value): ?>
<li><a href="<?=$this->url('collections-home')?>"><strong><?=$this->transEsc("More options")?>...</strong></a></li> <? if (++$i > 10): ?>
<? break; ?> <li><a href="<?=$this->url('collections-home')?>"><strong><?=$this->transEsc("More options")?>...</strong></a></li>
<? else: ?> <? break; ?>
<li><a href="<?=$this->url('collections-bytitle')?>?title=<?=urlencode($value)?>"><?=$this->escapeHtml($value)?></a></li> <? else: ?>
<? endif; ?> <li><a href="<?=$this->url('collections-bytitle')?>?title=<?=urlencode($value)?>"><?=$this->escapeHtml($value)?></a></li>
<? endforeach; ?> <? endif; ?>
<? else: ?> <? endforeach; ?>
<? $i = 0; foreach ($sortedList as $url => $value): ?> <? else: ?>
<? if (++$i > 10): ?> <? $i = 0; foreach ($sortedList as $url => $value): ?>
<li><a href="<?=$this->url($advSearch)?>"><strong><?=$this->transEsc("More options")?>...</strong></a></li> <? if (++$i > 10): ?>
<? break; ?> <li><a href="<?=$this->url($advSearch)?>"><strong><?=$this->transEsc("More options")?>...</strong></a></li>
<? elseif (!empty($value)): ?> <? break; ?>
<li><a href="<?=$url?>"><?=$this->escapeHtml($value)?></a></li> <? elseif (!empty($value)): ?>
<? else: $i--; ?> <li><a href="<?=$url?>"><?=$this->escapeHtml($value)?></a></li>
<? endif; ?> <? else: $i--; ?>
<? endforeach; ?> <? endif; ?>
<? endif; ?> <? endforeach; ?>
</ul> <? endif; ?>
</ul>
</div>
</div> </div>
</div> <? endforeach; ?>
<? endforeach; ?> </div>
<? endif; ?> <? endif; ?>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment