From 9a9d9a78a7a5fa4475896582969f88c584a70d19 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Tue, 3 Dec 2024 11:25:04 +0100
Subject: [PATCH 01/11] #665 Reflect changes introduced with UBO-372

---
 erfurt/src/main/resources/xsl/html-layout.xsl | 29 +++++---------
 .../src/main/resources/xsl/html-layout.xsl    | 35 +++++-----------
 .../src/main/resources/xsl/html-layout.xsl    | 40 ++++++++-----------
 jena/src/main/resources/xsl/html-layout.xsl   | 18 +++++----
 weimar/src/main/resources/xsl/html-layout.xsl |  8 ++--
 5 files changed, 52 insertions(+), 78 deletions(-)

diff --git a/erfurt/src/main/resources/xsl/html-layout.xsl b/erfurt/src/main/resources/xsl/html-layout.xsl
index 761a463f1..1e9934f6f 100644
--- a/erfurt/src/main/resources/xsl/html-layout.xsl
+++ b/erfurt/src/main/resources/xsl/html-layout.xsl
@@ -18,8 +18,7 @@
   <xsl:param name="ThUniBib.ServiceDesk.enabled"/>
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
-  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
-  <xsl:param name="UBO.Frontend.chosen.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -54,26 +53,20 @@
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico"/>
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
       <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
-      <script
-          src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
-      <script src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css"
-            rel="stylesheet"/>
-      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
-
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css"
-            type="text/css"/>
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css"
-            type="text/css"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
+
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
 
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
-      <script>var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
-      </script>
-      <script>var currentLang = '<xsl:value-of select="$CurrentLang"/>';
+      <script>
+        var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
+        var currentLang = '<xsl:value-of select="$CurrentLang"/>';
       </script>
+
       <script src="{$WebApplicationBaseURL}js/session-polling.js"/>
       <script src="{$WebApplicationBaseURL}js/person-popover.js"/>
 
diff --git a/ilmenau/src/main/resources/xsl/html-layout.xsl b/ilmenau/src/main/resources/xsl/html-layout.xsl
index 66cff115a..6816c9e10 100644
--- a/ilmenau/src/main/resources/xsl/html-layout.xsl
+++ b/ilmenau/src/main/resources/xsl/html-layout.xsl
@@ -15,8 +15,7 @@
   <xsl:param name="UBO.Login.Path"/>
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
-  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
-  <xsl:param name="UBO.Frontend.chosen.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -51,33 +50,21 @@
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico"/>
 
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css"
-            rel="stylesheet"/>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
-
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css"
-            type="text/css"/>
-      <link rel="stylesheet"
-            href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css"
-            type="text/css"/>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
+      <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
-      <script type="text/javascript">var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
-      </script>
-      <script type="text/javascript">var currentLang = '<xsl:value-of select="$CurrentLang"/>';
+      <script>
+        var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
+        var currentLang = '<xsl:value-of select="$CurrentLang"/>';
       </script>
 
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/session-polling.js"/>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/person-popover.js"/>
+      <script src="{$WebApplicationBaseURL}js/session-polling.js"/>
+      <script src="{$WebApplicationBaseURL}js/person-popover.js"/>
 
       <xsl:copy-of select="node()"/>
     </head>
diff --git a/jena-thulb/src/main/resources/xsl/html-layout.xsl b/jena-thulb/src/main/resources/xsl/html-layout.xsl
index e94467fb0..56365a816 100644
--- a/jena-thulb/src/main/resources/xsl/html-layout.xsl
+++ b/jena-thulb/src/main/resources/xsl/html-layout.xsl
@@ -15,11 +15,10 @@
   <xsl:param name="UBO.Mail.Feedback" />
   <xsl:param name="RequestURL" />
 
-  <xsl:param name="UBO.Frontend.jquery.version" />
-  <xsl:param name="UBO.Frontend.jquery-ui.version" />
-  <xsl:param name="UBO.Frontend.chosen.version" />
-  <xsl:param name="UBO.Frontend.bootstrap.version" />
-  <xsl:param name="UBO.Frontend.font-awesome.version" />
+  <xsl:param name="UBO.Frontend.jquery.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap.version"/>
+  <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
   <!-- ==================== IMPORTS ==================== -->
   <!-- additional stylesheets -->
@@ -50,29 +49,24 @@
       <meta http-equiv="x-ua-compatible" content="ie=edge" />
 
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet" />
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"></script>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"></script>
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"></script>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet" />
-      <script type="text/javascript"
-              src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"></script>
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css"
-            type="text/css" />
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css"
-            type="text/css" />
+      <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
+
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css" />
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css" />
 
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico" />
 
