ThULB · Possommi · May 24, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/common/src/main/java/de/uni_jena/thunibib/Utilities.java b/common/src/main/java/de/uni_jena/thunibib/Utilities.java
@@ -0,0 +1,13 @@
+package de.uni_jena.thunibib;
+
+import java.util.Locale;
+
+public class Utilities {
+    public static String toUpperCase(String s) {
+        return s.toUpperCase(Locale.ROOT);
+    }
+
+    public static String toLowerCase(String s) {
+        return s.toLowerCase(Locale.ROOT);
+    }
+}
diff --git a/common/src/main/resources/config/thunibib-common/messages_de.properties b/common/src/main/resources/config/thunibib-common/messages_de.properties
@@ -49,6 +49,8 @@ thunibib.editor.label.republication             = Zweitver\u00F6ffentlichung
 thunibib.editor.references.select               = Verweis ausw\u00E4hlen
 thunibib.funding.type                           = F\u00F6rderungstyp
 thunibib.servicedesk.default.summary            = Anfrage zu
+thunibib.signIn                                 = Anmelden
+thunibib.signOut                                = Abmelden
 thunibib.statistic.aut.ids.used                 = In Publikationen verwendete Autoren-Identifikatoren
 thunibib.statistic.aut.ids.used.most            = Am h\u00E4ufigsten verzeichnete Personen (nur mit Personen-ID-Zuordnung, Top 50, in Publikationen ab 2015):
 thunibib.statistic.generic.hint.text            = Bitte beachten: Die aktuelle Trefferliste beinhaltet auch nicht-statistik-relevante Publikationen. Die generierten Auswertungen sind daher m\u00F6glicherweise nicht aussagekr\u00E4ftig.

diff --git a/common/src/main/resources/config/thunibib-common/messages_en.properties b/common/src/main/resources/config/thunibib-common/messages_en.properties
@@ -52,6 +52,8 @@ thunibib.editor.label.references                = References
 thunibib.editor.label.republication             = Second publishing
 thunibib.editor.references.select               = Choose reference
 thunibib.servicedesk.default.summary            = Inquiry to
+thunibib.signIn                                 = #
+thunibib.signOut                                = Sign out
 thunibib.statistic.aut.ids.used                 = Author identifier schemes used in publications
 thunibib.statistic.aut.ids.used.most            = Most frequently listed staff (University members only that are linked to person ids, top 50, in publications from 2015)
 thunibib.statistic.generic.hint.text            = Bitte beachten: Die aktuelle Trefferliste beinhaltet auch nicht-statistik-relevante Publikationen. Die generierten Auswertungen sind daher m\u00F6glicherweise nicht aussagekr\u00E4ftig.

diff --git a/erfurt/src/main/resources/META-INF/resources/navigation.xml b/erfurt/src/main/resources/META-INF/resources/navigation.xml
@@ -76,6 +76,10 @@
       <label xml:lang="de">WebCLI</label>
       <label xml:lang="en">WebCLI</label>
     </item>
