Merge branch 'master-v5' into instance/fid

themes/finc/templates/RecordDriver/DefaultRecord/core.phtml

@@ -13,10 +13,7 @@
       <?php /* Display thumbnail if appropriate: */ ?>
       <?php if ($cover): ?>
         <?=$cover?>
-        <?php /* BOF - finc-specific StyleBasedIcons */ ?>
-      <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
-        <?=$this->record($this->driver)->getFormatIcon()?>
-        <?php /* EOF - finc-specific StyleBasedIcons */ ?>
+          <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
       <?php endif; ?>
 
       <?php /* Display qrcode if appropriate: */ ?>
@@ -36,6 +33,10 @@
         </div>
       <?php endif; ?>
     </div>
+      <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
+  <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
+      <?=$this->record($this->driver)->getRecordIcon()?>
+      <?php /* EOF - finc-specific StyleBasedIcons */ ?>
   <?php endif; ?>
   <div class="media-body">
 

themes/finc/templates/RecordDriver/SolrAI/core.phtml

@@ -14,10 +14,7 @@
       <?php /* Display thumbnail if appropriate: */ ?>
       <?php if($cover): ?>
         <?=$cover?>
-        <?php /* BOF - finc-specific StyleBasedIcons */ ?>
-      <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
-        <?=$this->record($this->driver)->getFormatIcon()?>
-        <?php /* EOF - finc-specific StyleBasedIcons */ ?>
+          <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
       <?php endif; ?>
 
       <?php /* Display qrcode if appropriate: */ ?>
@@ -37,7 +34,11 @@
       </div>
     <?php endif; ?>
   </div>
-      <?php endif; ?>
+      <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
+    <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
+      <?=$this->record($this->driver)->getRecordIcon()?>
+      <?php /* EOF - finc-specific StyleBasedIcons */ ?>
+    <?php endif; ?>
   <div class="media-body">
 
     <?php /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars;

themes/finc/templates/RecordDriver/SolrMarc/core.phtml

@@ -14,10 +14,7 @@
       <?php /* Display thumbnail if appropriate: */ ?>
       <?php if($cover): ?>
         <?=$cover?>
-        <?php /* BOF - finc-specific StyleBasedIcons */ ?>
-      <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
-        <?=$this->record($this->driver)->getFormatIcon()?>
-        <?php /* EOF - finc-specific StyleBasedIcons */ ?>
+        <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, false position - GG */ ?>
       <?php endif; ?>
 
       <?php /* Display qrcode if appropriate: */ ?>
@@ -37,6 +34,12 @@
       </div>
     <?php endif; ?>
   </div>
+      <?php /* if cover or qrcode or preview not set you can not finc-specific StyleBasedIcons, right position - GG */ ?>
+      <?php elseif ($this->record($this->driver)->showStyleBasedIcons()): ?>
+      <?php /* BOF - finc-specific StyleBasedIcons */ ?>
+    <div class="media-left <?=$this->escapeHtmlAttr($coverDetails['size'])?> img-col">
+      <?=$this->record($this->driver)->getRecordIcon()?>
+    </div>
       <?php endif; ?>
   <div class="media-body">