diff --git a/themes/bootstrap/css/screen.css b/themes/bootstrap/css/screen.css
index dab1d6b1eb2acc40cf50c52915b26778bb1e95cb..37a9e242cc9edb6ead02db03f9ca3b894c218b49 100644
--- a/themes/bootstrap/css/screen.css
+++ b/themes/bootstrap/css/screen.css
@@ -14,7 +14,10 @@ li a.hidden {display:none}
.pointer { cursor:pointer }
.sidebar { padding:4px 0 0 0 }
.sidebar h4 { margin:6px 8px }
+.sidebar .checkbox { margin-left:10px }
.sidebar .small { color:#333;margin-top:1px }
+.sidebar a.small { color:#08C }
+.sidebar a.small span { color:#333 }
.small { font-size:85% }
.switch-margins,.row .switch-margins,.row-fluid .switch-margins { display: inline-block; margin:auto 0 }
.tab-container { border:1px solid #DDD;border-top:0;border-radius:0 0 4px 4px;margin-top:-20px;padding:8px 12px;position:relative }
diff --git a/themes/bootstrap/templates/Recommend/CatalogResults.phtml b/themes/bootstrap/templates/Recommend/CatalogResults.phtml
index fbd0863666b97003fe0bbccc759ad005fc3345fe..a388967f338a6cba7bcbd4a9d3e2ef09327231be 100644
--- a/themes/bootstrap/templates/Recommend/CatalogResults.phtml
+++ b/themes/bootstrap/templates/Recommend/CatalogResults.phtml
@@ -1,40 +1,40 @@
<? $searchObject = $this->recommend->getResults(); $results = $searchObject->getResults(); if (!empty($results)): ?>
-<div class="sidegroup">
<h4><?=$this->transEsc('Catalog Results')?></h4>
-
- <ul class="similar">
+ <ul class="nav nav-list">
<? foreach ($results as $driver): ?>
<li>
<? $formats = $driver->getFormats(); $format = isset($formats[0]) ? $formats[0] : ''; ?>
- <span class="<?=$this->record($driver)->getFormatClass($format)?>">
- <a href="<?=$this->recordLink()->getUrl($driver)?>" class="title"><?
- $summHighlightedTitle = $driver->getHighlightedTitle();
- $summTitle = $driver->getTitle();
- if (!empty($summHighlightedTitle)) {
- echo $this->highlight($this->addEllipsis($summHighlightedTitle, $summTitle));
- } else if (!empty($summTitle)) {
- echo $this->escapeHtml($this->truncate($summTitle, 180));
- } else {
- echo $this->transEsc('Title not available');
- }
- ?></a>
- </span>
- <? $summAuthor = $driver->getPrimaryAuthor(); if (!empty($summAuthor)): ?>
- <br />
- <?=$this->transEsc('By')?>:
- <a href="<?=$this->record($driver)->getLink('author', $summAuthor)?>"><?
+ <a href="<?=$this->recordLink()->getUrl($driver)?>" class="title <?=$this->record($driver)->getFormatClass($format)?>">
+ <?
+ $summHighlightedTitle = $driver->getHighlightedTitle();
+ $summTitle = $driver->getTitle();
+ if (!empty($summHighlightedTitle)) {
+ echo $this->highlight($this->addEllipsis($summHighlightedTitle, $summTitle));
+ } else if (!empty($summTitle)) {
+ echo $this->escapeHtml($this->truncate($summTitle, 180));
+ } else {
+ echo $this->transEsc('Title not available');
+ }
+ ?>
+ <? $summAuthor = $driver->getPrimaryAuthor(); if (!empty($summAuthor)): ?>
+ <span class="small pull-right">
+ <? $summDate = $driver->getPublicationDates(); if (!empty($summDate)): ?>
+ <?=$this->transEsc('Published')?>: (<?=$this->escapeHtml($summDate[0])?>)
+ <? endif; ?>
+ </span>
+ </a>
+ <a class="small text-right" href="<?=$this->record($driver)->getLink('author', $summAuthor)?>">
+ <span><?=$this->transEsc('By')?></span>
+ <?
$summHighlightedAuthor = $driver->getHighlightedAuthor();
echo !empty($summHighlightedAuthor)
? $this->highlight($summHighlightedAuthor)
: $this->escapeHtml($summAuthor);
?></a>
<? endif; ?>
- <? $summDate = $driver->getPublicationDates(); if (!empty($summDate)): ?>
- <br/><?=$this->transEsc('Published')?>: (<?=$this->escapeHtml($summDate[0])?>)
- <? endif; ?>
</li>
<? endforeach; ?>
+ <li><a href="<?=$this->url($searchObject->getOptions()->getSearchAction()) . $searchObject->getUrlQuery()->setLimit($searchObject->getOptions()->getDefaultLimit())?>"><?=$this->transEsc('More catalog results')?>...</a></li>
+ <li class="divider"></li>
</ul>
- <p><a href="<?=$this->url($searchObject->getOptions()->getSearchAction()) . $searchObject->getUrlQuery()->setLimit($searchObject->getOptions()->getDefaultLimit())?>"><?=$this->transEsc('More catalog results')?>...</a></p>
-</div>
<? endif ?>
\ No newline at end of file
diff --git a/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml b/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
index e97897371985534dfd7139fac578ae707031aef4..dedc1dba44f34db4eac2465ba75d98098019cd6d 100644
--- a/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
+++ b/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
@@ -17,20 +17,21 @@
}
?>
<? ob_start() ?>
- <dl class="narrowList navmenu">
- <dt><?=$this->transEsc('Keyword Filter')?></dt>
- <dd>
- <form method="get" action="" name="keywordFilterForm" id="keywordFilterForm" class="keywordFilterForm">
- <input id="keywordFilter_lookfor" type="text" name="lookfor" value="<?=$this->escapeHtml($keywordFilter)?>"/>
- <? foreach ($this->recommend->getResults()->getParams()->getFilterList(true) as $field => $filters): ?>
- <? foreach ($filters as $filter): ?>
- <input type="hidden" name="filter[]" value="<?=$this->escapeHtml($filter['field'])?>:"<?=$this->escapeHtml($filter['value'])?>"" />
+ <ul class="nav nav-list">
+ <li class="nav-header"><?=$this->transEsc('Keyword Filter')?></li>
+ <li>
+ <form method="get" action="" name="keywordFilterForm" id="keywordFilterForm" class="keywordFilterForm">
+ <input id="keywordFilter_lookfor" type="text" name="lookfor" value="<?=$this->escapeHtml($keywordFilter)?>"/>
+ <? foreach ($this->recommend->getResults()->getParams()->getFilterList(true) as $field => $filters): ?>
+ <? foreach ($filters as $filter): ?>
+ <input type="hidden" name="filter[]" value="<?=$this->escapeHtml($filter['field'])?>:"<?=$this->escapeHtml($filter['value'])?>"" />
+ <? endforeach; ?>
<? endforeach; ?>
- <? endforeach; ?>
- <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Set')?>"/>
- </form>
- </dd>
- </dl>
+ <input class="btn" type="submit" name="submit" value="<?=$this->transEsc('Set')?>"/>
+ </form>
+ </li>
+ <li class="divider"></li>
+ </ul>
<? $this->sideFacetExtraControls = ob_get_contents(); ?>
<? ob_end_clean(); ?>
<? endif; ?>
diff --git a/themes/bootstrap/templates/Recommend/SummonResults.phtml b/themes/bootstrap/templates/Recommend/SummonResults.phtml
index 87fb5b7aa8f350b8818f3c32a040bc6f99c3b6d0..cdd81b5b5b2c4b418a4a8e8b0f9e706cad356bc7 100644
--- a/themes/bootstrap/templates/Recommend/SummonResults.phtml
+++ b/themes/bootstrap/templates/Recommend/SummonResults.phtml
@@ -1,39 +1,34 @@
<? $searchObject = $this->recommend->getResults(); $results = $searchObject->getResults(); if (!empty($results)): ?>
-<div class="sidegroup">
<h4><?=$this->transEsc('Summon Results')?></h4>
-
- <ul class="unstyled">
+ <ul class="nav nav-list">
<? foreach ($results as $driver): ?>
- <li>
- <? $formats = $driver->getFormats(); $format = isset($formats[0]) ? $formats[0] : ''; ?>
- <span class="<?=$this->record($driver)->getFormatClass($format)?>">
- <a href="<?=$this->recordLink()->getUrl($driver)?>" class="title"><?
- $summHighlightedTitle = $driver->getHighlightedTitle();
- $summTitle = $driver->getTitle();
- if (!empty($summHighlightedTitle)) {
- echo $this->highlight($this->addEllipsis($summHighlightedTitle, $summTitle));
- } else if (!empty($summTitle)) {
- echo $this->escapeHtml($this->truncate($summTitle, 180));
- } else {
- echo $this->transEsc('Title not available');
- }
- ?></a>
- </span>
- <span class="small">
- <? $summAuthor = $driver->getPrimaryAuthor(); if (!empty($summAuthor)): ?>
- <br />
- <?=$this->transEsc('by')?>
- <a href="<?=$this->record($driver)->getLink('author', $summAuthor)?>"><?
- $summHighlightedAuthor = $driver->getHighlightedAuthor();
- echo !empty($summHighlightedAuthor)
- ? $this->highlight($summHighlightedAuthor)
- : $this->escapeHtml($summAuthor);
- ?></a>
- <? endif; ?>
- </span>
- </li>
+ <li>
+ <? $formats = $driver->getFormats(); $format = isset($formats[0]) ? $formats[0] : ''; ?>
+ <a href="<?=$this->recordLink()->getUrl($driver)?>" class="title <?=$this->record($driver)->getFormatClass($format)?>">
+ <?
+ $summHighlightedTitle = $driver->getHighlightedTitle();
+ $summTitle = $driver->getTitle();
+ if (!empty($summHighlightedTitle)) {
+ echo $this->highlight($this->addEllipsis($summHighlightedTitle, $summTitle));
+ } else if (!empty($summTitle)) {
+ echo $this->escapeHtml($this->truncate($summTitle, 180));
+ } else {
+ echo $this->transEsc('Title not available');
+ }
+ ?>
+ </a>
+ <? $summAuthor = $driver->getPrimaryAuthor(); if (!empty($summAuthor)): ?>
+ <a class="small text-right" href="<?=$this->record($driver)->getLink('author', $summAuthor)?>">
+ <?=$this->transEsc('by')?>
+ <?
+ $summHighlightedAuthor = $driver->getHighlightedAuthor();
+ echo !empty($summHighlightedAuthor)
+ ? $this->highlight($summHighlightedAuthor)
+ : $this->escapeHtml($summAuthor);
+ ?>
+ </a>
+ </li>
<? endforeach; ?>
+ <li><a href="<?=$this->url($searchObject->getOptions()->getSearchAction()) . $searchObject->getUrlQuery()->setLimit($searchObject->getOptions()->getDefaultLimit())?>"><?=$this->transEsc('More Summon results')?>...</a></li>
</ul>
- <p><a href="<?=$this->url($searchObject->getOptions()->getSearchAction()) . $searchObject->getUrlQuery()->setLimit($searchObject->getOptions()->getDefaultLimit())?>"><?=$this->transEsc('More Summon results')?>...</a></p>
-</div>
<? endif ?>
\ No newline at end of file
diff --git a/themes/bootstrap/templates/Related/Similar.phtml b/themes/bootstrap/templates/Related/Similar.phtml
index 990eb8dc83c1c8f4a10ff50747623da8285159dd..f4c4a849fc348099749b30f9db02db9774272cfa 100644
--- a/themes/bootstrap/templates/Related/Similar.phtml
+++ b/themes/bootstrap/templates/Related/Similar.phtml
@@ -4,7 +4,8 @@
<ul class="nav nav-list">
<? foreach ($similarRecords as $data): ?>
<li>
- <a href="<?=$this->recordLink()->getUrl($data)?>"><?=$this->escapeHtml($data->getTitle())?>
+ <a href="<?=$this->recordLink()->getUrl($data)?>">
+ <?=$this->escapeHtml($data->getTitle())?>
<span class="small">
<? $author = $data->getPrimaryAuthor(); if (!empty($author)): ?>
<?=$this->transEsc('by')?>: <?=$this->escapeHtml($author);?>