+    <item id="signout" ref="servlets/logout" display-divider="top">
+      <label xml:lang="de">Abmelden</label>
+      <label xml:lang="en">Sign out</label>
+    </item>
   </item>
 
   <item role="meta">

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
@@ -53,3 +53,28 @@ 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("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NDAiIGhlaWdodD0iNDgwIj48cGF0aCBmaWxsPSIjZmZjZTAwIiBkPSJNMCAzMjBoNjQwdjE2MC4wMDJIMHoiLz48cGF0aCBkPSJNMCAwaDY0MHYxNjBIMHoiLz48cGF0aCBmaWxsPSIjZDAwIiBkPSJNMCAxNjBoNjQwdjE2MEgweiIvPjwvc3ZnPg==");
+}
+
+i.flag-en {
+  background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NDAiIGhlaWdodD0iNDgwIj48ZGVmcz48Y2xpcFBhdGggaWQ9ImEiPjxwYXRoIGZpbGwtb3BhY2l0eT0iLjY3IiBkPSJNLTg1LjMzMyAwaDY4Mi42N3Y1MTJoLTY4Mi42N3oiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDgwKSBzY2FsZSguOTQpIj48ZyBzdHJva2Utd2lkdGg9IjFwdCI+PHBhdGggZmlsbD0iIzAwNiIgZD0iTS0yNTYgMEg3NjguMDJ2NTEyLjAxSC0yNTZ6Ii8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTS0yNTYgMHY1Ny4yNDRsOTA5LjUzNSA0NTQuNzY4SDc2OC4wMlY0NTQuNzdMLTE0MS41MTUgMEgtMjU2ek03NjguMDIgMHY1Ny4yNDNMLTE0MS41MTUgNTEyLjAxSC0yNTZ2LTU3LjI0M0w2NTMuNTM1IDBINzY4LjAyeiIvPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0xNzAuNjc1IDB2NTEyLjAxaDE3MC42N1YwaC0xNzAuNjd6TS0yNTYgMTcwLjY3djE3MC42N0g3NjguMDJWMTcwLjY3SC0yNTZ6Ii8+PHBhdGggZmlsbD0iI2MwMCIgZD0iTS0yNTYgMjA0LjgwNHYxMDIuNDAySDc2OC4wMlYyMDQuODA0SC0yNTZ6TTIwNC44MSAwdjUxMi4wMWgxMDIuNFYwaC0xMDIuNHpNLTI1NiA1MTIuMDFMODUuMzQgMzQxLjM0aDc2LjMyNGwtMzQxLjM0IDE3MC42N0gtMjU2ek0tMjU2IDBMODUuMzQgMTcwLjY3SDkuMDE2TC0yNTYgMzguMTY0VjB6bTYwNi4zNTYgMTcwLjY3TDY5MS42OTYgMGg3Ni4zMjRMNDI2LjY4IDE3MC42N2gtNzYuMzI0ek03NjguMDIgNTEyLjAxTDQyNi42OCAzNDEuMzRoNzYuMzI0TDc2OC4wMiA0NzMuODQ4djM4LjE2MnoiLz48L2c+PC9nPjwvc3ZnPg==");
+}
diff --git a/erfurt/src/main/resources/xsl/html-layout.xsl b/erfurt/src/main/resources/xsl/html-layout.xsl
@@ -7,7 +7,8 @@
                 xmlns:encoder="xalan://java.net.URLEncoder"
                 xmlns:mcrver="xalan://org.mycore.common.MCRCoreVersion"
                 xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
-                exclude-result-prefixes="xsl xalan i18n encoder mcrver mcrxml">
+                xmlns:utilities="xalan://de.uni_jena.thunibib.Utilities"
+                exclude-result-prefixes="xsl xalan encoder i18n mcrxml mcrver utilities">
 
   <xsl:output method="xml" encoding="UTF-8"/>
 
@@ -300,7 +301,7 @@
 
   <!-- current user and login formular-->
   <xsl:template name="layout.login">
-    <div class="nav-item mr-2 text-white">
+    <div class="nav-item mr-2">
       <xsl:if test="not($CurrentUser = $MCR.Users.Guestuser.UserName)">
         <xsl:variable name="userData" select="document('user:current')/user"/>
         <xsl:variable name="userId">
@@ -313,10 +314,9 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-
         <a aria-expanded="false" aria-haspopup="true" data-toggle="dropdown"
            role="button" id="mcrFunctionsDropdown" href="#"
-           class="user nav-link dropdown-toggle p-0 d-inline-block text-white ubo-curser-pointer">
+           class="nav-link dropdown-toggle p-0 ubo-hover-pointer d-inline-block text-white user">
           <xsl:choose>
             <xsl:when test="$userData/realName">
               <xsl:value-of select="$userData/realName"/>
@@ -329,54 +329,70 @@
         <div aria-labeledby="mcrFunctionsDropdown" class="dropdown-menu">
           <xsl:call-template name="layout.usernav"/>
         </div>
-
       </xsl:if>
+
       <xsl:call-template name="orcidUser"/>
     </div>
 
     <div class="nav-item mr-2">
       <xsl:choose>
         <xsl:when test="/webpage/@id='login'"/>
         <xsl:when test="$CurrentUser = $MCR.Users.Guestuser.UserName">
-          <a class="btn btn-link p-0" title="{i18n:translate('component.user2.button.login')}"
+          <a class="btn btn-link p-0 text-white" title="{i18n:translate('component.user2.button.login')}"
              href="{$WebApplicationBaseURL}{$UBO.Login.Path}?url={encoder:encode($RequestURL)}">
