Merge branch 'development'

swissbib · Feb 2, 2017 · 3923754 · 3923754
2 parents e57035c + b4c0b8a
commit 3923754
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 55 deletions.
diff --git a/local/config/vufind/Summon.ini b/local/config/vufind/Summon.ini
@@ -117,14 +117,11 @@ SubjectTerms = "Suggested Topics"
 
 ; Rows and columns for table used by top facets
 [Results_Settings]
+showMore[*] = 6
+showMoreInLightbox[*] = true
 top_rows = 2
 top_cols = 3
-facet_limit_default             = 5     ; Default number of facets to be shown for a category
-facet_limit_ContentType         = 10
-facet_limit_SubjectTerms        = 3
-;facet_limit_Discipline         = 5     ; for test purposes take the default value
-facet_limit_PublicationDate     = 5
-
+exclude = *
 
 ; These settings affect the way the facets are displayed
 [Facet_Settings]

diff --git a/local/languages/formats/de.ini b/local/languages/formats/de.ini
@@ -851,6 +851,7 @@ CF010600 = "USB-Stick"
 ;=======================
 
 VM010000 = "Filmmaterial"
+VM010053 = "Filmmaterial (online)"
 
 VM010100 = "Film"
 VM010147 = "Film (Datenträger CD-ROM)"
@@ -940,13 +941,13 @@ VM030049 = "Medienmix (Datenträger Diskette)"
 VM030053 = "Medienmix (online)"
 VM030054 = "Medienmix (Datenträger USB-Stick)"
 
-VM030100 = "Sprachlehrmittel"
-VM030101 = "Sprachlehrmittel (Microform)"
-VM030147 = "Sprachlehrmittel (Datenträger CD-ROM)"
-VM030148 = "Sprachlehrmittel (Datenträger DVD-ROM)"
-VM030149 = "Sprachlehrmittel (Datenträger Diskette)"
-VM030153 = "Sprachlehrmittel (online)"
-VM030154 = "Sprachlehrmittel (Datenträger USB-Stick)"
+VM030100 = "Lehrmittel"
+VM030101 = "Lehrmittel (Microform)"
+VM030147 = "Lehrmittel (Datenträger CD-ROM)"
+VM030148 = "Lehrmittel (Datenträger DVD-ROM)"
+VM030149 = "Lehrmittel (Datenträger Diskette)"
+VM030153 = "Lehrmittel (online)"
+VM030154 = "Lehrmittel (Datenträger USB-Stick)"
 
 VM030200 = "Lehrmittel"
 VM030201 = "Lehrmittel (Microform)"
@@ -1032,9 +1033,10 @@ XM020400 = "Fotografie"
 XM020500 = "Plakat"
 XM020600 = "Postkarte"
 XM030000 = "Medienmix"
-XM030100 = "Sprachlehrmittel"
-XM030200 = "Lehrmittel / Spiele"
+XM030100 = "Lehrmittel"
+XM030200 = "Lehrmittel"
 XM030300 = "Tonbildschau"
+XM030400 = "Spiele"
 
 ; ======================
 ; = XP Zusammenzug MP
@@ -1109,9 +1111,10 @@ XU040600 = "Musikaufnahme (Tonband)"
 
 0/XM03/	        = "Lehrmittel"
 1/XM03/0000/	= "Medienmix"
-1/XM03/0100/	= "Sprachlehrmittel"
-1/XM03/0200/	= "Spiel / Objekt"
+1/XM03/0100/	= "Lehrmittel"
+1/XM03/0200/	= "Objekt"
 1/XM03/0300/	= "Tonbildschau"
+1/XM03/0400/    = "Spiel"
 
 0/XP01/	        = "Kartenmaterial"
 1/XP01/0000/	= "Diverse Kartenformate"
@@ -1151,4 +1154,4 @@ Serie = "Serie"
 Teilserie = "Teilserie"
 Dossier = "Dossier"
 Teildossier = "Teildossier"
-Dokument = "Dokument"
+Dokument = "Dokument"
diff --git a/local/languages/formats/en.ini b/local/languages/formats/en.ini
@@ -851,6 +851,7 @@ CF010600 = "USB flash drive"
 ;=======================
 
 VM010000 = "Film"
+VM010053 = "Film (online)"
 
 VM010100 = "Film"
 VM010147 = "Film (on CD-ROM)"
@@ -940,13 +941,13 @@ VM030049 = "Media set (on floppy disk)"
 VM030053 = "Media set (online)"
 VM030054 = "Media set (on USB flash drive)"
 
-VM030100 = "Language teaching materials"
-VM030101 = "Language teaching materials (on microform)"
-VM030147 = "Language teaching materials (on CD-ROM)"
-VM030148 = "Language teaching materials (on DVD)"
-VM030149 = "Language teaching materials (on floppy disk)"
-VM030153 = "Language teaching materials (online)"
-VM030154 = "Language teaching materials (on USB flash drive)"
+VM030100 = "Teaching materials"
+VM030101 = "Teaching materials (on microform)"
+VM030147 = "Teaching materials (on CD-ROM)"
+VM030148 = "Teaching materials (on DVD)"
+VM030149 = "Teaching materials (on floppy disk)"
+VM030153 = "Teaching materials (online)"
+VM030154 = "Teaching materials (on USB flash drive)"
 
 VM030200 = "Teaching materials"
 VM030201 = "Teaching materials (on microform)"
@@ -1032,9 +1033,10 @@ XM020400 = "Photographie"
 XM020500 = "Poster"
 XM020600 = "Postcard"
 XM030000 = "Mixed media"
-XM030100 = "Language teaching material"
-XM030200 = "Teaching material / Games"
+XM030100 = "Teaching material"
+XM030200 = "Teaching material"
 XM030300 = "Diaporama"
+XM030400 = "Games"
 
 ; ======================
 ; = XP Zusammenzug MP
@@ -1109,9 +1111,10 @@ XU040600 = "Musical recording (Tape)"
 
 0/XM03/	        = "Teaching material"
 1/XM03/0000/	= "Mixed media"
-1/XM03/0100/	= "Language teaching material"
-1/XM03/0200/	= "Game / Object"
+1/XM03/0100/	= "Teaching material"
+1/XM03/0200/	= "Object"
 1/XM03/0300/	= "Diaporama"
+1/XM03/0400/    = "Game"
 
 0/XP01/	        = "Maps"
 1/XP01/0000/	= "Various formats"

diff --git a/local/languages/formats/fr.ini b/local/languages/formats/fr.ini
@@ -851,6 +851,7 @@ CF010600 = "Clé USB"
 ;=======================
 
 VM010000 = "Matériel filmique"
+VM010053 = "Matériel filmique (En ligne)"
 
 VM010100 = "Film"
 VM010147 = "Film (CD-ROM)"
@@ -940,13 +941,13 @@ VM030049 = "Trousse (Disquette)"
 VM030053 = "Trousse (En ligne)"
 VM030054 = "Trousse (Clé USB)"
 
-VM030100 = "Méthode de langue"
-VM030101 = "Méthode de langue (Microforme)"
-VM030147 = "Méthode de langue (CD-ROM)"
-VM030148 = "Méthode de langue (DVD-ROM)"
-VM030149 = "Méthode de langue (Disquette)"
-VM030153 = "Méthode de langue (En ligne)"
-VM030154 = "Méthode de langue (Clé USB)"
+VM030100 = "Matériel didactique"
+VM030101 = "Matériel didactique (Microforme)"
+VM030147 = "Matériel didactique (CD-ROM)"
+VM030148 = "Matériel didactique (DVD-ROM)"
+VM030149 = "Matériel didactique (Disquette)"
+VM030153 = "Matériel didactique (En ligne)"
+VM030154 = "Matériel didactique (Clé USB)"
 
 VM030200 = "Matériel didactique"
 VM030201 = "Matériel didactique (Microforme)"
@@ -1032,9 +1033,10 @@ XM020400 = "Photographie"
 XM020500 = "Affiche"
 XM020600 = "Carte postale"
 XM030000 = "Trousse"
-XM030100 = "Grammaire/cours de langue"
+XM030100 = "Matériel scolaire"
 XM030200 = "Matériel scolaire"
 XM030300 = "Diaporama"
+XM030400 = "Jeu"
 
 ; ======================
 ; = XP Zusammenzug MP
@@ -1107,11 +1109,12 @@ XU040600 = "Musique (Bande sonore)"
 1/XM02/0500/	= "Affiche"
 1/XM02/0600/	= "Carte postale"
 
-0/XM03/	        = "Matériel scolaire"
+0/XM03/ 	    = "Matériel scolaire"
 1/XM03/0000/	= "Trousse"
-1/XM03/0100/	= "Grammaire / cours de langue"
-1/XM03/0200/	= "Jeu / Objet"
+1/XM03/0100/	= "Matériel scolaire"
+1/XM03/0200/	= "Objet"
 1/XM03/0300/	= "Diaporama"
+1/XM03/0400/    = "Jeu"
 
 0/XP01/	        = "Cartes géographiques"
 1/XP01/0000/	= "Divers formats"

diff --git a/local/languages/formats/it.ini b/local/languages/formats/it.ini
@@ -851,6 +851,7 @@ CF010600 = "USB-Stick"
 ;=======================
 
 VM010000 = "Filmmaterial"
+VM010053 = "Filmmaterial (online)"
 
 VM010100 = "Film"
 VM010147 = "Film (Datenträger CD-ROM)"
@@ -940,13 +941,13 @@ VM030049 = "Medienmix (Datenträger Diskette)"
 VM030053 = "Medienmix (online)"
 VM030054 = "Medienmix (Datenträger USB-Stick)"
 
-VM030100 = "Sprachlehrmittel"
-VM030101 = "Sprachlehrmittel (Microform)"
-VM030147 = "Sprachlehrmittel (Datenträger CD-ROM)"
-VM030148 = "Sprachlehrmittel (Datenträger DVD-ROM)"
-VM030149 = "Sprachlehrmittel (Datenträger Diskette)"
-VM030153 = "Sprachlehrmittel (online)"
-VM030154 = "Sprachlehrmittel (Datenträger USB-Stick)"
+VM030100 = "Lehrmittel"
+VM030101 = "Lehrmittel (Microform)"
+VM030147 = "Lehrmittel (Datenträger CD-ROM)"
+VM030148 = "Lehrmittel (Datenträger DVD-ROM)"
+VM030149 = "Lehrmittel (Datenträger Diskette)"
+VM030153 = "Lehrmittel (online)"
+VM030154 = "Lehrmittel (Datenträger USB-Stick)"
 
 VM030200 = "Lehrmittel"
 VM030201 = "Lehrmittel (Microform)"
@@ -1032,9 +1033,10 @@ XM020400 = "Fotografie"
 XM020500 = "Plakat"
 XM020600 = "Postkarte"
 XM030000 = "Medienmix"
-XM030100 = "Sprachlehrmittel"
-XM030200 = "Lehrmittel / Spiele"
+XM030100 = "Lehrmittel"
+XM030200 = "Lehrmittel"
 XM030300 = "Tonbildschau"
+XM030400 = "Spiele"
 
 ; ======================
 ; = XP Zusammenzug MP
@@ -1109,9 +1111,10 @@ XU040600 = "Musikaufnahme (Tonband)"
 
 0/XM03/	        = "Materiale didattico"
 1/XM03/0000/	= "Kit"
-1/XM03/0100/	= "Grammatica / corso di lingua"
-1/XM03/0200/	= "Materiale didattico"
+1/XM03/0100/	= "Materiale didattico"
+1/XM03/0200/	= "Ogetto"
 1/XM03/0300/	= "Diaporama"
