# HG changeset patch # User Goffi # Date 1554923158 -7200 # Node ID 240bbac435f451c1d7ea546561b4ce5068d60aef # Parent 29214fa3a53b8dfb25be37cf2f7e9fe37fc8ab4b base: implemented language button: - `component.menu` can now be used with a `{% call %}`, allowing extra HTML to be added after in the

element - a language dropdown is shown if more than one translation is available, allowing to change page locale - if javascript is available, only the dropdown is visible, and changing it reload the page with new locale - if javascript is not available, a submit button is display to change the locale diff -r 29214fa3a53b -r 240bbac435f4 sat_templates/templates/default/base/base.html --- a/sat_templates/templates/default/base/base.html Wed Apr 10 21:05:56 2019 +0200 +++ b/sat_templates/templates/default/base/base.html Wed Apr 10 21:05:58 2019 +0200 @@ -67,7 +67,22 @@ {% if main_menu %} {% block main_menu %} - {{ component.menu(main_menu, class="main_menu") }} + {% call component.menu(main_menu, class="main_menu") %} + + {% endcall %} {% endblock main_menu %} {% endif %} diff -r 29214fa3a53b -r 240bbac435f4 sat_templates/templates/default/components/common.html --- a/sat_templates/templates/default/components/common.html Wed Apr 10 21:05:56 2019 +0200 +++ b/sat_templates/templates/default/components/common.html Wed Apr 10 21:05:58 2019 +0200 @@ -7,5 +7,8 @@

{% endfor %} + {% if caller is defined %} + {{ caller()}} + {% endif %}

{% endmacro %} diff -r 29214fa3a53b -r 240bbac435f4 sat_templates/templates/default/static/styles.css --- a/sat_templates/templates/default/static/styles.css Wed Apr 10 21:05:56 2019 +0200 +++ b/sat_templates/templates/default/static/styles.css Wed Apr 10 21:05:58 2019 +0200 @@ -791,15 +791,20 @@ .main_menu { min-width: 200px; - /* background-color: #eaeaea; */ background-color: #333; color: white; overflow: auto; + display: flex; + flex-direction: column; + flex-shrink: 0; + justify-content: space-between; + padding-bottom: 0.5em; } .main_menu ul { flex-direction: row; flex-wrap: wrap; + margin-bottom: 0.2em; } .main_menu li { @@ -819,6 +824,31 @@ font-weight: bold; } +.menu__language { + display: flex; + flex-direction: row; + justify-content: center; + padding: 0 0.3em; +} + +.menu__language select { + border: none; + font-size: 0.8em; +} + +.menu__language button { + display: none; + border: none; + background-color: var(--color-prim--light); + margin-left: 1em; + font-size: 0.8em; +} + +.menu__language button:hover { + background-color: var(--color-prim--dark); + cursor: pointer; +} + .category_menu ul { justify-content: center; } @@ -1310,4 +1340,5 @@ flex-direction: column; padding-left: 2em; } + } diff -r 29214fa3a53b -r 240bbac435f4 sat_templates/templates/default/static/styles_noscript.css --- a/sat_templates/templates/default/static/styles_noscript.css Wed Apr 10 21:05:56 2019 +0200 +++ b/sat_templates/templates/default/static/styles_noscript.css Wed Apr 10 21:05:58 2019 +0200 @@ -27,3 +27,11 @@ max-height: none; opacity: 1; } + +/********* + * Menus * + *********/ + +.menu__language button { + display: initial; +}