-            <i class="nav-login text-white fas fa-lg fa-sign-in-alt"/>
+            <xsl:value-of select="i18n:translate('thunibib.signIn')"/>
           </a>
         </xsl:when>
-        <xsl:otherwise>
-          <a class="btn btn-link p-0" title="{i18n:translate('login.logOut')}"
-             href="{$ServletsBaseURL}logout?url={encoder:encode($RequestURL)}">
-            <i class="nav-login text-white fas fa-lg fa-sign-out-alt"/>
-          </a>
-        </xsl:otherwise>
       </xsl:choose>
+      <span class="text-white ml-2 mr-1">
+        <xsl:value-of select="'|'"/>
+      </span>
     </div>
 
-    <div class="nav-item">
-      <span class="btn p-0">
-        <a>
-          <xsl:attribute name="href">
+    <div class="nav-item dropdown">
+      <xsl:variable name="href-lang-toggle">
+        <xsl:choose>
+          <xsl:when test="$CurrentLang='de'">
+            <xsl:call-template name="UrlSetParam">
+              <xsl:with-param name="url" select="$RequestURL"/>
+              <xsl:with-param name="par" select="'lang'"/>
+              <xsl:with-param name="value" select="'en'"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:when test="$CurrentLang='en'">
+            <xsl:call-template name="UrlSetParam">
+              <xsl:with-param name="url" select="$RequestURL"/>
+              <xsl:with-param name="par" select="'lang'"/>
+              <xsl:with-param name="value" select="'de'"/>
+            </xsl:call-template>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <span class="dropdown-toggle text-white" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <i class="border flag flag-{$CurrentLang}" style="vertical-align:middle"/>
+        <span class="align-middle">
+          <xsl:value-of select="utilities:toUpperCase($CurrentLang)"/>
+        </span>
+      </span>
+
+      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+        <a class="dropdown-item" href="{$href-lang-toggle}">
+          <xsl:variable name="other-lang">
             <xsl:choose>
-              <xsl:when test="$CurrentLang='de'">
-                <xsl:call-template name="UrlSetParam">
-                  <xsl:with-param name="url" select="$RequestURL"/>
-                  <xsl:with-param name="par" select="'lang'"/>
-                  <xsl:with-param name="value" select="'en'"/>
-                </xsl:call-template>
+              <xsl:when test="$CurrentLang = 'de'">
+                <xsl:value-of select="'en'"/>
               </xsl:when>
-              <xsl:when test="$CurrentLang='en'">
-                <xsl:call-template name="UrlSetParam">
-                  <xsl:with-param name="url" select="$RequestURL"/>
-                  <xsl:with-param name="par" select="'lang'"/>
-                  <xsl:with-param name="value" select="'de'"/>
-                </xsl:call-template>
+              <xsl:when test="$CurrentLang = 'en'">
+                <xsl:value-of select="'de'"/>
               </xsl:when>
             </xsl:choose>
-          </xsl:attribute>
-
-          <xsl:value-of select="i18n:translate('navigation.ende')"/>
+          </xsl:variable>
+          <i class="border flag flag-{$other-lang}"/>
+          <span class="align-middle">
+            <xsl:value-of select="i18n:translate('navigation.ende')"/>
+          </span>
         </a>
-      </span>
+      </div>
     </div>
   </xsl:template>
 

diff --git a/ilmenau/src/main/resources/META-INF/resources/navigation.xml b/ilmenau/src/main/resources/META-INF/resources/navigation.xml
@@ -76,6 +76,10 @@
       <label xml:lang="de">WebCLI</label>
       <label xml:lang="en">WebCLI</label>
     </item>