-      <script type="text/javascript">var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL" />';
+      <script>
+        var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
+        var currentLang = '<xsl:value-of select="$CurrentLang"/>';
       </script>
-      <script type="text/javascript">var currentLang = '<xsl:value-of select="$CurrentLang" />';
-      </script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/session-polling.js"></script>
-      <script type="text/javascript" src="{$WebApplicationBaseURL}js/person-popover.js"></script>
+
+      <script src="{$WebApplicationBaseURL}js/session-polling.js"/>
+      <script src="{$WebApplicationBaseURL}js/person-popover.js"/>
       <xsl:copy-of select="node()" />
     </head>
   </xsl:template>
diff --git a/jena/src/main/resources/xsl/html-layout.xsl b/jena/src/main/resources/xsl/html-layout.xsl
index 3eb200863..6a71c36e1 100644
--- a/jena/src/main/resources/xsl/html-layout.xsl
+++ b/jena/src/main/resources/xsl/html-layout.xsl
@@ -18,8 +18,7 @@
   <xsl:param name="ThUniBib.ServiceDesk.enabled"/>
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
-  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
-  <xsl:param name="UBO.Frontend.chosen.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -55,17 +54,20 @@
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
       <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
       <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
-      <script src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet"/>
-      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
+
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
       <link rel="shortcut icon" href="{$WebApplicationBaseURL}images/favicon.ico"/>
 
-      <script>var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';</script>
-      <script>var currentLang = '<xsl:value-of select="$CurrentLang"/>';</script>
+      <script>
+        var webApplicationBaseURL = '<xsl:value-of select="$WebApplicationBaseURL"/>';
+        var currentLang = '<xsl:value-of select="$CurrentLang"/>';
+      </script>
+
       <script src="{$WebApplicationBaseURL}js/session-polling.js"/>
       <script src="{$WebApplicationBaseURL}js/person-popover.js"/>
       <xsl:copy-of select="node()"/>
diff --git a/weimar/src/main/resources/xsl/html-layout.xsl b/weimar/src/main/resources/xsl/html-layout.xsl
index 27a51b4fe..a273692a9 100644
--- a/weimar/src/main/resources/xsl/html-layout.xsl
+++ b/weimar/src/main/resources/xsl/html-layout.xsl
@@ -17,8 +17,7 @@
   <xsl:param name="UBO.TestInstance"/>
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
-  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
-  <xsl:param name="UBO.Frontend.chosen.version"/>
+  <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -55,10 +54,9 @@
 
       <script src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
       <script src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
-      <script src="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.jquery.min.js"/>
 
-      <link href="{$WebApplicationBaseURL}webjars/chosen-js/{$UBO.Frontend.chosen.version}/chosen.min.css" rel="stylesheet"/>
-      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
+      <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>

From 3e0c42c4275c6244712cef0c41f933c601dae327 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Wed, 4 Dec 2024 11:22:19 +0100
Subject: [PATCH 02/11] #665 Replaced chosen by selectpicker

---
 .../META-INF/resources/edit-admin.xed         |  3 +++
 .../META-INF/resources/edit-publication.xed   |  2 ++
 .../META-INF/resources/import-editor.xed      | 24 +++++++------------
 .../META-INF/resources/search-reference.xed   |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/common/src/main/resources/META-INF/resources/edit-admin.xed b/common/src/main/resources/META-INF/resources/edit-admin.xed
index 136746694..1a0823d24 100644
--- a/common/src/main/resources/META-INF/resources/edit-admin.xed
+++ b/common/src/main/resources/META-INF/resources/edit-admin.xed
@@ -126,12 +126,15 @@
                 </xed:choose>
               </xed:bind>
             </fieldset>
+          <!--
             <fieldset>
               <legend>
                 <xed:output value="concat(i18n:translate('ubo.project.information'), ': ')" />
               </legend>
+
               <xed:include ref="projectInformation" />
             </fieldset>
+            -->
           </xed:bind>
 
           <xed:include uri="webapp:import-editor.xed" ref="fix.structure.parent" />
diff --git a/common/src/main/resources/META-INF/resources/edit-publication.xed b/common/src/main/resources/META-INF/resources/edit-publication.xed
index 09359a710..498f0bf22 100644
--- a/common/src/main/resources/META-INF/resources/edit-publication.xed
+++ b/common/src/main/resources/META-INF/resources/edit-publication.xed
@@ -115,6 +115,7 @@
               </xed:if>
             </fieldset>
 
