Merge branch 'instance/fid' into instance/fid_adlr

module/finc/src/finc/Controller/CustomTraits/GviRecordTrait.php

 <?php
 /**
- * finc specific model for MARC records with a fullrecord in Solr.
+ * Finc specific model for MARC records with a fullrecord in Solr.
  *
  * PHP version 7
  *
@@ -28,7 +28,7 @@
 namespace finc\Controller\CustomTraits;
 
 /**
- * fid specific model for MARC records with a fullrecord in Solr.
+ * Fid specific model for MARC records with a fullrecord in Solr.
  *
  * @category VuFind
  * @package  Controller
@@ -39,7 +39,7 @@ namespace finc\Controller\CustomTraits;
 trait GviRecordTrait
 {
     /**
-     * returns all ctrlnums from either the solr field or marc data
+     * Returns all ctrlnums from either the solr field or marc data
      *
      * @return array might be an empty array if nothing can be found
      * @throws \File_MARC_Exception
@@ -47,7 +47,8 @@ trait GviRecordTrait
     public function getCtrlnum()//php_8//: array
     {
         $ctrls = [];
-        // trying to source ctrlnums from either direct solr fields or the corresponding marc set
+        // trying to source ctrlnums from either direct solr fields
+        // or the corresponding marc set
         if (isset($this->fields['ctrlnum'])) {
             $ctrls = $this->fields['ctrlnum'];
         } elseif ($field = $this->getMarcRecord()->getFields('35')) {
@@ -61,7 +62,8 @@ trait GviRecordTrait
     }
 
     /**
-     * Extracts a GVI-ID from the data we got, there might be none available or even more than one, in case of
+     * Extracts a GVI-ID from the data we got,
+     * there might be none available or even more than one, in case of
      * multiple instances, the most fitting one gets chosen
      *
      * @param string $isil ISIL of the Network the user is residing in, can be empty
@@ -74,11 +76,12 @@ trait GviRecordTrait
             return false;
         }
 
-        // extracts all possible GVI ids out of the ctrlnum field, it's nothing more than creating a dictionary
+        // extracts all possible GVI ids out of the ctrlnum field,
+        // it's nothing more than creating a dictionary
         $ctrl_arr = [];
         foreach ($ctrls as $row) {
             if (preg_match('{(\(.+\))(.+)}', $row, $re)) {
-                $ctrl_arr[$re[1]] = $re[0]; # '(DE-602)' => "(DE-602)452235435"
+                $ctrl_arr[$re[1]] = $re[0]; /* '(DE-602)' => "(DE-602)452235435" */
             }
         }
 

module/finc/src/finc/Controller/CustomTraits/PdaTrait.php

@@ -30,11 +30,11 @@
  */
 namespace finc\Controller\CustomTraits;
 
-use VuFind\Exception\Mail as MailException;
 use finc\Mailer\Mailer;
 use Laminas\Mail\Address;
-use Laminas\Validator\StringLength;
 use Laminas\Validator\Identical;
+use Laminas\Validator\StringLength;
+use VuFind\Exception\Mail as MailException;
 
 /**
  * PDA Trait
@@ -44,6 +44,7 @@ use Laminas\Validator\Identical;
  * @author   Demian Katz <demian.katz@villanova.edu>
  * @author   Frank Morgner <morgnerf@ub.uni-leipzig.de>
  * @author   André Lahmann <lahmann@ub.uni-leipzig.de>
+ * @author   JP Kanter <kanter@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
@@ -119,6 +120,7 @@ trait PdaTrait
             // Collect the data submitted by form
             $params['field_of_study'] = !empty($view->pdaFieldOfStudy) ? $view->pdaFieldOfStudy : '';
             $params['statement'] = !empty($view->pdaStatement) ? $view->pdaStatement : '';
+            $params['insta_loan'] = !empty($view->pdaInstaLoan) ? $view->pdaInstaLoan : 'off'; // #24930
 
             // Validate data submitted by form
             $isValid = true;
@@ -176,6 +178,7 @@ trait PdaTrait
         if ($this->getRequest()->isPost()) {
             $view->pdaFieldOfStudy = $this->params()->fromPost('pdaFieldOfStudy');
             $view->pdaStatement = $this->params()->fromPost('pdaStatement');
+            $view->pdaInstaLoan = $this->params()->fromPost('pdaInstaLoan'); // refs #24930
         }
 
         return $view;

themes/finc/scss/components/_modal.scss

@@ -71,3 +71,8 @@
 .modal .table-resp-data td {
   word-break: break-word;
 }
+
+// set overlay-color
+#modal {
+  background-color: $overlay-color;
+}

themes/finc/scss/components/_offcanvas.scss

@@ -30,8 +30,6 @@
 }
 
 
-
-
 // *****************************************************************
 // ************ Off-canvas in Sidebar ******************************
 // *****************************************************************
@@ -82,7 +80,6 @@
 }
 
 
-
 // *****************************************************************
 // ************ Sidebar with offcanvas active **********************
 // *****************************************************************
@@ -101,6 +98,39 @@
 }
 
 
+// *****************************************************************
+// ************ Offcanvas Overlay **********************************
+// *****************************************************************
+.offcanvas-overlay {
+  // Overwrite BS Theme components/offcanvass.scss lines 32ff
+  // so definitions will be valid for tablet too
+  @media screen and (max-width: $offcanvas-default-max-width) {
+    background-color: $overlay-color;
+    cursor: pointer;
+    display: none;
+    height: 100%;
+    opacity: 0;
+    position: fixed;
+    top: 0;
+    transition: opacity .5s;
+    width: 100%;
+    z-index: $off-canvas-overlay-z-index;
+
+    .offcanvas.active & {
+      display: block;
+      opacity: 1;
+      transition: opacity .5s;
+    }
+
+    .offcanvas.active.offcanvas-left & {
+      right: -$offcanvas-offset;
+    }
+
+    .offcanvas.active.offcanvas-right & {
+      left: -$offcanvas-offset;
+    }
+  }
+}
 
 // *****************************************************************
 // ************ Tabs View in Result List ***************************