Merge branch 'release-4.1'

95b3d179 · Demian Katz · 91447775 · 60d63f71 · 95b3d179
Commit 95b3d179 authored 7 years ago by Demian Katz
--- a/themes/bootstrap3/templates/RecordTab/holdingsworldcat.phtml
+++ b/themes/bootstrap3/templates/RecordTab/holdingsworldcat.phtml
-<? $holdings = $this->tab->getHoldings(); if ($holdings && count($holdings) > 0): ?>
+<? $holdings = $this->tab->getHoldings(); ?>
-<h3><?=$this->transEsc('Holdings at Other Libraries')?></h3>
+<? if (isset($holdings->diagnostic->message)): ?>
-<table class="table table-striped">
+  <p><?=$this->escapeHtml($holdings->diagnostic->message)?></p>
-<? foreach ($holdings as $holding): ?>
+<? elseif ($holdings && count($holdings) > 0): ?>
-  <tr>
+  <h3><?=$this->transEsc('Holdings at Other Libraries')?></h3>
-    <th colspan="2">
+  <table class="table table-striped">
-      <? if (isset($holding->electronicAddress->text) && !empty($holding->electronicAddress->text)): ?>
+    <? foreach ($holdings as $holding): ?>
-      <a href="<?=$this->escapeHtmlAttr($holding->electronicAddress->text)?>"><?=$this->escapeHtml($holding->physicalLocation)?></a>
+      <tr>
-      <? else: ?>
+        <th colspan="2">
-      <?=$this->escapeHtml($holding->physicalLocation)?>
+          <? if (isset($holding->electronicAddress->text) && !empty($holding->electronicAddress->text)): ?>
+            <a href="<?=$this->escapeHtmlAttr($holding->electronicAddress->text)?>"><?=$this->escapeHtml($holding->physicalLocation)?></a>
+          <? else: ?>
+            <?=$this->escapeHtml($holding->physicalLocation)?>
+          <? endif; ?>
+        </th>
+      </tr>
+      <? if (!empty($holding->physicalAddress->text)): ?>
+        <tr>
+          <th><?=$this->transEsc('Address')?>: </th>
+          <td><?=$this->escapeHtml($holding->physicalAddress->text)?></td>
+        </tr>
      <? endif; ?>
-    </th>
+      <? if (isset($holding->holdingSimple->copiesSummary->copiesCount)): ?>
-  </tr>
+        <tr>
-  <tr>
+          <th><?=$this->transEsc('Copies')?>: </th>
-    <th><?=$this->transEsc('Address')?>: </th>
+          <td><?=$this->escapeHtml($holding->holdingSimple->copiesSummary->copiesCount)?></td>
-    <td><?=$this->escapeHtml($holding->physicalAddress->text)?></td>
+        </tr>
-  </tr>
+      <? endif; ?>
-  <tr>
+    <? endforeach; ?>
-    <th><?=$this->transEsc('Copies')?>: </th>
+  </table>
-    <td><?=$this->escapeHtml($holding->holdingSimple->copiesSummary->copiesCount)?></td>
-  </tr>
-<? endforeach; ?>
-</table>
 <? endif; ?>