+            <!--
             <xed:if test="not (xed:call-java('org.mycore.common.xml.MCRXMLFunctions', 'isCurrentUserGuestUser'))">
               <fieldset>
                 <legend>
@@ -123,6 +124,7 @@
                 <xed:include ref="projectInformation" />
               </fieldset>
             </xed:if>
+            -->
           </xed:bind>
           <xed:include ref="cleanup" />
           <xed:include ref="cancel.submit" />
diff --git a/common/src/main/resources/META-INF/resources/import-editor.xed b/common/src/main/resources/META-INF/resources/import-editor.xed
index 857583ad0..1db4d6d1d 100644
--- a/common/src/main/resources/META-INF/resources/import-editor.xed
+++ b/common/src/main/resources/META-INF/resources/import-editor.xed
@@ -50,24 +50,16 @@
                   test="string-length(.) &gt; 0"
                   relevant-if="not(//mods:mods/mods:relatedItem[@type='series']) and (string-length(//mods:mods/mods:relatedItem[@type='host']/mods:genre[@type='intern']) &gt; 0)"
                   i18n="ubo.title.validation.genre.intern.present" display="global"/>
+  </xed:template>
 
-    <script type="text/javascript">
-      <![CDATA[
+  <xed:template id="javascript">
+      <script>
         $(document).ready(function () {
-            $('select[class*="autocomplete"]').chosen({search_contains: true});
-            $(document).popover({
-                selector: "[data-toggle=popover]",
-                container: "body",
-                html: true,
-                trigger: "focus"
-            });
+          $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10});
         });
-      ]]>
-    </script>
-  </xed:template>
+      </script>
 
-  <xed:template id="javascript">
-    <script src="{$WebApplicationBaseURL}js/language-search.js"/>
+      <script src="{$WebApplicationBaseURL}js/language-search.js"/>
   </xed:template>
 
   <xed:template id="common.metafields">
@@ -136,7 +128,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:items2options:classification:editor:-1:children:destatis"/>
+          <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:destatis"/>
         </select>
         <xed:controls/>
       </div>
@@ -158,7 +150,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:items2options:classification:editor:-1:children:ORIGIN"/>
+          <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN"/>
         </select>
         <a tabindex="0" class="btn btn-secondary info-button" role="button" data-toggle="popover" data-placement="right"
            data-content="{i18n:ubo.help.department}">
diff --git a/jena-thulb/src/main/resources/META-INF/resources/search-reference.xed b/jena-thulb/src/main/resources/META-INF/resources/search-reference.xed
index 7c1be2989..ec5cc6076 100644
--- a/jena-thulb/src/main/resources/META-INF/resources/search-reference.xed
+++ b/jena-thulb/src/main/resources/META-INF/resources/search-reference.xed
@@ -80,7 +80,7 @@
                 <script type="text/javascript">
                   <![CDATA[
                     $(document).ready(function () {
-                      $('select[class*="autocomplete"]').chosen({search_contains: true});
+                      $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10});
                     });
                   ]]>
                 </script>

From 85ccf063373ccd45af2d6464aacc5819592a4d93 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Wed, 4 Dec 2024 11:54:13 +0100
Subject: [PATCH 03/11] #665 Added jquery-ui refs

---
 common/src/main/resources/META-INF/resources/edit-admin.xed  | 3 +--
 .../main/resources/META-INF/resources/edit-publication.xed   | 3 +--
 ilmenau/src/main/resources/xsl/html-layout.xsl               | 5 +++++
 jena-thulb/src/main/resources/xsl/html-layout.xsl            | 4 ++++
 jena/src/main/resources/xsl/html-layout.xsl                  | 4 ++++
 weimar/src/main/resources/xsl/html-layout.xsl                | 4 ++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/common/src/main/resources/META-INF/resources/edit-admin.xed b/common/src/main/resources/META-INF/resources/edit-admin.xed
index 1a0823d24..214342508 100644
--- a/common/src/main/resources/META-INF/resources/edit-admin.xed
+++ b/common/src/main/resources/META-INF/resources/edit-admin.xed
@@ -126,7 +126,7 @@
                 </xed:choose>
               </xed:bind>
             </fieldset>
-          <!--
+
             <fieldset>
               <legend>
                 <xed:output value="concat(i18n:translate('ubo.project.information'), ': ')" />
@@ -134,7 +134,6 @@
 
               <xed:include ref="projectInformation" />
             </fieldset>
-            -->
           </xed:bind>
 
           <xed:include uri="webapp:import-editor.xed" ref="fix.structure.parent" />
