Move lang selector in page title

galette · Nov 7, 2019 · ad377ce · ad377ce
1 parent 58f9689
commit ad377ce
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/galette/templates/default/page.tpl b/galette/templates/default/page.tpl
@@ -196,16 +196,6 @@ We have to use a template file, so Smarty will do its work (like replacing varia
 {* Include plugins menu entries *}
 {$plugins->getMenus($tpl)}
 
-        <form action="">
-            <select id="lang_selector" name="ui_pref_lang">
-{foreach item=langue from=$languages}
-                <option value="{$langue->getID()}" lang="{$langue->getAbbrev()}"{if $galette_lang eq $langue->getAbbrev()} selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
-{/foreach}
-            </select>
-            <noscript>
-                <input type="submit" name="{_T string="Change language"}" />
-            </noscript>
-        </form>
 {if $login->isLogged()}
         <div>{$login->loggedInAs()}</div>
         <a id="logout_10" class="button" href="{if $login->isImpersonated()}{path_for name="unimpersonate"}{else}{path_for name="logout"}{/if}"><i class="fas fa-{if $login->isImpersonated()}user-secret{else}sign-out-alt{/if}"></i>{_T string="Log off"}</a>
@@ -227,6 +217,18 @@ We have to use a template file, so Smarty will do its work (like replacing varia
                     <span class="sr-only">{_T string="Existing mailing"}</span>
                 </a>
             {/if}
+        <form action="" id="plang_selector">
+            <select id="lang_selector" name="ui_pref_lang">
+{foreach item=langue from=$languages}
+                <option value="{$langue->getID()}" lang="{$langue->getAbbrev()}"{if $galette_lang eq $langue->getAbbrev()} selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
+{/foreach}
+            </select>
+            <noscript>
+                <input type="submit" name="{_T string="Change language"}" />
+            </noscript>
+        </form>
+
+
         </h1>
         <p id="asso_name">{$preferences->pref_nom}{if $preferences->pref_slogan}&nbsp;: {$preferences->pref_slogan}{/if}</p>
 

diff --git a/galette/webroot/themes/default/galette.css b/galette/webroot/themes/default/galette.css
@@ -693,16 +693,9 @@ a:hover i {
     background-repeat: repeat!important;
 }
 
-/*#sendmail{
-    background-image:url(images/icon-mail.png), url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png");
-}
-#sendmail.ui-state-hover {
-    background-image:url(images/icon-mail.png), url("jquery-ui/images/ui-bg_glass_75_ffb619_1x400.png");
-}*/
-
 #recup_mailing {
-    position: absolute;
-    right: .5em;
+    float: right;
+    margin-right: .5em;
 }
 
 h1 #sendmail {
@@ -1112,6 +1105,12 @@ legend .tab-button {
     margin: 0 .5em .2em;
 }
 
+#plang_selector {
+    float: right;
+    margin-right: .5em;
+    font-weight: normal;
+}
+
 .public_page #plang_selector {
     position: absolute;
     right: .5em;
@@ -1483,7 +1482,7 @@ a.listing:hover {
 #content {
     margin-left:17em;
     margin-top: 10px;
-    padding: 0.5em;
+    padding: 0 .5em .5em;
     position: relative;
     min-height: 100vh;
 }
@@ -2367,6 +2366,7 @@ label:hover > i, span.bline:hover > i {
     #content {
         padding-top: 0;
         margin: 0;
+        margin-top: 10px;
         background-color: white;
         transform: translateX(0) translateZ(0);
         transition: transform .2s;