Commit 8696a543 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '1231-fixing-the-back-button-icon-for-the-language-selection-page' into 'development'

Resolve "fixing the back button icon for the language selection page"

Closes #1231

See merge request !2017
parents c63db605 76d443a6
......@@ -45,5 +45,5 @@ return [
"title" => "!bangs",
"1" => "MetaGer unterstützt in geringem Umfang eine Schreibweise, die oft als „!bang“-Syntax bezeichnet wird.<br>Ein solches „!bang“ beginnt immer mit einem Ausrufezeichen und enthält keine Leerzeichen. Beispiele sind hier „!twitter“ oder „!facebook“.<br>Wird ein !bang, das wir unterstützen, in der Suchanfrage verwendet, erscheint in unseren Quicktips ein Eintrag, über den man die Suche auf Knopfdruck mit dem jeweiligen Dienst (hier Twitter oder Facebook) fortführen kann.",
],
"backarrow" => ' Zurück',
"backarrow" => 'Zurück',
];
......@@ -6,7 +6,7 @@ return [
"backarrow" => ' Zurück',
"backarrow" => 'Zurück',
"result" => [
"info" => [
"1" => 'Alle Ergebnisse werden in folgender Form ausgegeben:<p><div class="image-container"><img src="/img/hilfe-php-resultpic-01.png" alt="Bildschirmfoto eines Suchergebnisses"></div></p>',
......
......@@ -2,7 +2,7 @@
return [
"title" => 'MetaGer - Hilfe',
"backarrow" => ' Zurück',
"backarrow" => 'Zurück',
"datenschutz.title" => "Anonymität und Datensicherheit",
"datenschutz.1" => 'Tracking-Cookies, Session-IDs und IP-Adressen',
......
......@@ -5,7 +5,7 @@ return [
"1" => "Sie können MetaGer auch als App nutzen. Laden Sie sich dazu einfach die <a href=\"https://metager.de/app\" target=\"_blank\" rel=\"noopener\">MetaGer App</a> auf ihr Android Smartphone.",
"title" => "Android-App",
],
"backarrow" => ' Zurück',
"backarrow" => 'Zurück',
"dienste" => [
"kostenlos" => "Selbstverständlich sind all unsere Dienste kostenlos",
"text" => "Weitere Dienste um die Suche herum",
......
<?php
return [
'title' => 'MetaGer - Help',
'backarrow' => ' back',
'backarrow' => 'back',
'suchfunktion' => [
'title' => 'Search functions',
],
......
<?php
return [
'backarrow' => ' back',
'backarrow' => 'back',
'title' => [
2 => 'Use of the search engine',
1 => 'MetaGer - Help',
......
<?php
return [
'title' => 'MetaGer - Help',
'backarrow' => ' back',
'backarrow' => 'back',
'datenschutz' => [
'title' => 'Privacy',
1 => 'Tracking-Cookies, Session-IDs, IP addresses',
......
<?php
return [
'title' => 'MetaGer - Help',
'backarrow' => ' back',
'backarrow' => 'back',
'dienste' => [
'kostenlos' => 'All our services are cost free. You do not pay with your data.',
'text' => 'Services',
......
......@@ -54,11 +54,11 @@
}
}
}
.help-back-button, .help-back-button:visited {
.back-button, .back-button:visited {
font-size: medium;
color: @text-color;
}
.help-back-button .back-arrow {
.back-button .back-arrow {
width:10px ;
}
.help-topic-row {
......@@ -67,6 +67,10 @@
justify-content: space-evenly;
flex-wrap:wrap;
}
.back-arrow{
margin-right: 0.25em;
margin-bottom: 0.2em;
}
.help-topic, .help-topic:visited {
width:20vw;
max-width: 220px;
......
......@@ -5,7 +5,7 @@
@section('content')
<h1 class="page-title">{!! trans('help/help-functions.title') !!}</h1>
<section>
<a class=help-back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-functions.backarrow') !!}</a>
<a class=back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-functions.backarrow') !!}</a>
<h2 id="searchfunctions">{!! trans('help/help-functions.suchfunktion.title') !!}</h2>
<h3 id="stopwordsearch">{!! trans('help/help-functions.stopworte.title') !!}</h3>
<div>
......
......@@ -6,7 +6,7 @@
<h1 class="page-title">{!! trans('help/help-mainpages.title.1') !!}</h1>
<section id="startpage">
<a class=help-back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-mainpages.backarrow') !!}</a>
<a class=back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-mainpages.backarrow') !!}</a>
<h2>{!! trans('help/help-mainpages.title.2') !!}</h2>
<h3 id="startseite">{!! trans('help/help-mainpages.startpage.title') !!}</h3>
......
......@@ -4,7 +4,7 @@
@section('content')
<h1 class="page-title">{!! trans('help/help-privacy-protection.title') !!}</h1>
<a class=help-back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-privacy-protection.backarrow') !!}</a>
<a class=back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-privacy-protection.backarrow') !!}</a>
<h2>{!! trans('help/help-privacy-protection.datenschutz.title') !!}</h2>
<section id="tracking">
<h3>{!! trans('help/help-privacy-protection.datenschutz.1') !!}</h3>
......
......@@ -4,7 +4,7 @@
@section('content')
<h1 class="page-title">{!! trans('help/help-services.title') !!}</h1>
<a class=help-back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-services.backarrow') !!}</a>
<a class=back-button href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe") }}"><img class="back-arrow" src=/img/back-arrow.svg>{!! trans('help/help-services.backarrow') !!}</a>
<h2 id="dienste">{!! trans('help/help-services.dienste.text') !!}</h2>
<h3><img class= "mg-icon" src="/img/angle-double-right.svg" alt="{{ trans('angle-double-right.alt') }}" aria-hidden= "true"> {!! trans('help/help-services.dienste.kostenlos') !!}</h3>
<section id="app">
......
......@@ -4,7 +4,7 @@
@section('content')
<h1>{{ __("lang-selector.h1.1") }}</h1>
@if($previous_url !== null)<div><a href="{{$previous_url}}"> {{__("results.zurueck")}}</a></div>@endif
@if($previous_url !== null)<div><a class=back-button href="{{$previous_url}}"><img class="back-arrow" src=/img/back-arrow.svg>{{__("results.zurueck")}}</a></div>@endif
<p>{{ __("lang-selector.p.1") }}</p>
<div id="languages">
@foreach(App\Localization::getLanguageSelectorLocales() as $language => $locales)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment