Merge branch 'dev' into finna-1167-add-order-list

Gruntfile.local.js

@@ -1,5 +1,6 @@
 module.exports = function(grunt) {
   const fs = require("fs");
+  const path = require("path");
   const os = require("node:os");
 
   grunt.registerTask("finna:scss", function finnaScssFunc() {
@@ -20,24 +21,46 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask("finna:lessToSass", function finnaLessToSassFunc() {
+    const exclude = grunt.option('exclude');
+    const excludedFiles = exclude ? exclude.split(',') : [];
+
+    const sharedFileOpts = {
+        expand: true,
+        src: ['*.less', '**/*.less'],
+        filter: function(filepath) {
+          return !excludedFiles.includes(filepath);
+        },
+        ext: '.scss'
+    };
+
+    let themeDir = grunt.option('theme-dir');
+    if (themeDir) {
+      themeDir = path.resolve(themeDir);
+    }
+    const files = themeDir
+      ? [
+        {
+          ...sharedFileOpts,
+          cwd: themeDir + '/less',
+          dest: themeDir + '/scss'
+        }
+      ]
+      : [
+        {
+          ...sharedFileOpts,
+          cwd: 'themes/finna2/less',
+          dest: 'themes/finna2/scss'
+        },
+        {
+          ...sharedFileOpts,
+          cwd: 'themes/custom/less',
+          dest: 'themes/custom/scss'
+        },
+      ];
+    console.log(themeDir ? "Converting theme " + themeDir : "Converting Finna default themes");
     grunt.config.set('lessToSass', {
      convert: {
-        files: [
-          {
-            expand: true,
-            cwd: 'themes/finna2/less',
-            src: ['*.less', 'components/**/*.less', 'finna/**/*.less', 'global/**/*.less'],
-            ext: '.scss',
-            dest: 'themes/finna2/scss'
-          },
-          {
-            expand: true,
-            cwd: 'themes/custom/less',
-            src: ['*.less', 'components/**/*.less', 'finna/**/*.less', 'global/**/*.less'],
-            ext: '.scss',
-            dest: 'themes/custom/scss'
-          },
-        ],
+        files: files,
         options: {
           replacements: [
             // Activate SCSS

config/vufind/OAuth2Server.yaml

@@ -59,6 +59,11 @@ Clients:
     # Note that a secret can only be used with confidential clients since public
     # ones have no way of using it securely.
     secret: ""
+    # By default a client can request all scopes. This setting can be used to limit
+    # the allowed scopes to a subset of all available ones.
+    #allowedScopes:
+    #  - openid
+    #  - email
 
 # Scope configuration. Keys are scope identifiers. Each identifier should include a
 # description (translation key) to be displayed to the user. The ils field should be

config/vufind/config.ini

@@ -312,6 +312,12 @@ driver          = Sample
 ; library_cards setting (see below).
 allowUserLogin = true
 
+; If true (default), any ILS credentials stored with the user are checked up-front
+; when the user logs in to VuFind. If the credentials don't work, they're cleared,
+; and the user will be prompted for new credentials when accessing a page that
+; needs them. This setting is ignored if allowUserLogin is false.
+checkILSCredentialsOnLogin = true
+
 ; loadNoILSOnFailure - Whether or not to load the NoILS driver if the main driver fails
 loadNoILSOnFailure = false
 

local/config/vufind/rss.ini.sample

@@ -23,7 +23,7 @@
 ; up to <items> items are displayed. In grid visualItems determines the amount of items
 ; displayed before a "more" button. "More" button displays up to <items> items in the grid.
 ; title = "[rss|<translation-key>]" Feed title:
-;    'rss' = Use <title> element from feed
+;    'rss' = Use <title> element from feed [DEPRECATED -- leave title empty to use title from feed, or use a <translation-key>]
 ;    '<translation-key>' = Use local translation
 ; description = "Feed description|<translation-key>"
 ;    A free-form description text that may include HTML, or a translation key. Also

local/languages/finna/classification/en-gb.ini

@@ -4271,3 +4271,158 @@ udk2 930.2 = "Methodology of history. Ancillary historical sciences"
 udk2 930.25 = "Archivistics. Archives (including public and other records)"
 udk2 930.85 = "History of civilization. Cultural history"
 udk2 94 = "General history"
+
+;classes loovs
+
+loovs 0 = "Løøv classification"
+loovs 1 = "Book and library research"
+loovs 01a = "General bibliographies"
+loovs 01b = "Bibliographies of individuals"
+loovs 01c = "Library catalogues"
+loovs 01d = "Books and libraries in general"
+loovs 01e = "Book reviews"
+loovs 01f = "Archives"
+loovs 2 = "Comprehensive works and works of miscellaneous contents"
+loovs 02a = "General surveys and handbooks"
+loovs 02b = "Non-specialized periodicals"
+loovs 02c = "Works of miscellaneous content"
+loovs 02d = "Research methodology"
+loovs 3 = "Sami institutions and organisations"
+loovs 03a = "Institutions and agencies"
+loovs 03b = "Organizations and associations"
+loovs 03c = "Conferences and meetings"
+loovs 4 = "Religion, philosophy, psychology"
+loovs 04a = "Pre-Christian religions"
+loovs 04b = "Church and mission history"
+loovs 04c = "Congregations"
+loovs 04d = "Læstadianism"
+loovs 04e = "Philosophy and psychology"
+loovs 5 = "Religious literature"
+loovs 05a = "The Bible and biblical history"
+loovs 05b = "Psalms and hymns"
+loovs 05c = "Other works"
+loovs 6 = "Philology, Language"
+loovs 06a = "Language in society"
+loovs 06a1 = "Teaching and studying languages"
+loovs 06b = "Linguistics"
+loovs 06b1 = "Language history and etymology"
+loovs 06b1a = "Name research"
+loovs 06b2 = "Dialects"
+loovs 06b3 = "Other research"
+loovs 06c = "Grammar and language revitalisation"
+loovs 06d = "Dictionaries"
+loovs 06e = "Textbooks and readers"
+loovs 7 = "Medicine, physical anthropology"
+loovs 07a = "Medical sciences"
+loovs 07b = "Physical anthropology"
+loovs 8 = "Geography and local history"
+loovs 08a = "General surveys"
+loovs 08b = "Specific regions"
+loovs 08c = "Travelogues"
+loovs 9 = "History"
+loovs 09a = "General surveys"
+loovs 09b = "Archaeology"
+loovs 09c = "History"
+loovs 10 = "Personal history"
+loovs 10a = "Collections of biographies"
+loovs 10b = "Family history"
+loovs 10c = "Biographies"
+loovs 11 = "Cultural history"
+loovs 11a = "General surveys"
+loovs 11b = "Work and industries"
+loovs 11b1 = "Hunting and trapping"
+loovs 11b2 = "Fishing"
+loovs 11b3 = "Reindeer nomadism"
+loovs 11b4 = "Livestock and agriculture"
+loovs 11b5 = "Other industries"
+loovs 11b6 = "Commerce and markets"
+loovs 11b7 = "Diet and cooking"
+loovs 11c = "Material culture"
+loovs 11c1 = "Housing and buildings"
+loovs 11c2 = "Transportation"
+loovs 11c3 = "Furniture, utensils, tools"
+loovs 11c4 = "Handicraft"
+loovs 11c5 = "Clothing"
+loovs 11d = "Folk culture. Folklore"
+loovs 11d1 = "Folk literature"
+loovs 11d1a = "Tales and lore"
+loovs 11d1b = "Rhymes and verse, proverbs and phrases, ballads"
+loovs 11d2 = "Manners"
+loovs 11d3 = "Folklore, folk belief"
+loovs 11d4 = "Folk medicine"
+loovs 11e = "Social organisation"
+loovs 110 = "Family and kinship"
+loovs 1100 = "Justice and moral"
+loovs 11f = "Museums and exhibitions"
+loovs 11f1 = "Preservation"
+loovs 12 = "Industry and economy"
+loovs 12a = "General surveys"
+loovs 12b = "Reindeer husbandry"
+loovs 12c = "Agriculture and livestock"
+loovs 12d = "Hunting"
+loovs 12e = "Fishing"
+loovs 12f = "Handicraft"
+loovs 12g = "Other trades"
+loovs 12h = "Business administration"
+loovs 12i = "Home economics"
+loovs 13 = "Minorities, Conditions and rights"
+loovs 13a = "General surveys"
+loovs 13b = "Exploitation within the Sami regions"
+loovs 13b1 = "Forestry"
+loovs 13b2 = "Mining"
+loovs 13b3 = "Watercourse regulations, development of water power"
+loovs 13b4 = "Tourism / outdoor life"
+loovs 13b5 = "Other exploitation"
+loovs 13c = "Minority conditions, minority policy"
+loovs 13c1 = "Relations to the Government"
+loovs 13c2 = "Relations to other ethnic groups"
+loovs 13d = "Legal history and legal position"
+loovs 14 = "Social conditions"
+loovs 14a = "General surveys"
+loovs 14b = "Social conditions, Social policy"
+loovs 14c = "Administration and politics"
+loovs 14d = "Communications"
+loovs 14e = "Demography and statistics"
+loovs 14f = "Women’s liberation. Women’s history"
+loovs 15 = "SCHOOLS AND EDUCATION"
+loovs 15a = "General surveys"
+loovs 15b = "School history"
+loovs 15c = "Kindergarten"
+loovs 15d = "Primary school"
+loovs 15e = "Secondary school"
+loovs 15f = "Other education"
+loovs 15g = "Universities and academies"
+loovs 15h = "Adult education"
+loovs 15i = "Specific subjects"
+loovs 15j = "Pedagogics and upbringing"
+loovs 15k = "Textbooks"
+loovs 16 = "Art, music, theatre and film"
+loovs 16a = "General surveys"
+loovs 16b = "Creative arts"
+loovs 16b1 = "Visual art"
+loovs 16b2 = "Decorative arts"
+loovs 16b3 = "Architecture"
+loovs 16c = "Joik and music"
+loovs 16d = "Theatre"
+loovs 16e = "Film and photo"
+loovs 17 = "Literary history"
+loovs 18 = "Fiction"
+loovs 18a = "Sami authors"
+loovs 18a1 = "In Sami languages"
+loovs 18a2 = "In other languages"
+loovs 18b = "Non-Sami authors"
+loovs 18b1 = "In Sami languages"
+loovs 18b2 = "With Sami main motif"
+loovs 18c = "Children’s and youth literature"
+loovs 18c1 = "In Sami languages"
+loovs 18c2 = "With Sami main motif"
+loovs 19 = "Journalism and information operations"
+loovs 19a = "General surveys"
+loovs 19b = "Press"
+loovs 19c = "Radio and TV"
+loovs 19d = "Other information operations"
+loovs 20 = "Sports, games, play and entertainment"
+loovs 21 = "Natural sciences, Technical science"
+loovs 21a = "Natural sciences"
+loovs 21b = "Technical science"
+loovs 21c = "Mathematics"