+    <item id="signout" ref="servlets/logout" display-divider="top">
+      <label xml:lang="de">Abmelden</label>
+      <label xml:lang="en">Sign out</label>
+    </item>
   </item>
 
   <item role="meta">

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
@@ -32,3 +32,24 @@ i.ubo-picker-service-LDAPWithLocalService::before {
   color: $primary;
   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("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NDAiIGhlaWdodD0iNDgwIj48cGF0aCBmaWxsPSIjZmZjZTAwIiBkPSJNMCAzMjBoNjQwdjE2MC4wMDJIMHoiLz48cGF0aCBkPSJNMCAwaDY0MHYxNjBIMHoiLz48cGF0aCBmaWxsPSIjZDAwIiBkPSJNMCAxNjBoNjQwdjE2MEgweiIvPjwvc3ZnPg==");
+}
+
+i.flag-en {
+  background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NDAiIGhlaWdodD0iNDgwIj48ZGVmcz48Y2xpcFBhdGggaWQ9ImEiPjxwYXRoIGZpbGwtb3BhY2l0eT0iLjY3IiBkPSJNLTg1LjMzMyAwaDY4Mi42N3Y1MTJoLTY4Mi42N3oiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDgwKSBzY2FsZSguOTQpIj48ZyBzdHJva2Utd2lkdGg9IjFwdCI+PHBhdGggZmlsbD0iIzAwNiIgZD0iTS0yNTYgMEg3NjguMDJ2NTEyLjAxSC0yNTZ6Ii8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTS0yNTYgMHY1Ny4yNDRsOTA5LjUzNSA0NTQuNzY4SDc2OC4wMlY0NTQuNzdMLTE0MS41MTUgMEgtMjU2ek03NjguMDIgMHY1Ny4yNDNMLTE0MS41MTUgNTEyLjAxSC0yNTZ2LTU3LjI0M0w2NTMuNTM1IDBINzY4LjAyeiIvPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0xNzAuNjc1IDB2NTEyLjAxaDE3MC42N1YwaC0xNzAuNjd6TS0yNTYgMTcwLjY3djE3MC42N0g3NjguMDJWMTcwLjY3SC0yNTZ6Ii8+PHBhdGggZmlsbD0iI2MwMCIgZD0iTS0yNTYgMjA0LjgwNHYxMDIuNDAySDc2OC4wMlYyMDQuODA0SC0yNTZ6TTIwNC44MSAwdjUxMi4wMWgxMDIuNFYwaC0xMDIuNHpNLTI1NiA1MTIuMDFMODUuMzQgMzQxLjM0aDc2LjMyNGwtMzQxLjM0IDE3MC42N0gtMjU2ek0tMjU2IDBMODUuMzQgMTcwLjY3SDkuMDE2TC0yNTYgMzguMTY0VjB6bTYwNi4zNTYgMTcwLjY3TDY5MS42OTYgMGg3Ni4zMjRMNDI2LjY4IDE3MC42N2gtNzYuMzI0ek03NjguMDIgNTEyLjAxTDQyNi42OCAzNDEuMzRoNzYuMzI0TDc2OC4wMiA0NzMuODQ4djM4LjE2MnoiLz48L2c+PC9nPjwvc3ZnPg==");
+}
diff --git a/ilmenau/src/main/resources/xsl/html-layout.xsl b/ilmenau/src/main/resources/xsl/html-layout.xsl
@@ -6,7 +6,8 @@
                 xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
                 xmlns:encoder="xalan://java.net.URLEncoder"
                 xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
-                exclude-result-prefixes="xsl xalan i18n encoder mcrxml">
+                xmlns:utilities="xalan://de.uni_jena.thunibib.Utilities"
+                exclude-result-prefixes="encoder i18n mcrxml utilities xalan xsl">
 
   <xsl:output method="xml" encoding="UTF-8"/>
 
@@ -308,7 +309,7 @@
 
   <!-- current user and login formular-->
   <xsl:template name="layout.login">
-    <div class="nav-item mr-2 text-white">
+    <div class="nav-item mr-2">
       <xsl:if test="not($CurrentUser = $MCR.Users.Guestuser.UserName)">
         <xsl:variable name="userData" select="document('user:current')/user"/>
         <xsl:variable name="userId">
@@ -321,10 +322,9 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-
         <a aria-expanded="false" aria-haspopup="true" data-toggle="dropdown"
            role="button" id="mcrFunctionsDropdown" href="#"
-           class="user nav-link dropdown-toggle p-0 d-inline-block ubo-curser-pointer">
+           class="user nav-link dropdown-toggle p-0 ubo-hover-pointer d-inline-block">
           <xsl:choose>
             <xsl:when test="$userData/realName">
               <xsl:value-of select="$userData/realName"/>
@@ -337,8 +337,8 @@
         <div aria-labeledby="mcrFunctionsDropdown" class="dropdown-menu">
           <xsl:call-template name="layout.usernav"/>
         </div>
-
       </xsl:if>
+
       <xsl:call-template name="orcidUser"/>
     </div>
 
