Add bootstrap5 theme

build.xml

@@ -289,6 +289,10 @@
     <exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} SOLR_PORT=${solr_port} ${phpunit_command} --stop-on-failure ${phpunit_extra_params}" passthru="true" checkreturn="true" />
   </target>
 
+  <target name="installbootstrap5" description="Install Bootstrap 5">
+    <copy file="${srcdir}/vendor/twbs/bootstrap/dist/js/bootstrap.min.js" todir="${srcdir}/themes/bootstrap5/js/vendor" overwrite="true" />
+  </target>
+
   <target name="installsolr" description="Install Solr">
     <!-- load previously installed version from marker file, if present -->
     <if>
@@ -373,6 +377,8 @@
 
   <!-- Copy files from node modules to themes -->
   <target name="copynodemodules">
+    <!-- ** bootstrap3 ** -->
+
     <!-- autocomplete.js -->
     <copy file="${srcdir}/node_modules/autocomplete.js/autocomplete.js" todir="${srcdir}/themes/bootstrap3/js/vendor" overwrite="true" />
     <!-- jstree -->
@@ -389,6 +395,24 @@
     <copy file="${srcdir}/node_modules/simple-keyboard-layouts/build/index.js" todir="${srcdir}/themes/bootstrap3/js/vendor/simple-keyboard-layouts" overwrite="true" />
     <!-- vanilla-cookieconsent -->
     <copy file="${srcdir}/node_modules/vanilla-cookieconsent/dist/cookieconsent.umd.js" todir="${srcdir}/themes/bootstrap3/js/vendor" overwrite="true" />
+
+    <!-- ** bootstrap5 ** -->
+
+    <!-- autocomplete.js -->
+    <copy file="${srcdir}/node_modules/autocomplete.js/autocomplete.js" todir="${srcdir}/themes/bootstrap5/js/vendor" overwrite="true" />
+    <!-- jstree -->
+    <copy todir="${srcdir}/themes/bootstrap5/js/vendor/jsTree" overwrite="true">
+      <fileset dir="${srcdir}/node_modules/jstree/dist/" >
+        <include name="**/**" />
+        <exclude name="jstree.js" />
+        <exclude name="themes/default-dark/" />
+      </fileset>
+    </copy>
+    <!-- vanilla-cookieconsent -->
+    <copy file="${srcdir}/node_modules/vanilla-cookieconsent/dist/cookieconsent.umd.js" todir="${srcdir}/themes/bootstrap5/js/vendor" overwrite="true" />
+
+    <!-- popperjs/core -->
+    <copy file="${srcdir}/node_modules/@popperjs/core/dist/umd/popper.min.js" todir="${srcdir}/themes/bootstrap5/js/vendor" overwrite="true" />
   </target>
 
   <!-- Install and Activate VuFind -->
@@ -885,4 +909,32 @@ ${git_status}
       </filterchain>
     </reflexive>
   </target>
+
+  <target name="update-bootstrap5-templates">
+    <if>
+      <available file="${srcdir}/themes/bootstrap5/templates"></available>
+      <then>
+        <delete dir="${srcdir}/themes/bootstrap5/templates" includeemptydirs="true" failonerror="true" />
+      </then>
+    </if>
+    <mkdir dir="${srcdir}/themes/bootstrap5/templates"></mkdir>
+    <copy todir="${srcdir}/themes/bootstrap5/templates">
+      <fileset dir="${srcdir}/themes/bootstrap3/templates" defaultexcludes="false" />
+    </copy>
+    <reflexive>
+      <fileset dir="${srcdir}/themes/bootstrap5/templates">
+        <include pattern="**/*.phtml" />
+      </fileset>
+      <filterchain>
+        <replaceregexp>
+          <!-- HTML attributes -->
+          <regexp pattern=" data-(dismiss|target|toggle)=" replace=" data-bs-\1=" />
+
+          <!-- HTMLAttributes helper -->
+          <regexp pattern="'data-(dismiss|target|toggle)'" replace="'data-bs-\1'" />
+        </replaceregexp>
+      </filterchain>
+    </reflexive>
+  </target>
+
 </project>

composer.json

@@ -94,7 +94,8 @@
         "vufind-org/vufind-marc": "1.0.2",
         "webfontkit/open-sans": "^1.0",
         "wikimedia/composer-merge-plugin": "2.1.0",
-        "yajra/laravel-pdo-via-oci8": "3.4.0"
+        "yajra/laravel-pdo-via-oci8": "3.4.0",
+        "twbs/bootstrap": "5.3.2"
     },
     "require-dev": {
         "behat/mink": "1.10.0",
@@ -124,7 +125,7 @@
         }
     },
     "scripts": {
-        "phing-install-dependencies": ["phing patch-dependencies", "phing installsolr installswaggerui"],
+        "phing-install-dependencies": ["phing patch-dependencies", "phing installbootstrap5 installsolr installswaggerui"],
         "post-install-cmd": "@phing-install-dependencies",
         "post-update-cmd": "@phing-install-dependencies",
         "qa": "phing qa-console -Ddefaultconfigs=true",

package.json

@@ -47,6 +47,7 @@
     "grunt-contrib-watch": "^1.1.0",
     "jshint": "^2.13.4",
     "jstree": "3.3.15",
+    "@popperjs/core": "^2.11.8",
     "simple-keyboard": "^3.6.0",
     "simple-keyboard-layouts": "^3.0.0",
     "vanilla-cookieconsent": "3.0.0-rc.16"

themes/bootprint3/scss/bootprint.scss

@@ -3,7 +3,7 @@
 @import "variables";
 <#LESS */
 /* #SCSS> */
-@import "variables", "../../bootstrap3/scss/bootstrap";
+@import "variables", "../../bootstrap5/scss/bootstrap";
 /* <#SCSS */
 
 @import "icons";

themes/bootprint3/scss/variables.scss

@@ -1,6 +1,6 @@
-$brand-primary: #619144;
+$primary: #619144;
 
-$font-size-base: 13px;
+//$font-size-base: 13px;
 
 $padding-base-vertical   : 3px;
 $padding-base-horizontal : 5px;
@@ -14,7 +14,7 @@ $border-radius-base : 3px;
 $border-radius-large: 5px;
 $border-radius-small: 2px;
 
-$input-border-focus: $brand-primary;
+$input-border-focus: $primary;
 
 $legend-border-color: #777; // $gray-light
 

themes/bootprint3/theme.config.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'extends' => 'bootstrap3',
+    'extends' => 'bootstrap5',
     'icons' => [
         'sets' => [
             /**

themes/bootstrap5/css/EDS.css

@@ -0,0 +1,78 @@
+/* publication type css */
+
+.pt-icon { margin: auto; width: 70px; display: block; background-image: url('../images/EDS/PT_Sprite.png'); background-repeat: no-repeat; }
+.pt-serialPeriodical { background-position: -30px -30px; height: 59px; }
+.pt-newspaperArticle { background-position: -140px -30px; height: 51px; }
+.pt-image { background-position: -245px -30px; height: 47px; }
+.pt-videoRecording { background-position: -345px -30px; height: 63px; }
+.pt-score { background-position: -445px -30px; height: 57px; }
+.pt-audio { background-position: -545px -30px; height: 49px; }
+.pt-map { background-position: -35px -120px; height: 45px; }
+.pt-book { background-position: -140px -120px; height: 59px; }
+.pt-kitObject { background-position: -245px -120px; height: 50px; }
+.pt-academicJournal, .pt-unknown { background-position: -345px -120px; height: 57px; }
+.pt-dissertation { background-position: -445px -120px; height: 63px; }
+.pt-literaryMaterial, .pt-authors { background-position: -35px -215px; height: 55px; }
+.pt-tableChart { background-position: -140px -215px; height: 49px; }
+.pt-patent { background-position: -245px -215px; height: 56px; }
+.pt-report { background-position: -345px -215px; height: 63px; }
+.pt-reference, .pt-readersAdvisory { background-position: -445px -215px; height: 52px; }
+.pt-governmentDocument { background-position: -545px -215px; height: 60px; }
+.pt-editorialOpinion { background-position: -35px -305px; height: 47px; }
+.pt-transcript { background-position: -140px -305px; height: 63px; }
+.pt-review { background-position: -245px -305px; height: 48px; }
+.pt-biography { background-position: -345px -305px; height: 53px; }
+.pt-electronicResource { 	background-position: -445px -305px; height: 63px; }
+.pt-recommendedReadsList { background-position: -540px -305px; height: 61px; }
+.pt-pictureBookExtender { background-position: -35px -400px; height: 65px; }
+.pt-grabAndGo { background-position: -140px -400px; height: 51px; }
+.pt-featureArticle { background-position: -245px -400px; height: 65px; }
+.pt-curricularConnection { background-position: -345px -400px; height: 65px; }
+.pt-bookTalk { background-position: -455px -400px; height: 55px; }
+.pt-bookDiscussionGuides { background-position: -545px -400px; height: 55px; }
+.pt-awardWinner { background-position: -34px -500px; height: 70px; }
+.pt-authorReadalike { background-position: -140px -500px; height: 60px; }
+.pt-series { background-position: -245px -495px; height: 75px; }
+.pt-ebook { background-position: -350px -510px; height: 60px; }
+.pt-audiobook { background-position: -440px -510px; height: 60px; }
+.pt-conference { background-position: -545px -505px; height: 70px; }
+.pt-Poem { background-position: -35px -615px; height: 60px; }
+.pt-ShortStory { background-position: -141px -620px; height: 55px; }
+.pt-play{ background-position: -245px -620px; height: 50px; }
+
+/* full text icons */
+/* Icons */
+.icon--eds {
+    background: url("../images/EDS/sprites_32.png") no-repeat top left;
+    height: 32px;
+    line-height: 32px;
+    display: inline-block;
+    padding-left: 36px;
+}
+
+.icon--eds.ebook {
+    background-position: 0 0;
+}
+
+.icon--eds.html {
+    background-position: 0 -42px;
+}
+
+.icon--eds.pdf {
+    background-position: 0 -84px;
+}
+
+.icon13 {
+    background: url("../images/EDS/sprites_32.png") no-repeat top left;
+    padding-left: 18px;
+    width: 13px;
+    height: 13px;
+}
+
+.icon13.collapsed {
+    background-position: 0 -126px;
+}
+
+.icon13.expanded {
+    background-position: 0 -149px;
+}

themes/bootstrap5/css/combined-search.css

@@ -0,0 +1,7 @@
+.combined-list .result .left   {width:25%}
+.combined-list .result .middle {width:75%}
+.combined-list .result .right  {display:none}
+.result {padding-right:0}
+.result > .col-xs-1.checkbox {padding-right:0;width:10%}
+.result > .col-xs-11 {width:89%}
+.form-inline > .clearfix {margin-left:7px}