From 5afbddee9088d950dfdcabc78eed7b14f64cb92e Mon Sep 17 00:00:00 2001 From: Karl Hasselbring <karl@suma-ev.de> Date: Fri, 13 Jul 2018 13:10:18 +0200 Subject: [PATCH] =?UTF-8?q?Sprachlabel=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/scriptStartPage.js | 4 ++-- resources/assets/js/searchbar.js | 19 ++++++++++++++----- resources/assets/less/metager/searchbar.less | 18 ++++++++++++++++++ resources/views/parts/searchbar.blade.php | 1 + 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/scriptStartPage.js b/resources/assets/js/scriptStartPage.js index 5cd58ba70..61ca05078 100644 --- a/resources/assets/js/scriptStartPage.js +++ b/resources/assets/js/scriptStartPage.js @@ -62,7 +62,7 @@ function setActionListeners() { /** * Loads stored settings from local storage */ -function setSettings () { +function setSettings() { if ($('fieldset#foki.mobile').length) { $('fieldset.mobile input#bilder').val('angepasst'); $('fieldset.mobile input#bilder').prop('checked', true); @@ -156,7 +156,7 @@ var isChrome = !!window.chrome && !!window.chrome.webstore; var isBlink = (isChrome || isOpera) && !!window.CSS; // Prüft, ob der URL-Parameter "usage" auf "once" gesetzt ist. -function loadSavedResults () { +function loadSavedResults() { var results = new Results(); if (results.length > 0) { var html = $('\ diff --git a/resources/assets/js/searchbar.js b/resources/assets/js/searchbar.js index f04e61b93..6c9a0b176 100644 --- a/resources/assets/js/searchbar.js +++ b/resources/assets/js/searchbar.js @@ -1,6 +1,7 @@ $(function () { loadLocalStorage(); setActionListenersSearchbar(); + updateLangLabelCode(); }); function setActionListenersSearchbar() { @@ -21,14 +22,15 @@ function loadKey() { } function saveLang() { - var key = $('#input-lang').val(); - localStorage.setItem('lang', key); + var lang = $('#input-lang').val(); + localStorage.setItem('lang', lang); + updateLangLabelCode(lang); } function loadLang() { - var key = localStorage.getItem('lang'); - if (key != null) { - $('#input-lang').val(key); + var lang = localStorage.getItem('lang'); + if (lang != null) { + $('#input-lang').val(lang); } } @@ -68,4 +70,11 @@ function setSettings() { if (requestMethod !== null && (requestMethod === 'GET' || requestMethod === 'POST')) { $('#searchForm').attr('method', requestMethod); } +} + +function updateLangLabelCode(langcode = null) { + if (!langcode) { + var langcode = localStorage.getItem('lang'); + } + $('#lang-label-code').html(langcode); } \ No newline at end of file diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less index 4f470d6ce..02a39bc71 100644 --- a/resources/assets/less/metager/searchbar.less +++ b/resources/assets/less/metager/searchbar.less @@ -35,6 +35,8 @@ } #search-lang, #search-key { + display: -webkit-box; + display: -ms-flexbox; display: flex; z-index: 1; #input-lang, @@ -42,11 +44,16 @@ margin: 0; padding: 0px; border: none; + -webkit-box-shadow: none; box-shadow: none; height: 40px; width: 0px; outline-color: green; + -webkit-transition: width 0.5s, padding 0.5s, outline-color 0s, border-color 0s, -webkit-box-shadow 0s; + transition: width 0.5s, padding 0.5s, outline-color 0s, border-color 0s, -webkit-box-shadow 0s; transition: width 0.5s, padding 0.5s, outline-color 0s, border-color 0s, box-shadow 0s; + transition: width 0.5s, padding 0.5s, outline-color 0s, border-color 0s, box-shadow 0s, -webkit-box-shadow 0s; + -webkit-transition-delay: 0.3s; transition-delay: 0.3s; &:focus { width: 200px; @@ -69,11 +76,22 @@ height: 40px; width: 40px; margin: 0; + display: -webkit-box; + display: -ms-flexbox; display: flex; + -webkit-box-align: center; + -ms-flex-align: center; align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; justify-content: center; + -webkit-transition: width 0s, visibility 0s; transition: width 0s, visibility 0s; + -webkit-transition-delay: 0.3s; transition-delay: 0.3s; + #lang-label-code { + margin-left: 5px; + } } } .search-input { diff --git a/resources/views/parts/searchbar.blade.php b/resources/views/parts/searchbar.blade.php index cd7825c1f..976817e18 100644 --- a/resources/views/parts/searchbar.blade.php +++ b/resources/views/parts/searchbar.blade.php @@ -13,6 +13,7 @@ </select> <label id="lang-label" for="input-lang" data-tooltip="{{ trans ('index.lang.tooltip') }}"> <i class="fa fa-globe" aria-hidden="true"></i> + <span id="lang-label-code"></span> </label> </div> <div id="search-key"> -- GitLab