@@ -348,45 +348,60 @@
         <xsl:when test="$CurrentUser = $MCR.Users.Guestuser.UserName">
           <a class="btn btn-link p-0" title="{i18n:translate('component.user2.button.login')}"
              href="{$WebApplicationBaseURL}{$UBO.Login.Path}?url={encoder:encode($RequestURL)}">
-            <i class="nav-login fas fa-lg fa-sign-in-alt"/>
+            <xsl:value-of select="i18n:translate('thunibib.signIn')"/>
           </a>
         </xsl:when>
-        <xsl:otherwise>
-          <a class="btn btn-link p-0" title="{i18n:translate('login.logOut')}"
-             href="{$ServletsBaseURL}logout?url={encoder:encode($RequestURL)}">
-            <i class="nav-login fas fa-lg fa-sign-out-alt"/>
-          </a>
-        </xsl:otherwise>
       </xsl:choose>
+      <span class="ml-2 mr-1">
+        <xsl:value-of select="'|'"/>
+      </span>
     </div>
 
-    <div class="nav-item">
-      <span class="btn p-0">
-        <a>
-          <xsl:attribute name="href">
+    <div class="nav-item dropdown">
+      <xsl:variable name="href-lang-toggle">
+        <xsl:choose>
+          <xsl:when test="$CurrentLang='de'">
+            <xsl:call-template name="UrlSetParam">
+              <xsl:with-param name="url" select="$RequestURL"/>
+              <xsl:with-param name="par" select="'lang'"/>
+              <xsl:with-param name="value" select="'en'"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:when test="$CurrentLang='en'">
+            <xsl:call-template name="UrlSetParam">
+              <xsl:with-param name="url" select="$RequestURL"/>
+              <xsl:with-param name="par" select="'lang'"/>
+              <xsl:with-param name="value" select="'de'"/>
+            </xsl:call-template>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <span class="dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <i class="border flag flag-{$CurrentLang}" style="vertical-align:middle"/>
+        <span class="align-middle">
+          <xsl:value-of select="utilities:toUpperCase($CurrentLang)"/>
+        </span>
+      </span>
+
+      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+        <a class="dropdown-item" href="{$href-lang-toggle}">
+          <xsl:variable name="other-lang">
             <xsl:choose>
-              <xsl:when test="$CurrentLang='de'">
-                <xsl:call-template name="UrlSetParam">
-                  <xsl:with-param name="url" select="$RequestURL"/>
-                  <xsl:with-param name="par" select="'lang'"/>
-                  <xsl:with-param name="value" select="'en'"/>
-                </xsl:call-template>
+              <xsl:when test="$CurrentLang = 'de'">
+                <xsl:value-of select="'en'"/>
               </xsl:when>
-              <xsl:when test="$CurrentLang='en'">
-                <xsl:call-template name="UrlSetParam">
-                  <xsl:with-param name="url" select="$RequestURL"/>
-                  <xsl:with-param name="par" select="'lang'"/>
-                  <xsl:with-param name="value" select="'de'"/>
-                </xsl:call-template>
+              <xsl:when test="$CurrentLang = 'en'">
+                <xsl:value-of select="'de'"/>
               </xsl:when>
             </xsl:choose>
-          </xsl:attribute>
-          <!-- <img src="{$WebApplicationBaseURL}images/lang_{$CurrentLang}.gif" alt="{i18n:translate('navigation.Language')}" /> -->
-          <xsl:value-of select="i18n:translate('navigation.ende')"/>
+          </xsl:variable>
+          <i class="border flag flag-{$other-lang}"/>
+          <span class="align-middle">
+            <xsl:value-of select="i18n:translate('navigation.ende')"/>
+          </span>
         </a>
-      </span>
+      </div>
     </div>
-
   </xsl:template>
 
   <xsl:template name="layout.pageTitle">

diff --git a/jena/src/main/resources/META-INF/resources/navigation.xml b/jena/src/main/resources/META-INF/resources/navigation.xml
@@ -80,6 +80,10 @@
       <label xml:lang="de">WebCLI</label>
       <label xml:lang="en">WebCLI</label>
     </item>
+    <item id="signout" ref="servlets/logout" display-divider="top">
+      <label xml:lang="de">Abmelden</label>
+      <label xml:lang="en">Sign out</label>
+    </item>
   </item>
 
   <item role="meta">