Merge branch 'master' into instance/adlr_link

themes/finc/scss/default.scss

@@ -32,6 +32,10 @@
   margin: .5rem .5rem .5rem 0;
 }
 
+// Internformat
+.pace-car th {min-width: 10%}
+
+// Footer
 .powered-by {
   img {
     height: 1.75em;

themes/foundation5/templates/myresearch/checkedout.phtml

@@ -50,28 +50,44 @@
       <? endforeach; ?>
 
       <? $i = 0; foreach ($this->transactions as $resource): ?>
-        <hr/>
+        <hr />
         <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?>
         <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="row">
+          <? /* If renewals enabled in config.ini, show extra column with checkboxes and make subsequent columns smaller */ ?>
           <? if ($this->renewForm): ?>
             <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?>
+            <div class="small-1 columns">
               <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?>
               <input class="left" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" />
               <input class="left" type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" />
+            </div>
             <? endif; ?>
-          <? endif; ?>
 
-          <? $cover = $this->record($resource)->getCover('checkedout', 'small'); ?>
-          <? if ($cover): ?>
-            <div class="medium-2 columns text-center">
-            <? /* Display thumbnail if appropriate: */ ?>
+            <? $cover = $this->record($resource)->getCover('checkedout', 'small'); ?>
+            <? if ($cover): ?>
+            <div class="small-2 columns text-center">
+              <? /* Display thumbnail if appropriate: */ ?>
               <?=$cover?>
             </div>
 
-            <div class="medium-10 columns">
+            <div class="small-9 columns">
             <? else: ?>
-            <div class="medium-12 columns">
+            <div class="small-11 columns">
             <? endif; ?>
+          <? else: ?>
+          <? /* If renewals NOT enabled in config.ini, make columns wider */ ?>
+            <? $cover = $this->record($resource)->getCover('checkedout', 'small'); ?>
+            <? if ($cover): ?>
+            <div class="small-2 columns text-center">
+              <? /* Display thumbnail if appropriate: */ ?>
+              <?= $cover ?>
+            </div>
+
+            <div class="small-10 columns">
+            <? else: ?>
+            <div class="small-12 columns">
+            <? endif; ?>
+          <? endif; ?>
 
             <?
               // If this is a non-missing Solr record, we should display a link:
@@ -87,14 +103,14 @@
                 // Last resort -- indicate that no title could be found.
                 echo $this->transEsc('Title not available');
               }
-            ?><br/>
+            ?><br />
             <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?>
               <?=$this->transEsc('by')?>:
               <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/>
             <? endif; ?>
             <? $formats = $resource->getFormats(); if (count($formats) > 0): ?>
               <?=str_replace('class="', 'class="label info ', $this->record($resource)->getFormatList())?>
-              <br/>
+              <br />
             <? endif; ?>
             <? if (!empty($ilsDetails['volume'])): ?>
               <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?>

themes/foundation5/templates/search/bulk-action-buttons.phtml

@@ -21,7 +21,7 @@
         <? endif; ?>
       <? endif; ?>
       <? if (isset($this->showCartControls) && $this->showCartControls): ?>
-       <input id="<?= $this->idPrefix ?>updateCart" class="button secondary small" role="button" type="submit" name="add" value="<?= $this->transEsc('Add to Book Bag') ?>" data-dropdown="<?= $this->idPrefix ?>bookbg-dd" data-options="is_hover:true; hover_timeout:5000" aria-controls="bookbg-dd" aria-haspopup="true" />
+       <input id="<?= $this->idPrefix ?>updateCart" class="button secondary small" role="button" type="submit" name="add" value="<?= $this->transEsc('Add to Book Bag') ?>" data-dropdown="<?= $this->idPrefix ?>bookbg-dd" data-options="is_hover:true;" aria-controls="bookbg-dd" aria-haspopup="true" />
         <ul id="<?= $this->idPrefix ?>bookbg-dd" class="f-dropdown" data-dropdown-content aria-hidden="true" aria-autoclose="true" tabindex="-1">
           <li class="bookbg-msg"><?= $this->transEsc('Add to Book Bag') ?></li>
         </ul>