Merge branch 'instance/fid' into instance/fid_bbi

themes/fid/templates/Helpers/openurl.phtml

 <!-- fid: helpers - openurl -->
 <?php
-  //echo $this->inlineScript(\Zend\View\Helper\HeadScript::FILE, 'openurl.js', 'SET');
+  echo $this->inlineScript(\Zend\View\Helper\HeadScript::FILE, 'openurl.js', 'SET');
   $classes = '';
   if ($this->openUrlEmbed) {
     $classes = "fulltext";

themes/fid/templates/ajax/resolverLinks.phtml

@@ -8,17 +8,19 @@
     <div class="openurls">
       <ul>
         <?php foreach ($this->electronic as $link): ?>
-          <li>
-            <?php if (!empty($link['href'])): ?>
-            <?php /* fid: #16136 remove traffic light - GG */?>
-                <a href="<?=$this->escapeHtmlAttr($link['href'])?>" target="_blank" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>>
-                    <i class="icon icon-external-link" aria-hidden="true"></i><?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
-                </a> <br />
-                <?php /* fid: #16136 remove coverage - GG */?>
-            <?php else: ?>
-              <?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
-            <?php endif; ?>
-          </li>
+          <?php if (!empty($link['href'])): ?>
+            <li>
+              <?php if (!empty($link['href'])): ?>
+              <?php /* fid: #16136 remove traffic light - GG */?>
+                  <a href="<?=$this->escapeHtmlAttr($link['href'])?>" target="_blank" title="<?=isset($link['service_type'])?$this->escapeHtmlAttr($link['service_type']):''?>"<?=!empty($link['access'])?' class="access-'.$link['access'].'"':''?>>
+                      <i class="icon icon-external-link" aria-hidden="true"></i><?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
+                  </a> <br />
+                  <?php /* fid: #16136 remove coverage - GG */?>
+              <?php else: ?>
+                <?=isset($link['title'])?$this->escapeHtml($this->transEsc($link['title'])):''?>
+              <?php endif; ?>
+            </li>
+          <?php endif; ?>
         <?php endforeach; ?>
       </ul>
     </div>

themes/fid/theme.config.php

@@ -23,9 +23,6 @@
 
 return [
     'extends' => 'finc',
-    'js' => [
-        'openurl.js',
-    ],
     'helpers' => array(
         'factories' => array(
             'fid\View\Helper\Root\UserGroups' =>