Format List Cleanup (#720)

- Simplify format-list logic with LESS.
- Use CSS to insert commas between formats on record view.

themes/bootstrap3/less/components/record.less

@@ -38,6 +38,10 @@
   text-decoration: none;
 }
 
+.record .format::after { content: ", "; }
+.result .record .format::after,
+.record .format:last-child::after { content: ""; }
+
 .marc-row-LEADER,
 .marc-row-006,
 .marc-row-007,

themes/bootstrap3/less/components/search.less

@@ -63,6 +63,11 @@
     .checkbox { padding: 0; }
     .media-left { padding-right: 0; }
   }
+
+  .format {
+    &:extend(.label);
+    &:extend(.label-info);
+  }
 }
 
 .result.embedded {

themes/bootstrap3/less/components/sidebar.less

@@ -36,6 +36,10 @@ label.list-group-item {
 }
 .list-group-item.title {font-weight: bold;}
 .sidebar .facet a {text-decoration: none;}
+.sidebar .format {
+  &:extend(.label);
+  &:extend(.label-info);
+}
 .top-row .applied {
   font-weight: bold;
   &:hover {

themes/bootstrap3/templates/RecordDriver/Pazpar2/result-list.phtml

@@ -94,7 +94,7 @@
         <? endif; ?>
       <? endif; ?>
 
-      <?=str_replace('class="', 'class="label label-info ', $this->record($this->driver)->getFormatList())?>
+      <?=$this->record($this->driver)->getFormatList() ?>
 
       <? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?>
         <span class="status ajax-availability small">

themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml

@@ -123,7 +123,7 @@
         </tr>
       <? endif; ?>
 
-      <? $formats = $this->driver->getFormats(); if (!empty($formats)): ?>
+      <? if (count($this->driver->getFormats()) > 0): ?>
         <tr>
           <th><?=$this->transEsc('Format')?>: </th>
           <td><?=$this->record($this->driver)->getFormatList()?></td>

themes/bootstrap3/templates/RecordDriver/SolrDefault/format-list.phtml

 <? foreach ($this->driver->getFormats() as $format): ?>
-  <span class="iconlabel <?=$this->record($this->driver)->getFormatClass($format)?>"><?=$this->transEsc($format)?></span>
+  <span class="format <?=$this->record($this->driver)->getFormatClass($format) ?>"><?=$this->transEsc($format) ?></span>
 <? endforeach; ?>

themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml

@@ -158,7 +158,8 @@
                 <? endif; ?>
               <? endif; ?>
             <br/>
-            <?=str_replace('class="', 'class="label label-info ', $this->record($this->driver)->getFormatList())?>
+
+            <?=$this->record($this->driver)->getFormatList() ?>
 
             <? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?>
               <span class="status ajax-availability hidden"><?=$this->transEsc('Loading')?>...</span>

themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml

@@ -138,7 +138,7 @@
           <? endif; ?>
         <? endif; ?>
 
-        <?=str_replace('class="', 'class="label label-info ', $this->record($this->driver)->getFormatList())?>
+        <?=$this->record($this->driver)->getFormatList() ?>
 
         <? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?>
           <span class="status ajax-availability hidden">

themes/bootstrap3/templates/myresearch/checkedout.phtml

@@ -57,7 +57,7 @@
       <? $i = 0; foreach ($this->transactions as $resource): ?>
         <hr/>
         <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
-        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="row">
+        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="row result">
           <? if ($this->renewForm): ?>
             <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
               <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
@@ -100,8 +100,8 @@
               <?=$this->transEsc('by')?>:
               <a href="<?=$this->record($resource)->getLink('author', $listAuthors[0])?>"><?=$this->escapeHtml($listAuthors[0])?></a><? if (count($listAuthors) > 1): ?>, <?=$this->transEsc('more_authors_abbrev')?><? endif; ?><br/>
             <? endif; ?>
-            <? $formats = $resource->getFormats(); if (count($formats) > 0): ?>
-              <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?>
+            <? if (count($resource->getFormats()) > 0): ?>
+              <?=$this->record($resource)->getFormatList() ?>
               <br/>
             <? endif; ?>
             <? if (!empty($ilsDetails['volume'])): ?>

themes/bootstrap3/templates/myresearch/holds.phtml

@@ -42,7 +42,7 @@
         <hr/>
         <? $iteration++; ?>
         <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
-        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row">
+        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row result">
           <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
             <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
             <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
@@ -83,8 +83,8 @@
               <a href="<?=$this->record($resource)->getLink('author', $listAuthors[0])?>"><?=$this->escapeHtml($listAuthors[0])?></a><? if (count($listAuthors) > 1): ?>, <?=$this->transEsc('more_authors_abbrev')?><? endif; ?><br/>
             <? endif; ?>
 
-            <? $formats = $resource->getFormats(); if (count($formats) > 0): ?>
-              <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?>
+            <? if (count($resource->getFormats()) > 0): ?>
+              <?=$this->record($resource)->getFormatList() ?>
               <br/>
             <? endif; ?>
             <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?>

themes/bootstrap3/templates/myresearch/illrequests.phtml

@@ -43,7 +43,7 @@
         <hr/>
         <? $iteration++; ?>
         <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
-        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row">
+        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row result">
           <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
             <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
             <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
@@ -84,8 +84,8 @@
               <a href="<?=$this->record($resource)->getLink('author', $listAuthors[0])?>"><?=$this->escapeHtml($listAuthors[0])?></a><? if (count($listAuthors) > 1): ?>, <?=$this->transEsc('more_authors_abbrev')?><? endif; ?><br/>
             <? endif; ?>
 
-            <? $formats = $resource->getFormats(); if (count($formats) > 0): ?>
-              <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?>
+            <? if (count($resource->getFormats()) > 0): ?>
+              <?=$this->record($resource)->getFormatList() ?>
               <br/>
             <? endif; ?>
             <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?>

themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml

@@ -41,7 +41,7 @@
         <hr/>
         <? $iteration++; ?>
         <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
-        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row">
+        <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row result">
           <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?>
             <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?>
             <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" />
@@ -81,8 +81,8 @@
               <a href="<?=$this->record($resource)->getLink('author', $listAuthors[0])?>"><?=$this->escapeHtml($listAuthors[0])?></a><? if (count($listAuthors) > 1): ?>, <?=$this->transEsc('more_authors_abbrev')?><? endif; ?><br/>
             <? endif; ?>
 
-            <? $formats = $resource->getFormats(); if (count($formats) > 0): ?>
-              <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?>
+            <? if (count($resource->getFormats()) > 0): ?>
+              <?=$this->record($resource)->getFormatList() ?>
               <br/>
             <? endif; ?>
             <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?>