diff --git a/common/src/main/resources/META-INF/resources/edit-publication.xed b/common/src/main/resources/META-INF/resources/edit-publication.xed
index 498f0bf22..94a3e2444 100644
--- a/common/src/main/resources/META-INF/resources/edit-publication.xed
+++ b/common/src/main/resources/META-INF/resources/edit-publication.xed
@@ -115,7 +115,6 @@
               </xed:if>
             </fieldset>
 
-            <!--
             <xed:if test="not (xed:call-java('org.mycore.common.xml.MCRXMLFunctions', 'isCurrentUserGuestUser'))">
               <fieldset>
                 <legend>
@@ -124,8 +123,8 @@
                 <xed:include ref="projectInformation" />
               </fieldset>
             </xed:if>
-            -->
           </xed:bind>
+
           <xed:include ref="cleanup" />
           <xed:include ref="cancel.submit" />
           <xed:include ref="javascript" />
diff --git a/ilmenau/src/main/resources/xsl/html-layout.xsl b/ilmenau/src/main/resources/xsl/html-layout.xsl
index 6816c9e10..441b2564a 100644
--- a/ilmenau/src/main/resources/xsl/html-layout.xsl
+++ b/ilmenau/src/main/resources/xsl/html-layout.xsl
@@ -16,6 +16,7 @@
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
   <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -52,9 +53,13 @@
       <link href="{$WebApplicationBaseURL}rsc/sass/scss/bootstrap-ubo.css" rel="stylesheet"/>
       <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/jquery/{$UBO.Frontend.jquery.version}/jquery.min.js"/>
       <script type="text/javascript" src="{$WebApplicationBaseURL}webjars/bootstrap/{$UBO.Frontend.bootstrap.version}/js/bootstrap.bundle.min.js"/>
+
       <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
       <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
diff --git a/jena-thulb/src/main/resources/xsl/html-layout.xsl b/jena-thulb/src/main/resources/xsl/html-layout.xsl
index 56365a816..b039e801b 100644
--- a/jena-thulb/src/main/resources/xsl/html-layout.xsl
+++ b/jena-thulb/src/main/resources/xsl/html-layout.xsl
@@ -17,6 +17,7 @@
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
   <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -55,6 +56,9 @@
       <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
       <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css" />
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css" />
 
diff --git a/jena/src/main/resources/xsl/html-layout.xsl b/jena/src/main/resources/xsl/html-layout.xsl
index 6a71c36e1..7b16f4792 100644
--- a/jena/src/main/resources/xsl/html-layout.xsl
+++ b/jena/src/main/resources/xsl/html-layout.xsl
@@ -19,6 +19,7 @@
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
   <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -58,6 +59,9 @@
       <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
       <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
diff --git a/weimar/src/main/resources/xsl/html-layout.xsl b/weimar/src/main/resources/xsl/html-layout.xsl
index a273692a9..79943b932 100644
--- a/weimar/src/main/resources/xsl/html-layout.xsl
+++ b/weimar/src/main/resources/xsl/html-layout.xsl
@@ -18,6 +18,7 @@
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
   <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -58,6 +59,9 @@
       <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
       <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
+
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
 

From 9fe6ed2d882f1ff8f8378e85ba058d4477ba44ef Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Wed, 4 Dec 2024 14:20:27 +0100
Subject: [PATCH 04/11] #665 Set property UBO.Editor.import-list.omitSubtext =
 true

---
 .../src/main/resources/config/thunibib-common/mycore.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/src/main/resources/config/thunibib-common/mycore.properties b/common/src/main/resources/config/thunibib-common/mycore.properties
index 8a5748b2e..c2c158a3a 100644
--- a/common/src/main/resources/config/thunibib-common/mycore.properties
+++ b/common/src/main/resources/config/thunibib-common/mycore.properties
@@ -143,3 +143,5 @@ MCR.ContentTransformer.import.DBTList.Steps                       = import.DBTId
 MCR.ContentTransformer.import.DBTList.Filter                      = supportedmods
 MCR.ContentTransformer.import.DBTList2MCRObj.Class                = org.mycore.common.content.transformer.MCRXSLTransformer
 MCR.ContentTransformer.import.DBTList2MCRObj.Stylesheet           = xsl/import/dbt2mods-genre2uri.xsl,xsl/import-mods2mycoreobject.xsl
+
+UBO.Editor.import-list.omitSubtext = true

From cb38a09106820dcc5ca5a98c825e4c1bc8ea1c02 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Thu, 5 Dec 2024 08:26:44 +0100
Subject: [PATCH 05/11] #665 Add parameter ?omitSubtext=true to
 xslStyle:mycoreclass-options URIs

