UBO-481 Bootstrap: replaced mr-/ml- with me- and ms-

Author: Possommi

ubo-common/pom.xml

@@ -346,10 +346,6 @@
       <groupId>org.mycore</groupId>
       <artifactId>mycore-orcid2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mycore</groupId>
-      <artifactId>mycore-sass</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-solr</artifactId>

ubo-common/src/main/resources/META-INF/resources/accessibility.xml

@@ -68,7 +68,7 @@
           Unsere Postanschrift lautet:
         </p>
 
-        <p class="border-left pl-5">
+        <p class="border-left ps-5">
           Universitätsbibliothek Duisburg-Essen<br />
           Universitätsstr. 9 - 11<br />
           D-45141 Essen
@@ -98,7 +98,7 @@
           aus und senden ihn per
           <a href="mailto:ombudsstelle-barrierefreie-it@mags.nrw.de" title="E-Mail Ombudsstelle">E-Mail</a> an die Ombudsstelle.
         </p>
-        <p class="border-left pl-5">
+        <p class="border-left ps-5">
           Ombudsstelle für barrierefreie In­for­ma­ti­ons­tech­nik<br/>
           des Landes Nordrhein-Westfalen bei der<br/>
           Landesbeauftragten für Men­schen mit Be­hin­de­run­gen<br/>

ubo-common/src/main/resources/xsl/html-layout.xsl

@@ -151,12 +151,12 @@
     <div id="basket-info" class="card my-3 w-100">
       <div class="card-body">
 	<a href="{$ServletsBaseURL}MCRBasketServlet?action=show&amp;type=objects">
-          <span class="fas fa-bookmark mr-1" aria-hidden="true" />
-          <span class="mr-1"><xsl:value-of select="i18n:translate('basket')" />:</span>
-          <span class="mr-1" id="basket-info-num">
+          <span class="fas fa-bookmark me-1" aria-hidden="true" />
+          <span class="me-1"><xsl:value-of select="i18n:translate('basket')" />:</span>
+          <span class="me-1" id="basket-info-num">
             <xsl:value-of xmlns:basket="xalan://org.mycore.ubo.basket.BasketUtils" select="basket:size()" />
           </span>
-          <span class="mr-1"><xsl:value-of select="i18n:translate('ubo.publications')" /></span>
+          <span class="me-1"><xsl:value-of select="i18n:translate('ubo.publications')" /></span>
 	</a>
       </div>
     </div>
@@ -223,7 +223,7 @@
   <!-- current user and login formular-->
   <xsl:template name="layout.login">
 
-    <div class="nav-item mr-2">
+    <div class="nav-item me-2">
       <xsl:choose>
         <xsl:when test="$CurrentUser = $MCR.Users.Guestuser.UserName">
           <span class="user btn p-0" style="cursor: default;">
@@ -251,7 +251,7 @@
       <xsl:call-template name="orcidUser"/>
 
     </div>
-    <div class="nav-item mr-2">
+    <div class="nav-item me-2">
       <xsl:choose>
         <xsl:when test="/html/@id='login'" />
         <xsl:when test="$CurrentUser = $MCR.Users.Guestuser.UserName">

ubo-common/src/main/resources/xsl/ldappidsearch.xsl

@@ -121,7 +121,7 @@
                     <div class="cancel-submit form-group form-inline">
                         <label class="mycore-form-label">
                         </label>
-                        <input type="submit" class="btn btn-primary mr-2" name="search" value="{i18n:translate('button.search')}" />
+                        <input type="submit" class="btn btn-primary me-2" name="search" value="{i18n:translate('button.search')}" />
                         <input type="submit" class="btn btn-primary" name="cancel" value="{i18n:translate('button.cancel')}" />
                     </div>
                     <xsl:if test="results and not(contains(@referrer,'list-wizard'))">

ubo-common/src/main/resources/xsl/localpidsearch.xsl

@@ -105,7 +105,7 @@
                     <div class="cancel-submit form-group form-inline">
                         <label class="mycore-form-label">
                         </label>
-                        <input type="submit" class="btn btn-primary mr-2" name="search" value="{i18n:translate('button.search')}" />
+                        <input type="submit" class="btn btn-primary me-2" name="search" value="{i18n:translate('button.search')}" />
                         <input type="submit" class="btn btn-primary" name="cancel" value="{i18n:translate('button.cancel')}" />
                     </div>
                     <xsl:if test="results and not(contains(@referrer,'list-wizard'))">

ubo-common/src/main/resources/xsl/lsfpidsearch.xsl

