From 1a8131236ad6dc4531f4125af8d4e86063d039f0 Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 5 Dec 2024 13:48:01 +0100
Subject: [PATCH 1/4] UBO-372 layout fixes in import list

---
 .../META-INF/resources/import-list.xed         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ubo-common/src/main/resources/META-INF/resources/import-list.xed b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
index 3be1d209..2f2b016c 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-list.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
@@ -59,11 +59,11 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="ubo.partOf" />:
                 </label>
-                <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} col-7 form-control custom-select">
+                <select id="{generate-id()}" class="{$xed-validation-marker} mycore-form-input form-control custom-select">
                   <option value="">
                     <xed:output i18n="search.select"/>
                   </option>
-                  <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:partOf" />
+                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:partOf" />
                 </select>
               </div>
             </xed:bind>
@@ -73,7 +73,7 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="search.dozbib.status" />:
                 </label>
-                <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} col-7 form-control custom-select">
+                <select id="{generate-id()}" class="{$xed-validation-marker}  mycore-form-input form-control custom-select">
                   <option value="">
                     <xed:output i18n="search.select"/>
                   </option>
@@ -89,11 +89,11 @@
                 <label for="subject" class="mycore-form-label text-nowrap">
                   <xed:output i18n="ubo.subject" />:
                 </label>
-                <select class="autocomplete {$xed-validation-marker} col-7 form-control custom-select">
+                <select class="autocomplete {$xed-validation-marker} mycore-form-input" data-container="form-group" data-display="static">
                   <option value="">
                     <xed:output i18n="search.select" />
                   </option>
-                  <xed:include uri="xslStyle:items2options:classification:editor:-1:children:fachreferate" />
+                  <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:fachreferate" />
                 </select>
                 <xed:controls />
               </div>
@@ -104,7 +104,7 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="ubo.department" />:
                 </label>
-                <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} col-7 form-control custom-select">
+                <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} mycore-form-input" data-container="form-group" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
                   <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:ORIGIN" />
                 </select>
@@ -116,8 +116,8 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="ubo.import.list.label.sourceFormat" />:
                 </label>
-                <select id="{generate-id()}" class="form-control col-7 mr-1 custom-select" onchange="UBOImportList.toggleEnrichment(this)">
-                  <xed:include uri="xslStyle:items2options:classification:editor:-1:children:importSourceType" />
+                <select id="{generate-id()}" class="form-control  mycore-form-input mr-1 custom-select" onchange="UBOImportList.toggleEnrichment(this)">
+                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:importSourceType" />
                 </select>
               </div>
             </xed:bind>
@@ -127,7 +127,7 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="ubo.import.list.label.outputFormat" />:
                 </label>
-                <select id="import-list-output-format-select" class="form-control col-7 custom-select">
+                <select id="import-list-output-format-select" class="form-control  mycore-form-input custom-select">
                   <option value="preview-html">Vorschau (HTML)</option>
                   <option value="preview-mods-raw">Vorschau (MODS)</option>
                   <option value="import">direkt importieren</option>

From 2d3e21fa4351ca1b87eaeb4c9e8842c1c66a1469 Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 12 Dec 2024 10:25:13 +0100
Subject: [PATCH 2/4] UBO-372 - add css for bootstrap-select

 - fix poper bug by adding data-display="static"
 - add layout configuration for bootstrap-select
---
 .../META-INF/resources/import-editor.xed      | 44 +++++++++++--------
 .../resources/import-from-evaluna.xed         | 15 ++++++-
 .../META-INF/resources/import-list.xed        |  8 ++++
 .../META-INF/resources/js/ImportList.js       | 11 ++++-
 .../META-INF/resources/scss/_ubo-common.scss  |  6 +++
 .../META-INF/resources/search-mdiss.xed       | 24 +++++++---
 .../resources/META-INF/resources/search.xed   | 16 ++++++-
 7 files changed, 95 insertions(+), 29 deletions(-)