+1/XM03/0400/    = "Gioco"
 
 0/XP01/	        = "Mappa"
 1/XP01/0000/	= "Diversi formati"

diff --git a/module/Swissbib/src/Swissbib/Recommend/SideFacets.php b/module/Swissbib/src/Swissbib/Recommend/SideFacets.php
@@ -127,8 +127,10 @@ public function setConfig($settings)
             }
         }
 
-        foreach ($config->QueryFacets as $facetKey => $facetValue) {
-            $this->queryFacets[$facetKey] = $facetValue;
+        if (!empty($config->QueryFacets)) {
+            foreach ($config->QueryFacets as $facetKey => $facetValue) {
+                $this->queryFacets[$facetKey] = $facetValue;
+            }
         }
 
     }

diff --git a/themes/sbvfrd/templates/search/facet-list.phtml b/themes/sbvfrd/templates/search/facet-list.phtml
@@ -13,7 +13,7 @@
     <label><?=$this->translate('Sort') ?></label>
     <div class="btn-group">
       <? foreach ($this->sortOptions as $key=>$sort): ?>
-        <? if (!($sort == "sort_alphabetic" && ($facet == "language" || $facet == "navSubform" || $facet == "institution"))): ?>
+        <? if (!($sort == "sort_alphabetic" && ($facet == "language" || $facet == "navSubform" || $facet == "institution" || $facet == "navDrsys"))): ?>
           <a href="<?=$urlBase . '&amp;facetpage=1&amp;facetsort=' . urlencode($key) ?>" class="btn btn-default js-facet-sort<? if($this->sort == $key): ?> active<? endif; ?>" data-sort="<?=$key ?>" data-lightbox-ignore><?=$this->translate($sort) ?></a>
         <? endif; ?>
       <? endforeach; ?>

diff --git a/themes/sbvfrdmulti/templates/HelpPage/fr/about.phtml b/themes/sbvfrdmulti/templates/HelpPage/fr/about.phtml
@@ -1,5 +1,5 @@
 <h1>A propos de swissbib Basel Bern</h1>
-<p>swissbib Basel Bern recense un peu plus de 7 millions de titres des 200 <a href="<?= $this->basePath('Libraries') ?>" title="Liste der Institutionen">bibliothèques scientifiques de Bâle et de Berne</a> Ceux-ci sont les bibliothèques des universités de Bâle et de Berne, la bibliothèque nationale, quelques bibliothèques spécialisées, ainsi que les bibliothèques des Hautes écoles spécialisées. Autant que la Kooperative Speicherbibliothek Schweiz, la Zentralbibliothek Solothurn et l‘institut fédéral des hautes études en formation professionnelle à Lausanne et à Lugano.</p>
+<p>swissbib Basel Bern recense un peu plus de 7 millions de titres des 200 <a href="<?= $this->basePath('Libraries') ?>" title="Liste der Institutionen">bibliothèques scientifiques de Bâle et de Berne</a>. Ceux-ci sont les bibliothèques des universités de Bâle et de Berne, la bibliothèque nationale, quelques bibliothèques spécialisées, ainsi que les bibliothèques des Hautes écoles spécialisées. Autant que la Kooperative Speicherbibliothek Schweiz, la Zentralbibliothek Solothurn et l‘institut fédéral des hautes études en formation professionnelle à Lausanne et à Lugano.</p>
 <p>Le projet est soutenu par <a href="<?= $this->redirectProtocolWrapper()->getWrappedURL('http://www.informationsverbund.ch/21.0.html') ?>" target="_blank">le réseau IDS Basel Bern</a> et profite de l'infrastructure et du savoir-faire du catalogue national <a href="<?= $this->redirectProtocolWrapper()->getWrappedURL('https://www.swissbib.ch') ?>" target="_blank" title="swissbib">swissbib</a>.</p>
 <h2>Que peut-on trouver dans swissbib Basel Bern?</h2>
 <p>Dans swissbib Basel Bern une recherche peut être effectuée dans deux bases de données différentes:</p>