---
 .../src/main/resources/META-INF/resources/import-editor.xed   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/main/resources/META-INF/resources/import-editor.xed b/common/src/main/resources/META-INF/resources/import-editor.xed
index 1db4d6d1d..0e6a93339 100644
--- a/common/src/main/resources/META-INF/resources/import-editor.xed
+++ b/common/src/main/resources/META-INF/resources/import-editor.xed
@@ -128,7 +128,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:destatis"/>
+          <xed:include uri="xslStyle:mycoreclass-options?omitSubtext=true:classification:metadata:-1:children:destatis"/>
         </select>
         <xed:controls/>
       </div>
@@ -150,7 +150,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN"/>
+          <xed:include uri="xslStyle:mycoreclass-options?omitSubtext=true:classification:metadata:-1:children:ORIGIN"/>
         </select>
         <a tabindex="0" class="btn btn-secondary info-button" role="button" data-toggle="popover" data-placement="right"
            data-content="{i18n:ubo.help.department}">

From e3f977ba475130d0070d6a0172a59b47b675e460 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Thu, 5 Dec 2024 08:37:15 +0100
Subject: [PATCH 06/11] #665 Added _thunibib_common.scss

---
 .../resources/scss/base/_thunibib_common.scss |  3 ++
 .../resources/scss/bootstrap-ubo.scss         | 31 +++++++++++++------
 .../resources/scss/bootstrap-ubo.scss         |  4 +--
 .../resources/scss/bootstrap-ubo.scss         |  4 +--
 .../resources/scss/bootstrap-ubo.scss         |  8 +++--
 .../resources/scss/bootstrap-ubo.scss         |  4 ++-
 6 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss

diff --git a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
new file mode 100644
index 000000000..7e3ec2a4b
--- /dev/null
+++ b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
@@ -0,0 +1,3 @@
+.ubo-import-list-select-fachreferate {
+  display: none;
+}
diff --git a/erfurt/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/erfurt/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index e954a3bbf..920bfad20 100644
--- a/erfurt/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/erfurt/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -1,14 +1,25 @@
-@import "./utilities/variables";  // project variables
+@import "./utilities/variables";
+// project variables
 
-@import "ubo";     // core layout (variables and base settings)
+@import "ubo";
+// core layout (variables and base settings)
 
-@import "./base/general";         // common settings
+@import "./base/general";
+// common settings
 
-@import "./base/header";          // page header
-@import "./base/navigation";      // menus and links
-@import "./base/footer";          // page footer
+@import "./base/header";
+// page header
+@import "./base/navigation";
+// menus and links
+@import "./base/footer";
+// page footer
 
-@import "./base/typo";            // all about typography
-@import "./base/buttons";         // button settings
-@import "./base/forms";           // forms but not buttons
-@import "./base/cards";           // cards
+@import "./base/typo";
+// all about typography
+@import "./base/buttons";
+// button settings
+@import "./base/forms";
+// forms but not buttons
+@import "./base/cards";
+// cards
+@import "./base/thunibib_common";
diff --git a/ilmenau/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/ilmenau/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index 227ecb91f..3ad534437 100644
--- a/ilmenau/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/ilmenau/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -2,11 +2,9 @@
 // http://getbootstrap.com/customize/#less-variables
 @import "./utilities/variables_ilmenau";
 
-
 // necessary import (parent)
 @import "ubo";
 
-
 // thuunibib CSS
 // Unspecific/general
 @import "./base/general";
@@ -28,3 +26,5 @@
 
 // Footer-Specific
 @import "./base/footer";
+// shared thunibib styles
+@import "./base/thunibib_common";
diff --git a/jena-thulb/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/jena-thulb/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index ea470c1c9..6da12e520 100644
--- a/jena-thulb/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/jena-thulb/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -2,11 +2,9 @@
 // http://getbootstrap.com/customize/#less-variables
 @import "./utilities/variables_thunibib";
 
-
 // necessary import (parent)
 @import "ubo";
 
-
 // thuunibib CSS
 // Unspecific/general
 @import "./base/general";
@@ -28,3 +26,5 @@
 
 // Footer-Specific
 @import "./base/footer";
+// shared thunibib styles
+@import "./base/thunibib_common";
diff --git a/jena/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/jena/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index ea470c1c9..7b38917aa 100644
--- a/jena/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/jena/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -2,12 +2,10 @@
 // http://getbootstrap.com/customize/#less-variables
 @import "./utilities/variables_thunibib";
 
-
 // necessary import (parent)
 @import "ubo";
 
-
-// thuunibib CSS
+// thunibib CSS
 // Unspecific/general
 @import "./base/general";
 
@@ -28,3 +26,7 @@
 
 // Footer-Specific
 @import "./base/footer";