diff --git a/ubo-common/src/main/resources/META-INF/resources/import-editor.xed b/ubo-common/src/main/resources/META-INF/resources/import-editor.xed
index bc063da8..d4495be2 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-editor.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-editor.xed
@@ -22,9 +22,17 @@
     <script type="text/javascript">
       <![CDATA[
       $(document).ready(function() {
-      
-        $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10}); 
-      
+
+        $('select[class*="autocomplete"]').selectpicker({
+          liveSearch:true,
+          liveSearchNormalize:true,
+          virtualScroll:true,
+          showSubtext:true,
+          size:10,
+          width:'auto',
+          dropupAuto: false
+        });
+
         $(document).popover({
           selector: "[data-toggle=popover]",
           container: "body",
@@ -121,7 +129,7 @@
         <label for="{xed:generate-id()}" class="mycore-form-label ubo-mandatory">
           <xed:output value="concat(i18n:translate('ubo.subject'), ': ')" />
         </label>
-        <select id="{xed:generate-id()}" class="autocomplete mycore-form-input">
+        <select id="{xed:generate-id()}" class="autocomplete mycore-form-input" data-container="form-group" data-display="static">
           <option value="">
             <xed:output i18n="search.select.autocomplete" />
           </option>
@@ -135,20 +143,20 @@
   <xed:template id="origin">
     <xed:repeat xpath="mods:classification[@classID='ORIGIN']" max="10">
       <div class="form-inline form-group ubo-repeat-group">
-      <xed:choose>
-        <xed:when test="$genre_intern = 'dissertation'">
-          <label class="mycore-form-label ubo-mandatory" for="{xed:generate-id()}">
-            <xed:validate xpath="//mods:classification[@classID='ORIGIN']" required="true" i18n="condition.institution" display="global" />
-            <xed:output value="concat(i18n:translate('ubo.department'), ': ')" />
-          </label>
-        </xed:when>
-        <xed:otherwise>
-          <label class="mycore-form-label" for="{xed:generate-id()}">
-            <xed:output value="concat(i18n:translate('ubo.department'), ': ')" />
-          </label>
-        </xed:otherwise>
-      </xed:choose>
-        <select id="{xed:generate-id()}" class="autocomplete {$xed-validation-marker} mycore-form-input">
+        <xed:choose>
+          <xed:when test="$genre_intern = 'dissertation'">
+            <label class="mycore-form-label ubo-mandatory" for="{xed:generate-id()}">
+              <xed:validate xpath="//mods:classification[@classID='ORIGIN']" required="true" i18n="condition.institution" display="global" />
+              <xed:output value="concat(i18n:translate('ubo.department'), ': ')" />
+            </label>
+          </xed:when>
+          <xed:otherwise>
+            <label class="mycore-form-label" for="{xed:generate-id()}">
+              <xed:output value="concat(i18n:translate('ubo.department'), ': ')" />
+            </label>
+          </xed:otherwise>
+        </xed:choose>
+        <select id="{xed:generate-id()}" class="autocomplete {$xed-validation-marker} mycore-form-input" data-container="form-group" data-display="static">
           <option value=""><xed:output i18n="search.select.autocomplete" /></option>
           <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN" />
         </select>
diff --git a/ubo-common/src/main/resources/META-INF/resources/import-from-evaluna.xed b/ubo-common/src/main/resources/META-INF/resources/import-from-evaluna.xed
index 29d45594..4dee3c55 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-from-evaluna.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-from-evaluna.xed
@@ -37,7 +37,7 @@
             <div>
               <label for="{xed:generate-id()}">Institut / Klinik:</label>
               <span class="{$xed-validation-marker}">
-                <select id="{xed:generate-id()}" style="width:400px;" class="autocomplete {$xed-validation-marker}">
+                <select id="{xed:generate-id()}" style="width:400px;" class="autocomplete {$xed-validation-marker}" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
                   <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN:14" />
                 </select>
@@ -45,7 +45,18 @@
             </div>
           </xed:bind>
           <script type="text/javascript">
-            jQuery(document).ready(function() { jQuery('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10}); });
+            jQuery(document).ready(function() {
+              jQuery('select[class*="autocomplete"]').selectpicker({
+              liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10
+                liveSearch:true,
+                liveSearchNormalize:true,
+                virtualScroll:true,
+                showSubtext:true,
+                size:10,
+                width:'auto',
+                dropupAuto: false
+              });
+            });
           </script>
 
         </fieldset>
diff --git a/ubo-common/src/main/resources/META-INF/resources/import-list.xed b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
index 2f2b016c..18611581 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-list.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
@@ -73,7 +73,11 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="search.dozbib.status" />:
                 </label>
+<<<<<<< Upstream, based on d012ad70a15c87b15a15cc412bef21baf4878dbf
                 <select id="{generate-id()}" class="{$xed-validation-marker}  mycore-form-input form-control custom-select">
+=======
+                <select id="{generate-id()}" class="{$xed-validation-marker} mycore-form-input form-control custom-select">
+>>>>>>> 23de200 UBO-372 - add css for bootstrap-select
                   <option value="">
                     <xed:output i18n="search.select"/>
                   </option>
@@ -93,7 +97,11 @@
                   <option value="">
                     <xed:output i18n="search.select" />
                   </option>
+<<<<<<< Upstream, based on d012ad70a15c87b15a15cc412bef21baf4878dbf
                   <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:fachreferate" />
+=======
+                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:fachreferate" />
+>>>>>>> 23de200 UBO-372 - add css for bootstrap-select
                 </select>
                 <xed:controls />
               </div>
diff --git a/ubo-common/src/main/resources/META-INF/resources/js/ImportList.js b/ubo-common/src/main/resources/META-INF/resources/js/ImportList.js
index 4b658132..a19a5135 100644
--- a/ubo-common/src/main/resources/META-INF/resources/js/ImportList.js
+++ b/ubo-common/src/main/resources/META-INF/resources/js/ImportList.js
@@ -1,5 +1,14 @@
 $(document).ready(function () {
-    $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10});
+    $('select[class*="autocomplete"]').selectpicker({
+      liveSearch:true,
+      liveSearchNormalize:true,
+      virtualScroll:true,
+      showSubtext:true,
+      size:10,
+      width:'auto',
+      dropupAuto: false
+    });
+    
 });
 
 const UBOImportList = {
diff --git a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-common.scss b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-common.scss
index 71ffc7f3..065379a2 100644
--- a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-common.scss
+++ b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-common.scss
@@ -150,6 +150,12 @@
     padding-left: 5px;
   }
 
+  .bootstrap-select {
+    .dropdown-menu {
+      width: 100%;
+    }
+  }
+
 // Large devices (desktops) and below: <= 1200px
 @include media-breakpoint-down(lg) {
 // add/overwrite styles for responsive level lg and lower
diff --git a/ubo-common/src/main/resources/META-INF/resources/search-mdiss.xed b/ubo-common/src/main/resources/META-INF/resources/search-mdiss.xed
index 5cf84084..02a96a4c 100644
--- a/ubo-common/src/main/resources/META-INF/resources/search-mdiss.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/search-mdiss.xed
@@ -41,30 +41,42 @@
             <xed:bind xpath="conditions[@format='xml']/boolean[@operator='and']">
 
               <xed:bind xpath="condition6[@field='origin'][@operator='=']/@value" default="14">
-		<div class="form-group form-inline">
+                <div class="form-group form-inline">
                   <label class="mycore-form-label">
                     <xed:output i18n="search.dozbib.origin" />
                   </label>
-                  <select class="autocomplete mycore-form-input custom-select">
+                  <select class="autocomplete mycore-form-input custom-select" data-container="form-group" data-display="static">
                     <option value="14"><xed:output i18n="search.select" /></option>
                     <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN:14" />
                   </select>
                   <script type="text/javascript">
-                    $(document).ready(function() { $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10}); });
+                    $(document).ready(function() {
+    
+                      $('select[class*="autocomplete"]').selectpicker({
+                        liveSearch:true,
+                        liveSearchNormalize:true,
+                        virtualScroll:true,
+                        showSubtext:true,
+                        size:10,
+                        width:'auto',
+                        dropupAuto: false
+                      });
+    
+                    });
                   </script>
-		</div>
+                </div>
               </xed:bind>
 
               <xed:bind xpath="condition2[@operator='contains']/@field" initially="person_ths" />
               <xed:include uri="webapp:import-search.xed" ref="name" />
 
               <xed:bind xpath="condition4[@field='title'][@operator='contains']/@value">
-		<div class="form-group form-inline">
+                <div class="form-group form-inline">
                   <label class="mycore-form-label">
                     <xed:output i18n="search.title" />
                   </label>
                   <input type="text" class="mycore-form-input" />
-		</div>
+                </div>
               </xed:bind>
 
               <xed:include uri="webapp:import-search.xed" ref="year" />
diff --git a/ubo-common/src/main/resources/META-INF/resources/search.xed b/ubo-common/src/main/resources/META-INF/resources/search.xed
index ad1cbdc8..3319aa16 100644
--- a/ubo-common/src/main/resources/META-INF/resources/search.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/search.xed
@@ -145,13 +145,25 @@
                 <label for="{xed:generate-id()}" class="mycore-form-label">
                   <xed:output i18n="ubo.department" />:
                 </label>
-                <select id="{xed:generate-id()}" class="autocomplete mycore-form-input custom-select">
+                <select id="{xed:generate-id()}" class="autocomplete mycore-form-input custom-select" data-container="form-group" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
                   <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN" />
                 </select>
               </div>
               <script type="text/javascript">
-                $(document).ready(function() { $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10}); });
+                $(document).ready(function() {
+
+                  $('select[class*="autocomplete"]').selectpicker({
+                    liveSearch:true,
+                    liveSearchNormalize:true,
+                    virtualScroll:true,
+                    showSubtext:true,
+                    size:10,
+                    width:'auto',
+                    dropupAuto: false
+                  });
+
+                });
               </script>
             </xed:bind>
 

From 70ba45f1d301c9f849558394e036e519d9188fdd Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 12 Dec 2024 11:10:56 +0100
Subject: [PATCH 3/4] minor fixes

---
 .../main/resources/META-INF/resources/import-list.xed  | 10 +---------
 .../src/main/resources/META-INF/resources/search.xed   |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ubo-common/src/main/resources/META-INF/resources/import-list.xed b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
index 18611581..1f9fe3dd 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-list.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
@@ -73,11 +73,7 @@
                 <label for="{generate-id()}" class="mycore-form-label text-nowrap">
                   <xed:output i18n="search.dozbib.status" />:
                 </label>
-<<<<<<< Upstream, based on d012ad70a15c87b15a15cc412bef21baf4878dbf
                 <select id="{generate-id()}" class="{$xed-validation-marker}  mycore-form-input form-control custom-select">
-=======
-                <select id="{generate-id()}" class="{$xed-validation-marker} mycore-form-input form-control custom-select">
->>>>>>> 23de200 UBO-372 - add css for bootstrap-select
                   <option value="">
                     <xed:output i18n="search.select"/>
                   </option>
@@ -97,11 +93,7 @@
                   <option value="">
                     <xed:output i18n="search.select" />
                   </option>
-<<<<<<< Upstream, based on d012ad70a15c87b15a15cc412bef21baf4878dbf
                   <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:fachreferate" />
-=======
-                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:fachreferate" />
->>>>>>> 23de200 UBO-372 - add css for bootstrap-select
                 </select>
                 <xed:controls />
               </div>
@@ -114,7 +106,7 @@
                 </label>
                 <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} mycore-form-input" data-container="form-group" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
-                  <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:ORIGIN" />
+                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN" />
                 </select>
               </div>
             </xed:bind>
diff --git a/ubo-common/src/main/resources/META-INF/resources/search.xed b/ubo-common/src/main/resources/META-INF/resources/search.xed
index 3319aa16..7ae6483c 100644
--- a/ubo-common/src/main/resources/META-INF/resources/search.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/search.xed
@@ -145,7 +145,7 @@
                 <label for="{xed:generate-id()}" class="mycore-form-label">
                   <xed:output i18n="ubo.department" />:
                 </label>
-                <select id="{xed:generate-id()}" class="autocomplete mycore-form-input custom-select" data-container="form-group" data-display="static">
+                <select id="{xed:generate-id()}" class="autocomplete mycore-form-input" data-container="form-group" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
                   <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN" />
                 </select>

From 3fd358881be7e9ad317e6072a4d8fae08756d913 Mon Sep 17 00:00:00 2001
From: Kathleen Neumann <neumann@gbv.de>
Date: Thu, 12 Dec 2024 11:14:35 +0100
Subject: [PATCH 4/4] readd omitSubtext

---
 .../src/main/resources/META-INF/resources/import-list.xed       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubo-common/src/main/resources/META-INF/resources/import-list.xed b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
index 1f9fe3dd..2f2b016c 100644
--- a/ubo-common/src/main/resources/META-INF/resources/import-list.xed
+++ b/ubo-common/src/main/resources/META-INF/resources/import-list.xed
@@ -106,7 +106,7 @@
                 </label>
                 <select id="{generate-id()}" class="autocomplete {$xed-validation-marker} mycore-form-input" data-container="form-group" data-display="static">
                   <option value=""><xed:output i18n="search.select" /></option>
-                  <xed:include uri="xslStyle:mycoreclass-options:classification:metadata:-1:children:ORIGIN" />
+                  <xed:include uri="xslStyle:mycoreclass-options?omitSubtext={$UBO.Editor.import-list.omitSubtext}:classification:metadata:-1:children:ORIGIN" />
                 </select>
               </div>
             </xed:bind>