Merge remote-tracking branch 'origin/hcu-9' into hcu-9

qcovery · Sep 13, 2023 · c90733f · c90733f
2 parents 004eae1 + 1b23ac5
commit c90733f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 15 deletions.
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
@@ -135,7 +135,7 @@ hideHoldingsTabWhenEmpty = false
 ; See the templates/RecordTab/holdingsils subdirectory of your theme for options.
 ;holdingsTemplate = extended
 ; This page will show by default when a user accesses the MyResearch module:
-defaultAccountPage = Favorites
+defaultAccountPage = CheckedOut
 ; Allow access to the Admin module? (See the access.AdminModule setting in
 ; permissions.ini for more granular ways to restrict Admin access).
 admin_enabled = true

diff --git a/local/config/vufind/searches.ini b/local/config/vufind/searches.ini
@@ -617,7 +617,6 @@ view=full
 ;0 = "(collection_details:\"GBV_ILN_370\" OR collection_details:\"GBV_ILN_22\" OR collection_details:\"GBV_ILN_23\")"
 ;1 = "(collection_details:\"SSG-OLC-ASS\" OR collection_details:\"SSG-OLC-ARC\" OR collection_details:\"SSG-OLC-MFO\" OR collection_details:\"SSG-OPC-BAL\" OR collection_details:\"SSG-OLC-BIF\" OR collection_details:\"SSG-OLC-ETH\" OR collection_details:\"SSG-OLC-FTH\" OR collection_details:\"SSG-OLC-FRK\" OR collection_details:\"SSG-OLC-GEO\" OR collection_details:\"SSG-OLC-HSW\" OR collection_details:\"SSG-OLC-IBA\" OR collection_details:\"SSG-OLC-BUB\" OR collection_details:\"SSG-OLC-IBL\" OR collection_details:\"SSG-OLC-GWK\" OR collection_details:\"SSG-OLC-MAT\" OR collection_details:\"SSG-OLC-MKW\" OR collection_details:\"SSG-OLC-NED\" OR collection_details:\"SSG-OLC-SCA\" OR collection_details:\"SSG-OLC-OAS\" OR collection_details:\"SSG-OLC-OEU\" OR collection_details:\"SSG-OLC-PHI\" OR collection_details:\"SSG-OLC-PHY\" OR collection_details:\"SSG-OLC-POL\" OR collection_details:\"SSG-OLC-JUR\" OR collection_details:\"SSG-OLC-SOW\" OR collection_details:\"SSG-OLC-SPP\" OR collection_details:\"SSG-OLC-SAS\" OR collection_details:\"SSG-OLC-TEC\" OR collection_details:\"SSG-OLC-UMW\" OR collection_details:\"SSG-OLC-VOR\" OR collection_details:\"SSG-OLC-WIW\" OR collection_details:\"SSG-OLC-ZGE\" OR collection:\"DOAJ\" OR collection_details:\"ZDB-1-ACS\" OR collection_details:\"ZDB-1-AIA\" OR collection_details:\"ZDB-1-AIPK\" OR collection_details:\"ZDB-1-APS\" OR collection_details:\"ZDB-1-ANR\" OR collection_details:\"ZDB-1-BIO\" OR collection_details:\"ZDB-1-DJB\" OR collection_details:\"ZDB-1-BPC\" OR collection_details:\"ZDB-1-CUP\" OR collection_details:\"ZDB-1-CEE\" OR collection_details:\"ZDB-1-BEP\" OR collection_details:\"ZDB-1-EMS\" OR collection_details:\"ZDB-1-SDJ\" OR collection_details:\"ZDB-1-EFD\" OR collection_details:\"ZDB-1-FTA\" OR collection_details:\"ZDB-1-GIS\" OR collection_details:\"ZDB-1-IOP\" OR collection_details:\"ZDB-1-KLU\" OR collection_details:\"ZDB-1-NTA\" OR collection_details:\"ZDB-1-OJD\" OR collection_details:\"ZDB-1-PAO\" OR collection_details:\"ZDB-1-SAG\" OR collection_details:\"ZDB-1-SAGK\" OR collection_details:\"ZDB-1-SCA\" OR collection_details:\"ZDB-1-SOJ\" OR collection_details:\"ZDB-1-TFO\" OR collection_details:\"ZDB-1-EHA\" OR collection_details:\"ZDB-1-NAA\" OR collection_details:\"ZDB-1-NRA\" OR collection_details:\"ZDB-1-TDA\" OR collection_details:\"ZDB-1-TLS\" OR collection_details:\"ZDB-1-DGR\" OR collection_details:\"ZDB-1-WIS\" OR collection_details:\"ZDB-1-AQC\" OR collection_details:\"ZDB-1-WBI\" OR collection_details:\"ZDB-1-BEC\" OR collection_details:\"ZDB-1-CIA\" OR collection_details:\"ZDB-1-DIE\" OR collection_details:\"ZDB-1-DHW\" OR collection_details:\"ZDB-1-NEL\" OR collection_details:\"ZDB-1-HRA\" OR collection_details:\"ZDB-1-EIU\" OR collection_details:\"ZDB-1-EWE\" OR collection_details:\"ZDB-1-HBE\" OR collection_details:\"ZDB-1-ELC\" OR collection_details:\"ZDB-1-EPB\" OR collection_details:\"ZDB-1-SNT\" OR collection_details:\"ZDB-1-SOT\" OR collection_details:\"ZDB-1-SLN\" OR collection_details:\"ZDB-1-SCM\" OR collection_details:\"ZDB-1-WBA\" OR collection_details:\"ZDB-1-PEO\")"
 0 = "-format:(\"Article\" OR \"electronic Article\")"