@@ -110,7 +110,7 @@
     <div class="cancel-submit form-group form-inline">
       <label class="mycore-form-label">
       </label>
-      <input type="submit" class="btn btn-primary mr-2" name="search" value="{i18n:translate('button.search')}" />
+      <input type="submit" class="btn btn-primary me-2" name="search" value="{i18n:translate('button.search')}" />
       <input type="submit" class="btn btn-primary" name="cancel" value="{i18n:translate('button.cancel')}" />
     </div>
     <xsl:if test="results and not(contains(@referrer,'list-wizard'))">

ubo-common/src/main/resources/xsl/mods-display.xsl

@@ -62,7 +62,7 @@
   <xsl:template name="pubtype">
     <xsl:variable name="genre" select="substring-after(mods:genre[@type='intern']/@valueURI, '#')"/>
 
-    <span class="label-info badge bg-secondary mr-1 ubo-hover-pointer" title="{i18n:translate('ubo.genre')}"
+    <span class="label-info badge bg-secondary me-1 ubo-hover-pointer" title="{i18n:translate('ubo.genre')}"
           onclick="location.assign('{$WebApplicationBaseURL}servlets/solr/select?sort=modified+desc&amp;q={encoder:encode(concat($fq, '+genre:&quot;', $genre, '&quot;'))}')">
       <xsl:apply-templates select="mods:genre[@type='intern']"/>
       <xsl:for-each select="mods:relatedItem[@type='host']/mods:genre[@type='intern']">
@@ -76,15 +76,15 @@
     <xsl:if test="check:currentUserIsAdmin()">
       <xsl:variable name="kdsf-pubtype" select="mods:classification[@generator='xpathmapping2kdsfPublicationType-mycore']"/>
       <xsl:for-each select="$kdsf-pubtype">
-        <span class="label-info badge bg-warning text-white mr-1" title="{i18n:translate('ubo.publication.type.kdsf')}">
+        <span class="label-info badge bg-warning text-white me-1" title="{i18n:translate('ubo.publication.type.kdsf')}">
           <xsl:variable name="categid" select="substring-after(@valueURI, '#')"/>
           <xsl:value-of select="mcrxsl:getDisplayName('kdsfPublicationType', $categid)"/>
         </span>
       </xsl:for-each>
 
       <xsl:variable name="kdsf-doctype" select="mods:classification[@generator='xpathmapping2kdsfDocumentType-mycore']"/>
       <xsl:for-each select="$kdsf-doctype">
-        <span class="label-info badge bg-info text-white mr-1" title="{i18n:translate('ubo.document.type.kdsf')}">
+        <span class="label-info badge bg-info text-white me-1" title="{i18n:translate('ubo.document.type.kdsf')}">
           <xsl:variable name="categid" select="substring-after(@valueURI, '#')"/>
           <xsl:value-of select="mcrxsl:getDisplayName('kdsfDocumentType', $categid)"/>
         </span>
@@ -95,7 +95,7 @@
   <!-- ============ Ausgabe Fach ============ -->
 
   <xsl:template match="mods:mods/mods:classification[contains(@authorityURI,'fachreferate')]" mode="label-info">
-    <span class="label-info badge bg-secondary mr-1 ubo-hover-pointer" title="{i18n:translate('facets.facet.subject')}"
+    <span class="label-info badge bg-secondary me-1 ubo-hover-pointer" title="{i18n:translate('facets.facet.subject')}"
           onclick="location.assign('{$WebApplicationBaseURL}servlets/solr/select?sort=modified+desc&amp;q={encoder:encode(concat($fq, '+subject:&quot;', substring-after(@valueURI,'#'),'&quot;'))}')">
       <xsl:call-template name="output.category">
         <xsl:with-param name="classID" select="'fachreferate'" />
@@ -107,7 +107,7 @@
   <!-- ========== Ausgabe Fakultät ========== -->
 
   <xsl:template match="mods:classification[contains(@authorityURI,'ORIGIN')]" mode="label-info">
-    <span class="label-info badge bg-secondary mr-1 ubo-hover-pointer" title="{i18n:translate('ubo.department')}"
+    <span class="label-info badge bg-secondary me-1 ubo-hover-pointer" title="{i18n:translate('ubo.department')}"
           onclick="location.assign('{$WebApplicationBaseURL}servlets/solr/select?sort=modified+desc&amp;q={encoder:encode(concat($fq, '+origin:&quot;', substring-after(@valueURI,'#'), '&quot;'))}')">
       <xsl:call-template name="output.category">
         <xsl:with-param name="classID" select="'ORIGIN'" />
