#665 Reflect changes introduced with UBO-372

common/src/main/resources/META-INF/resources/edit-admin.xed

@@ -126,10 +126,12 @@
                 </xed:choose>
               </xed:bind>
             </fieldset>
+
             <fieldset>
               <legend>
                 <xed:output value="concat(i18n:translate('ubo.project.information'), ': ')" />
               </legend>
+
               <xed:include ref="projectInformation" />
             </fieldset>
           </xed:bind>

common/src/main/resources/META-INF/resources/edit-publication.xed

@@ -124,6 +124,7 @@
               </fieldset>
             </xed:if>
           </xed:bind>
+
           <xed:include ref="cleanup" />
           <xed:include ref="cancel.submit" />
           <xed:include ref="javascript" />

common/src/main/resources/META-INF/resources/import-editor.xed

@@ -50,24 +50,16 @@
                   test="string-length(.) > 0"
                   relevant-if="not(//mods:mods/mods:relatedItem[@type='series']) and (string-length(//mods:mods/mods:relatedItem[@type='host']/mods:genre[@type='intern']) > 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?omitSubtext=true: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?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}">

common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss

@@ -0,0 +1,29 @@
+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;
+}
+
+/* Fix color of bootstrap-select items */
+div[id^="bs-select"] ul.dropdown-menu li.active a {
+  color: white;
+}

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
@@ -143,3 +144,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

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,20 +286,23 @@
       </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"/>
         <label xml:lang="en" text="Poster"/>
       </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"/>
         <label xml:lang="en" text="Preprint"/>
       </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,48 +318,55 @@
       </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"/>
         <label xml:lang="en" text="Image/picture"/>
       </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"/>
         <label xml:lang="en" text="Software"/>
       </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"/>
         <label xml:lang="en" text="Video/film"/>
       </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"/>
         <label xml:lang="en" text="Speech/lecture"/>
       </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"/>
         <label xml:lang="en" text="Map"/>
       </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"/>
         <label xml:lang="en" text="Sheet music"/>
       </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,13 +396,15 @@
       </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"/>
         <label xml:lang="en" text="Newspaper"/>
       </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"/>

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");
-}

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";

erfurt/src/main/resources/xsl/html-layout.xsl

@@ -18,8 +18,8 @@
   <xsl:param name="ThUniBib.ServiceDesk.enabled"/>
 
   <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.chosen.version"/>
   <xsl:param name="UBO.Frontend.bootstrap.version"/>
   <xsl:param name="UBO.Frontend.font-awesome.version"/>
 
@@ -54,26 +54,22 @@
       <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"/>
+      <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/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-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>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"/>
 

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;
 }

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";