Move language selector and existing mailing item

On small screens, for better UX consistancy, moved from the page header
to the sidebar menu and top navbar respectively.

diff --git a/galette/templates/default/elements/navigation/navigation_sidebar.html.twig b/galette/templates/default/elements/navigation/navigation_sidebar.html.twig
index 2dd30b23e41c16408268eca445cabe5ae0600c5e..e4e4a8ad914d91bfe6f075a16119c63c9f60e3bb 100644 (file)
--- a/galette/templates/default/elements/navigation/navigation_sidebar.html.twig
+++ b/galette/templates/default/elements/navigation/navigation_sidebar.html.twig
@@ -15,13 +15,13 @@
             tips_position: "right center",
             sign_in: true
     } %}
-
+{% else %}
+    {% include "elements/navigation/navigation_items.html.twig" %}
+{% endif %}
     {% include "elements/language.html.twig" with {
             ui: "item"
     } %}
-{% else %}
-        {% include "elements/navigation/navigation_items.html.twig" %}
-
+{% if login.isLogged() %}
         {% include "elements/logout.html.twig" with {
                 ui: "item"
         } %}

diff --git a/galette/templates/default/elements/navigation/navigation_topbar.html.twig b/galette/templates/default/elements/navigation/navigation_topbar.html.twig
index ab76de9aa8697d21f7c12e622c56a27e7c6ea037..4bf5308781cd0ffac4446b0ed9deab70483c7007 100644 (file)
--- a/galette/templates/default/elements/navigation/navigation_topbar.html.twig
+++ b/galette/templates/default/elements/navigation/navigation_topbar.html.twig
@@ -3,6 +3,18 @@
         <a class="toc item">
             <i class="sidebar icon"></i>
         </a>
+        {% if login.isLogged() and (cur_route != 'mailing' and existing_mailing == true) %}
+            <a
+                id="recup_mailing"
+                href="{{ url_for("mailing") }}"
+                class="ui blue tooltip item"
+                title="{{ _T("A mailing exists in the current session. Click here if you want to resume or cancel it.") }}"
+                data-position="bottom right"
+            >
+                <i class="paper plane outline blue icon"></i>
+                <span class="displaynone">{{ _T("Existing mailing") }}</span>
+            </a>
+        {% endif %}
         <div class="header item">
             <img src="{{ url_for("logo") }}" width="{{ logo.getOptimalWidth() }}" height="{{ logo.getOptimalHeight() }}" alt="[ Galette ]" class="logo" />
             <span>{{ preferences.pref_nom }}</span>

diff --git a/ui/semantic/galette/globals/site.overrides b/ui/semantic/galette/globals/site.overrides
index ffb503586fe4c497f1e7cf86de258eaf8896e327..300168507b89e94f72906de14fac14740bfe37cd 100644 (file)
--- a/ui/semantic/galette/globals/site.overrides
+++ b/ui/semantic/galette/globals/site.overrides
@@ -88,10 +88,11 @@ body.pushable:not(.loggedin) > .pusher {
 }
 
 .ui.fixed.menu + .pusher {
-  padding-top: 4rem;
+  padding-top: 3.8rem;
 }
 
-aside.toc {
+aside.toc,
+.ui.segments.header .compact.segment.right {
   display: none;
 }
 
@@ -107,7 +108,7 @@ footer .ui.horizontal.list > .item{
 }
 
 @media only screen and (max-width: 991px) {
-  #top-navbar .item:not(.header):not(.toc) {
+  #top-navbar .item:not(.header):not(.toc):not(#recup_mailing) {
     display: none;
   }
   .sidebar.uncover + .fixed.menu .toc i::before {
@@ -185,6 +186,10 @@ footer .ui.horizontal.list > .item{
     }
   }
 
+  .ui.segments.header .compact.segment.right {
+    display: block;
+  }
+
   body:not(.front-page) section.content {
     margin-left: 260px;
     flex: 1 1 auto;