From 36698922c39c207c9f1e081027c4c2d3e9a334ec Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 22 Apr 2021 23:22:07 +0200
Subject: language selector

---
 talermerchantdemos/httpcommon/__init__.py        |  4 ++++
 talermerchantdemos/static/demo.css               |  5 -----
 talermerchantdemos/templates/common-base.html.j2 | 10 ++++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/talermerchantdemos/httpcommon/__init__.py b/talermerchantdemos/httpcommon/__init__.py
index c315929..c11cca9 100644
--- a/talermerchantdemos/httpcommon/__init__.py
+++ b/talermerchantdemos/httpcommon/__init__.py
@@ -94,6 +94,10 @@ def get_locale():
         # Totally unexpected path format, do not localize
         return "en"
     lang = parts[1]
+    if lang == "static":
+        # Static resource, not a language indicator.
+        # Do not localize then.
+        return "en"
     return lang
 
 
diff --git a/talermerchantdemos/static/demo.css b/talermerchantdemos/static/demo.css
index f2c59f2..95cedce 100644
--- a/talermerchantdemos/static/demo.css
+++ b/talermerchantdemos/static/demo.css
@@ -55,8 +55,6 @@ body * {
     /* margin-left: 0vw; */
     padding-left: 2em;
     margin-right: 1em;
-    overflow-x: hidden;
-    overflow-y: auto;
   }
 
   .demobar {
@@ -72,14 +70,11 @@ body * {
     color: white;
     position: relative;
     padding-right: 1em;
-    overflow-x: hidden;
-    overflow-y: auto;
     text-align: center;
   }
 }
 
 .navcontainer {
-  overflow: hidden;
   background: #1e2739;
   margin-bottom: 50px;
   width: 100%;
diff --git a/talermerchantdemos/templates/common-base.html.j2 b/talermerchantdemos/templates/common-base.html.j2
index 7970f6c..69e78db 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -54,9 +54,10 @@
             >{{gettext("Tipping/Survey")}}</a>
 
     {# Language Selector #}
-    <span class="right">
-      {{ all_languages[getlang()] | default("en") }}
-      <div class="nav">
+    <div class="right">
+      <span>{{ all_languages[getlang()] | default("en") }}</span>
+      <div style="position: relative; overflow: visible;">
+      <div class="nav" style="position: absolute; background: #1e2739; max-height: 20em; overflow-y: scroll">
         <br>
         {% for lang_code, lang_display in all_languages.items() %}
           {% if lang_code != getlang() %}
@@ -65,7 +66,8 @@
           {% endif %}
         {% endfor %}   
       </div>
-    </span>
+      </div>
+    </div>
 
   </nav>
   </div>
-- 
cgit v1.2.3