+
+// shared thunibib styles
+@import "./base/thunibib_common";
+
diff --git a/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss b/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
index f13bbbff0..3bad06ffe 100644
--- a/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
+++ b/weimar/src/main/resources/META-INF/resources/scss/bootstrap-ubo.scss
@@ -20,5 +20,7 @@
 // button settings
 @import "./base/forms";
 // forms but not buttons
-@import "./base/cards"; // cards
+@import "./base/cards";
+// cards
 @import "./base/fonts";
+@import "./base/thunibib_common";

From 16ac85a4096f54c4b6ef1754157ac98691823e35 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Thu, 5 Dec 2024 08:58:48 +0100
Subject: [PATCH 07/11] #665 Moved flag icons to _thunibib_common.scss

---
 .../resources/scss/base/_thunibib_common.scss | 21 +++++++++++++++++++
 .../META-INF/resources/scss/base/_header.scss | 21 -------------------
 .../resources/scss/base/_general.scss         | 21 -------------------
 .../META-INF/resources/scss/base/_header.scss | 21 -------------------
 .../resources/scss/base/_general.scss         | 21 -------------------
 5 files changed, 21 insertions(+), 84 deletions(-)

diff --git a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
index 7e3ec2a4b..7d2108ded 100644
--- a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
+++ b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
@@ -1,3 +1,24 @@
+i.flag {
+  margin-right: .5rem;
+  position: relative;
+  display: inline-block;
+  width: 1.33333333em;
+  line-height: 1em;
+  height: 1em;
+  background-size: contain;
+  background-position: 50%;
+  background-repeat: no-repeat;
+  vertical-align: middle;
+}
+
+i.flag-de {
+  background-image: url("/images/flag-de.svg");
+}
+
+i.flag-en {
+  background-image: url("/images/flag-en.svg");
+}
+
 .ubo-import-list-select-fachreferate {
   display: none;
 }
diff --git a/erfurt/src/main/resources/META-INF/resources/scss/base/_header.scss b/erfurt/src/main/resources/META-INF/resources/scss/base/_header.scss
index a1f02ab1e..af1bed857 100644
--- a/erfurt/src/main/resources/META-INF/resources/scss/base/_header.scss
+++ b/erfurt/src/main/resources/META-INF/resources/scss/base/_header.scss
@@ -57,24 +57,3 @@ header {
 #mcrFunctionsDropdown {
   font-size: 1rem;
 }
-
-i.flag {
-  margin-right: .5rem;
-  position: relative;
-  display: inline-block;
-  width: 1.33333333em;
-  line-height: 1em;
-  height: 1em;
-  background-size: contain;
-  background-position: 50%;
-  background-repeat: no-repeat;
-  vertical-align: middle;
-}
-
-i.flag-de {
-  background-image: url("/images/flag-de.svg");
-}
-
-i.flag-en {
-  background-image: url("/images/flag-en.svg");
-}
diff --git a/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss b/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
index 79f719a7d..342cb9834 100644
--- a/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
+++ b/ilmenau/src/main/resources/META-INF/resources/scss/base/_general.scss
@@ -33,27 +33,6 @@ i.ubo-picker-service-LDAPWithLocalService::before {
   content: "\f1ad";
 }
 
-i.flag {
-  margin-right: .5rem;
-  position: relative;
-  display: inline-block;
-  width: 1.33333333em;
-  line-height: 1em;
-  height: 1em;
-  background-size: contain;
-  background-position: 50%;
-  background-repeat: no-repeat;
-  vertical-align: middle;
-}
-
-i.flag-de {
-  background-image: url("/images/flag-de.svg");
-}
-
-i.flag-en {
-  background-image: url("/images/flag-en.svg");
-}
-
 #ubo-search-person option[value="person_ths"] {
   display: none;
 }
diff --git a/jena/src/main/resources/META-INF/resources/scss/base/_header.scss b/jena/src/main/resources/META-INF/resources/scss/base/_header.scss
index 4e7e9cb5f..956771aef 100644
--- a/jena/src/main/resources/META-INF/resources/scss/base/_header.scss
+++ b/jena/src/main/resources/META-INF/resources/scss/base/_header.scss
@@ -97,24 +97,3 @@ a#mcrFunctionsDropdown {
     }
   }
 }
