From 5f99f12bd9cc76075ed466dddfb4b2edb0e29920 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Mon, 1 Aug 2022 10:19:56 +0200
Subject: [PATCH] Fix style of selected language in dropdown (#2076)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix style of selected language in dropdown

* Changelog

* Update CHANGES.rst

Co-authored-by: Jordi Puiggené <jp@naralabs.com>
---
 CHANGES.rst                                   |  1 +
 .../viewlets/templates/languageselector.pt    | 33 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index af95b9b4fc..cc15dc33b5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,7 @@ Changelog
 2.3.0 (unreleased)
 ------------------
 
+- #2076 Fix style of selected language in dropdown
 - #2074 Allow to disable global Auditlogging
 - #2072 Refactor report filename generation to own method
 - #2071 Move sample reports to report catalog, add batch ID and email sent flag to listing
diff --git a/src/senaite/core/browser/viewlets/templates/languageselector.pt b/src/senaite/core/browser/viewlets/templates/languageselector.pt
index 80c1789eac..884f859ec2 100644
--- a/src/senaite/core/browser/viewlets/templates/languageselector.pt
+++ b/src/senaite/core/browser/viewlets/templates/languageselector.pt
@@ -12,7 +12,7 @@
     </a>
 
     <!-- Available Languages -->
-    <ul class="dropdown-menu dropdown-menu-right"
+    <div class="dropdown-menu dropdown-menu-right"
         role="menu"
         aria-labelledby="portal-languageselector"
         tal:define="languages view/languages;
@@ -20,24 +20,25 @@
 
       <tal:language repeat="lang languages">
 
-        <li tal:define="code lang/code;
-                        qs request/QUERY_STRING;
-                        params python:filter(lambda x: x and not x.startswith('set_language'), qs.split('&'));
-                        lang_param string:set_language=${code};
-                        new_params python:'&'.join(params + [lang_param]);
-                        selected lang/selected;
-                        codeclass string:language-${code};
-                        current python: selected and 'currentLanguage active ' or '';"
-            tal:attributes="class string:${codeclass} nav-item">
+        <div tal:define="code lang/code;
+                         qs request/QUERY_STRING;
+                         params python:filter(lambda x: x and not x.startswith('set_language'), qs.split('&'));
+                         lang_param string:set_language=${code};
+                         new_params python:'&'.join(params + [lang_param]);
+                         selected lang/selected;
+                         codeclass string:language-${code};
+                         current python: selected and 'currentLanguage active dropdown-item' or 'dropdown-item';
+                         current_item python: selected and 'text-light' or '';"
+             tal:attributes="class string:${codeclass} ${current}">
           <a href="#"
-            tal:define="name lang/native|lang/name;"
-            tal:attributes="href string:${base_url}?${new_params};
-                            class string:${current} nav-link;
-                            title name">
+             tal:define="name lang/native|lang/name;"
+             tal:attributes="href string:${base_url}?${new_params};
+                             class string:${current_item} text-decoration-none;
+                             title name">
             <span tal:content="name"/>
           </a>
-        </li>
+        </div>
       </tal:language>
-    </ul>
+    </div>
   </nav>
 </tal:language>