From 1821d90cf44692fc90446f7ce39e75de2eed9a66 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 21 Aug 2015 10:20:54 -0400
Subject: [PATCH] Improved template readability. - More concise code. - More
consistent indentation.
---
.../SolrDefault/result-list.phtml | 46 ++++++++-----------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml
index 6c68093317c..120c3a16756 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml
@@ -4,15 +4,10 @@
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId" />
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
</div>
- <? $cover = $this->record($this->driver)->getCover('result-list', 'medium', $this->recordLink()->getUrl($this->driver)); ?>
- <? if ($cover): ?>
- <div class="col-sm-2 col-xs-3 left">
- <?=$cover ?>
- </div>
- <div class="col-sm-7 col-xs-6 middle">
- <? else : ?>
- <div class="col-sm-9 col-xs-9 middle">
+ <? if ($cover = $this->record($this->driver)->getCover('result-list', 'medium', $this->recordLink()->getUrl($this->driver))): ?>
+ <div class="col-sm-2 col-xs-3 left"><?=$cover ?></div>
<? endif ?>
+ <div class="<?=$cover ? 'col-sm-7 col-xs-6' : 'col-sm-9 col-xs-9'?> middle">
<div>
<a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="title">
<?=$this->record($this->driver)->getTitleHtml()?>
@@ -71,27 +66,26 @@
<?
/* Display information on duplicate records if available */
- $dedupData = $this->driver->getDedupData();
- if ($dedupData): ?>
- <div class="dedupInformation">
- <?
- $i = 0;
- foreach ($dedupData as $source => $current) {
- if (++$i == 1) {
- ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
- } else {
- if ($i == 2) {
- ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
+ if ($dedupData = $this->driver->getDedupData()): ?>
+ <div class="dedupInformation">
+ <?
+ $i = 0;
+ foreach ($dedupData as $source => $current) {
+ if (++$i == 1) {
+ ?><span class="currentSource"><a href="<?=$this->recordLink()->getUrl($this->driver)?>"><?=$this->transEsc("source_$source", array(), $source)?></a></span><?
} else {
- ?>, <?
+ if ($i == 2) {
+ ?> <span class="otherSources">(<?=$this->transEsc('Other Sources')?>: <?
+ } else {
+ ?>, <?
+ }
+ ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
}
- ?><a href="<?=$this->recordLink()->getUrl($current['id'])?>"><?=$this->transEsc("source_$source", array(), $source)?></a><?
}
- }
- if ($i > 1) {
- ?>)</span><?
- }?>
- </div>
+ if ($i > 1) {
+ ?>)</span><?
+ }?>
+ </div>
<? endif; ?>
<div class="callnumAndLocation ajax-availability hidden">
--
GitLab