@@ -161,7 +161,7 @@
 
   <xsl:template match="mods:classification[contains(@authorityURI,'oa')]" mode="label-info">
     <xsl:variable name="category" select="$oa//category[@ID=substring-after(current()/@valueURI,'#')]" />
-    <span class="badge oa-badge oa-badge-{$category/@ID} ubo-hover-pointer mr-1"
+    <span class="badge oa-badge oa-badge-{$category/@ID} ubo-hover-pointer me-1"
           onclick="location.assign('{$WebApplicationBaseURL}servlets/solr/select?sort=modified+desc&amp;q={encoder:encode(concat($fq, '+oa_exact:', $category/@ID))}')">
       <xsl:value-of select="$category/label[lang($CurrentLang)]/@text"/>
     </span>
@@ -334,7 +334,7 @@
   </xsl:template>
 
   <xsl:template match="mods:dateIssued" mode="label-year-badge">
-    <span class="label-info badge bg-secondary mr-1 ubo-hover-pointer" title="{i18n:translate('ubo.search.year')}"
+    <span class="label-info badge bg-secondary me-1 ubo-hover-pointer" title="{i18n:translate('ubo.search.year')}"
           onclick="location.assign('{$WebApplicationBaseURL}servlets/solr/select?sort=modified+desc&amp;q={encoder:encode(concat($fq, '+year:', text()))}')">
       <xsl:value-of select="text()" />
     </span>

ubo-common/src/main/resources/xsl/mycoreobject-structure.xsl

@@ -513,17 +513,17 @@
 
               <div class="modal-footer">
                 <button type="button" class="ubo-btn-cancel btn btn-secondary" data-dismiss="modal">
-                  <i class="fa fa-times mr-1" aria-hidden="true" />
+                  <i class="fa fa-times me-1" aria-hidden="true" />
                   <xsl:value-of select="i18n:translate('button.cancel')"/>
                 </button>
                 <xsl:if test="$preview">
                   <button type="submit" name="preview" value="true" class="ubo-btn-preview btn btn-secondary">
-                    <i class="fa fa-{$icon} mr-1" aria-hidden="true" />
+                    <i class="fa fa-{$icon} me-1" aria-hidden="true" />
                     <xsl:value-of select="i18n:translate('button.preview')"/>
                   </button>
                 </xsl:if>
                 <button type="submit" class="ubo-btn-submit btn btn-primary structure-action">
-                  <i class="fa fa-{$icon} mr-1" aria-hidden="true" />
+                  <i class="fa fa-{$icon} me-1" aria-hidden="true" />
                   <xsl:value-of select="$button" />
                 </button>
               </div>

ubo-common/src/main/resources/xsl/mycoreobject.xsl

@@ -252,7 +252,7 @@
   <xsl:variable name="numlinks" select="count(document($linkURI)/response/result[@name='response']/doc)" />
 
   <xsl:if test="$numlinks &gt; 0">
-  <span class="badge bg-alternative mr-1">
+  <span class="badge bg-alternative me-1">
     <a href="solr/select?q=link:{/mycoreobject/@ID}&amp;sort=year+desc">
       <xsl:value-of select="concat(i18n:translate('ubo.relatedItem.link'),': ', $numlinks, ' ', i18n:translate('ubo.relatedItem.host.contains.publications'))"/>
     </a>
@@ -279,7 +279,7 @@
   <xsl:variable name="numDuplicates" select="count(document($duplicates)/result/duplicate)" />
 
   <xsl:if test="$numDuplicates &gt; 0">
-    <span class="badge bg-alternative ml-1 mr-1">
+    <span class="badge bg-alternative ml-1 me-1">
       <a href="{$ServletsBaseURL}DozBibEntryServlet?id={/mycoreobject/@ID}&amp;XSL.Style=structure">
         <xsl:variable name="extro">
           <xsl:choose>

ubo-common/src/main/resources/xsl/user.xsl

@@ -301,7 +301,7 @@
   <script src="{$WebApplicationBaseURL}modules/orcid2/js/orcid-auth.js"/>
 
   <h3>
-    <span class="far fa-hand-point-right mr-1" aria-hidden="true" />
+    <span class="far fa-hand-point-right me-1" aria-hidden="true" />
     <xsl:text> </xsl:text>
     <xsl:value-of select="i18n:translate('orcid.integration.pending.headline')" />
   </h3>