-1 = "(collection_details:\"GBV_ILN_370\")"
 
 ; This section can get used to define conditional filters, i.e. filters
 ; that are applied under certain conditions.

diff --git a/local/languages/qcovery_en.ini b/local/languages/qcovery_en.ini
@@ -1,4 +1,4 @@
-"@parent_ini = "qcovery_parent_en.ini"
+@parent_ini = "qcovery_parent_en.ini"
 
 ;Book bag
 Add to Book Bag = "Bookmark"

diff --git a/local/languages/qcovery_parent_en.ini b/local/languages/qcovery_parent_en.ini
@@ -1,3 +1,5 @@
+@parent_ini = "../../languages/en.ini"
+
 ; For future reference:
 ;English = English
 Abstract = "Abstract"

diff --git a/module/ExtendedFeedback b/module/ExtendedFeedback
diff --git a/module/ResultFeedback b/module/ResultFeedback
diff --git a/qcovery_local/config/vufind/config.ini b/qcovery_local/config/vufind/config.ini
@@ -11,6 +11,7 @@ theme = belugax_hcu_dev
 language        = de    ; default -- more options available in [Languages] below.
 locale          = de_DE
 defaultLoggedInModule = Search
+defaultAccountPage = CheckedOut
 generator = "VuFind 8.1.1"
 showBookBag = true
 

diff --git a/themes/availabilityfeedback/templates/availabilityfeedback/form.phtml b/themes/availabilityfeedback/templates/availabilityfeedback/form.phtml
@@ -30,7 +30,7 @@
         <label class="control-label privacy" for="privacy"><?=$this->translate("I Accept The Privacy Policy")?></label>
       </div>
       */ ?>
-      <?=$this->recaptcha()->html($this->useRecaptcha) ?>
+      <?=$this->captcha()->html($this->useCaptcha) ?>
       <div class="form-group">
         <input type="submit" name="submit" class="btn btn-primary" value="<?=$this->transEsc("Send")?>" />
       </div>

diff --git a/themes/belugax_hcu/css/compiled.css b/themes/belugax_hcu/css/compiled.css
@@ -13645,7 +13645,7 @@ h3.belugax-sidebar-headline i {
         margin: 0 15px !important;
     }
 
-    .template-dir-myresearch .mainbody, .template-dir-record .mainbody {
+    .template-dir-myresearch .mainbody, .template-dir-record .mainbody, .template-dir-holds .mainbody {
         margin: 0px !important;
         padding: 0px !important;
     }
@@ -13685,7 +13685,8 @@ h3.belugax-sidebar-headline i {
     border: 1px solid #fff;
 }
 
-.template-dir-myresearch .sidebar .belugax-item-nav {
+.template-dir-myresearch .sidebar .belugax-item-nav,
+.template-dir-holds .sidebar .belugax-item-nav {
     padding: 0px;
 }
 
@@ -14103,32 +14104,38 @@ button.badge {
 }
 
 .template-dir-myresearch .mainbody,
-.template-dir-record .mainbody {
+.template-dir-record .mainbody,
+.template-dir-holds .mainbody {
     padding: 0 20px 0 20px;
     border-radius: 10px;
     background: #fff;
     margin-left: -15px;
 }
 
-.template-dir-myresearch .belugax-item-nav {
+.template-dir-myresearch .belugax-item-nav,
+.template-dir-holds .belugax-item-nav {
     text-align: left;
     padding-left: 0px;
     padding-right: 0px;
 }
 
-.template-dir-myresearch .sidebar a {
+.template-dir-myresearch .sidebar a,
+.template-dir-holds .sidebar a {
     color: #000 !important;
 }
 
-.template-dir-myresearch .sidebar a:hover {
+.template-dir-myresearch .sidebar a:hover,
+.template-dir-holds .sidebar a:hover {
     color: #000 !important;
 }
 
-.template-dir-myresearch .sidebar a.active {
+.template-dir-myresearch .sidebar a.active,
+.template-dir-holds .sidebar a.active {
     color: #e4e4e4 !important;
 }
 
-.template-dir-myresearch .sidebar a.active:hover {
+.template-dir-myresearch .sidebar a.active:hover,
+.template-dir-holds .sidebar a.active:hover {
     color: #e4e4e4 !important;
 }
 

diff --git a/themes/publicationsuggestion/templates/publicationsuggestion/form.phtml b/themes/publicationsuggestion/templates/publicationsuggestion/form.phtml
@@ -107,7 +107,7 @@
             </div>
         <?php endif; ?>
 
-      <?=$this->recaptcha()->html($this->useRecaptcha) ?>
+      <?=$this->captcha()->html($this->useCaptcha) ?>
       <div class="form-group">
         <input type="submit" name="submit" class="btn btn-primary" value="<?=$this->transEsc("Submit")?>" />
       </div>