Commit eb8fee30 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '919-page-up-link-on-the-last-result-page' into 'development'

Resolve "Page up link on the last result page"

Closes #919

See merge request !1497
parents 089b332d 5c80e7c8
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -4,6 +4,7 @@ return [
'redirect' => '(mit redirect)',
'weiter' => 'Weitersuchen',
'zurueck' => 'Zurück',
'backtotop' => 'Zum Anfang der Seite',
'filter' => 'Die Suchergebnisse wurden gefiltert: <strong>[:filter]</strong>. <a href=":link" target="_blank">Filter abschalten.</a>',
'filter.default' => 'Sie erhalten die Benutzeroberfläche in <strong>:langName</strong>, aber Ergebnisse in <strong>ALLEN</strong> Sprachen. Für ausschließlich deutschsprachige Ergebnisse können Sie unter <a href="/settings" target="_blank">anpassen</a> die "Sprache auswählen".',
......
......@@ -4,6 +4,7 @@ return [
"redirect" => "(with redirect)",
"weiter" => "more",
"zurueck" => "back",
'backtotop' => 'back to top',
"filter" => "Results are filtered by language: <strong>[:filter]</strong>. <a href=\":link\" target=\"_blank\">Disable this filter.</a>",
"filter.default" => "The interface language is set to <strong>:langName</strong> but you will receive results in <strong>ALL</strong> languages. If you want to restrict the results to a specific language, please click <a href=\"/en/settings\" target=\"_blank\">customize</a> and choose your desired language there.",
'produktanzeigen' => 'Show products:',
......
......@@ -387,6 +387,10 @@ a {
margin-top: 0;
}
}
#backtotop {
text-align: center;
margin: 1em 0;
}
}
#additions-container {
grid-area: additions;
......@@ -626,9 +630,7 @@ a {
}
footer.resultPageFooter {
max-width: @results-width-max;
margin-top: 20px;
@media (max-width: (2 * @results-margin-left + @results-width-max - 1px)) {
margin: 20px 0 0 0;
}
......
......@@ -26,9 +26,11 @@
</div>
@include('parts.filter')
<div id="results-container">
<span name="top"></span>
@include('parts.errors')
@include('parts.warnings')
@yield('results')
<div id="backtotop"><a href="#top">@lang('results.backtotop')</a></div>
</div>
<div id="additions-container">
@include('layouts.keyboardNavBox')
......
......@@ -43,9 +43,11 @@
<link rel="stylesheet" href="/css/noheader.css">
<div id="resultpage-container-noheader">
<div id="results-container">
<span name="top"></span>
@include('parts.errors')
@include('parts.warnings')
@yield('results')
<div id="backtotop"><a href="#top">@lang('results.backtotop')</a></div>
</div>
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
......
......@@ -3,7 +3,7 @@
<div id="settings">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), route('settings', ["fokus" => $metager->getFokus(), "url" => url()->full()])) }}">
<i class="fas fa-cogs"></i>
@if($metager->getSavedSettingCount() > 0) <span class="badge badge-primary">{{ $metager->getSavedSettingCount() }}@endif</span>
@if($metager->getSavedSettingCount() > 0) <span class="badge badge-primary"></span>{{ $metager->getSavedSettingCount() }}@endif
@lang('metaGer.settings')&hellip;
</a>
</div>
......
Markdown is supported
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