-
-i.flag {
-  margin-right: .5rem;
-  position: relative;
-  display: inline-block;
-  width: 1.33333333em;
-  line-height: 1em;
-  height: 1em;
-  background-size: contain;
-  background-position: 50%;
-  background-repeat: no-repeat;
-  vertical-align: middle;
-}
-
-i.flag-de {
-  background-image: url("/images/flag-de.svg");
-}
-
-i.flag-en {
-  background-image: url("/images/flag-en.svg");
-}
diff --git a/weimar/src/main/resources/META-INF/resources/scss/base/_general.scss b/weimar/src/main/resources/META-INF/resources/scss/base/_general.scss
index 05a5967a2..fd0a55b5b 100644
--- a/weimar/src/main/resources/META-INF/resources/scss/base/_general.scss
+++ b/weimar/src/main/resources/META-INF/resources/scss/base/_general.scss
@@ -148,27 +148,6 @@ h1, h2, h3, h4, h5 {
   }
 }
 
-i.flag {
-  margin-right: .5rem;
-  position: relative;
-  display: inline-block;
-  width: 1.33333333em;
-  line-height: 1em;
-  height: 1em;
-  background-size: contain;
-  background-position: 50%;
-  background-repeat: no-repeat;
-  vertical-align: middle;
-}
-
-i.flag-de {
-  background-image: url("/images/flag-de.svg");
-}
-
-i.flag-en {
-  background-image: url("/images/flag-en.svg");
-}
-
 #ubo-search-person option[value="person_ths"] {
   display: none;
 }

From 84fddeb86891628cdce8026d17bee83ae0beaf0e Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Thu, 5 Dec 2024 09:17:52 +0100
Subject: [PATCH 08/11] #665 Added import of jquery-ui to html-layout.xsl
 (Erfurt)

---
 erfurt/src/main/resources/xsl/html-layout.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erfurt/src/main/resources/xsl/html-layout.xsl b/erfurt/src/main/resources/xsl/html-layout.xsl
index 1e9934f6f..66bc26038 100644
--- a/erfurt/src/main/resources/xsl/html-layout.xsl
+++ b/erfurt/src/main/resources/xsl/html-layout.xsl
@@ -19,6 +19,7 @@
 
   <xsl:param name="UBO.Frontend.jquery.version"/>
   <xsl:param name="UBO.Frontend.bootstrap-select.version"/>
+  <xsl:param name="UBO.Frontend.jquery-ui.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -58,8 +59,10 @@
       <script src="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/js/bootstrap-select.min.js"/>
       <link href="{$WebApplicationBaseURL}webjars/bootstrap-select/{$UBO.Frontend.bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" />
 
-      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
+      <script src="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.js"/>
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/jquery-ui/{$UBO.Frontend.jquery-ui.version}/jquery-ui.css" type="text/css"/>
 
+      <link rel="stylesheet" href="{$WebApplicationBaseURL}webjars/font-awesome/{$UBO.Frontend.font-awesome.version}/css/all.css" type="text/css"/>
       <link rel="stylesheet" href="{$WebApplicationBaseURL}css/fonts.css" type="text/css"/>
 
       <script>

From 47522525b8b56d9b65c8e5dc2b655fbe75a6d305 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Fri, 6 Dec 2024 10:32:36 +0100
Subject: [PATCH 09/11] #665 Added missing x-color attributes to ubogenre.xml

---
 .../resources/setup/classifications/ubogenre.xml  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/common/src/main/resources/setup/classifications/ubogenre.xml b/common/src/main/resources/setup/classifications/ubogenre.xml
index cb159b52b..540f91763 100644
--- a/common/src/main/resources/setup/classifications/ubogenre.xml
+++ b/common/src/main/resources/setup/classifications/ubogenre.xml
@@ -234,6 +234,7 @@
       </category>
       <category ID="interview">
         <label xml:lang="x-hosts" text="standalone journal collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#e02f8b"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Interview"/>
@@ -267,6 +268,7 @@
       </category>
       <category ID="workingpaper">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#953a4b"/>
         <label xml:lang="x-marcgt" text="book"/>
         <label xml:lang="x-mapping" text="marcgt:book orcidWorkType:working-paper"/>
 
@@ -284,6 +286,7 @@
       </category>
       <category ID="poster">
         <label xml:lang="x-hosts" text="standalone proceedings collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#7671b1"/>
         <label xml:lang="x-mapping" text="orcidWorkType:conference-poster"/>
 
         <label xml:lang="de" text="Poster"/>
@@ -291,6 +294,7 @@
       </category>
       <category ID="preprint">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#1671c1"/>
         <label xml:lang="x-mapping" text="orcidWorkType:preprint"/>
 
         <label xml:lang="de" text="Preprint"/>
@@ -298,6 +302,7 @@
       </category>
       <category ID="authors_version">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#2691DF"/>
         <label xml:lang="x-mapping" text="orcidWorkType:journal-article"/>
 
         <label xml:lang="de" text="Autorenversion"/>
@@ -313,6 +318,7 @@
       </category>
       <category ID="image">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#df9526"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Bild"/>
@@ -320,6 +326,7 @@
       </category>
       <category ID="software">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#df1526"/>
         <label xml:lang="x-mapping" text="orcidWorkType:software"/>
 
         <label xml:lang="de" text="Software"/>
@@ -327,6 +334,7 @@
       </category>
       <category ID="video">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#ac0026"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Video/Film"/>
@@ -334,6 +342,7 @@
       </category>
       <category ID="speech">
         <label xml:lang="x-hosts" text="standalone journal collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#467040"/>
         <label xml:lang="x-mapping" text="orcidWorkType:lecture-speech"/>
 
         <label xml:lang="de" text="Vortrag/Redebeitrag"/>
@@ -341,6 +350,7 @@
       </category>
       <category ID="map">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#997950"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Karte"/>
@@ -348,6 +358,7 @@
       </category>
       <category ID="sheet_music">
         <label xml:lang="x-hosts" text="standalone collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#eeeee0"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Noten"/>
@@ -355,6 +366,7 @@
       </category>
       <category ID="object">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#856468"/>
         <label xml:lang="x-mapping" text="orcidWorkType:physical-object"/>
 
         <label xml:lang="de" text="Objekt/Artefakt"/>
@@ -384,6 +396,7 @@
       </category>
       <category ID="newspaper">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#456468"/>
         <label xml:lang="x-mapping" text="orcidWorkType:newspaper-article"/>
 
         <label xml:lang="de" text="Zeitung"/>
@@ -391,6 +404,7 @@
       </category>
       <category ID="blog">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#1a3000"/>
         <label xml:lang="x-mapping" text="orcidWorkType:website"/>
 
         <label xml:lang="de" text="Website/Blog"/>
@@ -399,6 +413,7 @@
     </category>
     <category ID="others">
       <label xml:lang="x-hosts" text="standalone"/>
+      <label xml:lang="x-color" text="#eeeeed"/>
       <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
       <label xml:lang="de" text="Sonstiges"/>

From 67be98b2d57d3a6c59848390286ec5dde0d090e9 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Tue, 10 Dec 2024 11:08:04 +0100
Subject: [PATCH 10/11] #665 Improved readability of boostrap-select list
 entries

---
 .../META-INF/resources/scss/base/_thunibib_common.scss       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
index 7d2108ded..085f08d91 100644
--- a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
+++ b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
@@ -22,3 +22,8 @@ i.flag-en {
 .ubo-import-list-select-fachreferate {
   display: none;
 }
+
+/* Fix color of bootstrap-select items */
+div[id^="bs-select"] ul.dropdown-menu li.active a {
+  color: white;
+}

From a6267523015965c28833f47e9c4a0ee0e8b31917 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Thu, 12 Dec 2024 09:24:24 +0100
Subject: [PATCH 11/11] #665 Added new datasource config
 MCR.MODS.EnrichmentResolver.DataSources.gbvdbt

---
 .../src/main/resources/config/thunibib-common/mycore.properties  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/main/resources/config/thunibib-common/mycore.properties b/common/src/main/resources/config/thunibib-common/mycore.properties
index c2c158a3a..6038fcc68 100644
--- a/common/src/main/resources/config/thunibib-common/mycore.properties
+++ b/common/src/main/resources/config/thunibib-common/mycore.properties
@@ -44,6 +44,7 @@ MCR.MODS.EnrichmentResolver.DataSources.scopus-import    = Unpaywall GBV ZDB JOP
 MCR.MODS.EnrichmentResolver.DataSources.scopusImport     = %MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
 MCR.MODS.EnrichmentResolver.DataSources.withScopus       = (GBV CrossRef DataCite) PPN2DBT-ID Scopus (PubMed IEEE arXiv) Unpaywall ZDB JOP
 MCR.MODS.EnrichmentResolver.DataSources.withoutScopus    = (GBV CrossRef DataCite) PPN2DBT-ID (PubMed IEEE arXiv) Unpaywall ZDB JOP
+MCR.MODS.EnrichmentResolver.DataSources.gbvdbt           = GBV PPN2DBT-ID
 UBO.Scopus.Importer.ImportURI                            = xslStyle:mods2mycoreobject:enrich:scopus-import:xslStyle:%ThUniBib.Scopus.XSL%,%UBO.SupportedMODSFilterName%:%UBO.Scopus.Importer.ImportURI.Scopus%
 
 #pica2mods default configuration