Skip to content
GitLab
Commit 385aa8c0 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '1226-prevent-white-flashing-page-when-resultpage-is-loaded' into 'development' 

Resolve "Prevent white flashing page when resultpage is loaded"

Closes #1226

See merge request !2015
parents 9565fb75 d2c9be28
Hide whitespace changes
Inline Side-by-side
metager/app/Http/Middleware/BrowserVerification.php
View file @ 385aa8c0
......@@ -3,6 +3,7 @@
namespace App\Http\Middleware;
use App\Http\Controllers\HumanVerification;
use App\MetaGer;
use Closure;
use Illuminate\Support\Facades\Redis;
use Jenssegers\Agent\Agent;
......
metager/resources/views/layouts/resultpage/framedResultPage.blade.php
View file @ 385aa8c0
......@@ -11,6 +11,14 @@
<link rel="alternate" hreflang="{{ $locale }}" href="{{ LaravelLocalization::getLocalizedUrl($locale, null, [], true) }}">
@endif
@endforeach
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" />
@if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" />
@elseif(Cookie::get('dark_mode') === "1")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" />
@elseif(Request::input('out', '') !== "results-with-style" )
<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/metager-dark.css') }}" />
@endif
<title>{{ Request::input('eingabe', '') }} - MetaGer</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
......@@ -31,11 +39,37 @@
height: 100%;
height: 100vh;
}
html > body > #resultpage-container {
display: none;
}
</style>
</head>
<body>
<div id="resultpage-container">
<div id="whitespace"></div>
<div id="research-bar-container">
<div id="research-bar">
<div id="header-logo">
<a class="screen-large" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" @if(!empty($metager) && $metager->isFramed())target="_top" @endif tabindex="4">
<h1><img src="/img/metager.svg" alt="MetaGer" /></h1>
</a>
<a class="screen-small" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" @if(!empty($metager) && $metager->isFramed())target="_top" @endif>
<h1><img src="/img/metager-schloss-orange.svg" alt="MetaGer" /></h1>
</a>
<a class="lang" href="{{ LaravelLocalization::getLocalizedURL(null, route("lang-selector")) }}">
<span>{{ App\Localization::getRegion() }}</span>
</a>
</div>
<div id="header-searchbar">
@include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
</div>
<div class="sidebar-opener-placeholder"></div>
</div>
</div>
</div>
<iframe id="mg-framed" src="{{ $frame_url }}" autofocus="true"></iframe>
<script nonce="{{ $mgv }}">
document.getElementById("mg-framed").src = "";
document.getElementById("resultpage-container").style.display = "block";
</script>
</body>
metager/resources/views/parts/searchbar.blade.php
View file @ 385aa8c0
......@@ -8,7 +8,7 @@
</a>
</div>
<div class="search-input">
<input type="search" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" @if(\Request::is('/') && !\Request::filled('mgapp')) autofocus @endif autocomplete="off" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="0">
<input type="search" name="eingabe" value="@if(Request::filled("eingabe")){{Request::input("eingabe")}}@endif" @if(\Request::is('/') && !\Request::filled('mgapp')) autofocus @endif autocomplete="off" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="0">
<button id="search-delete-btn" name="delete-search-input" type="button" tabindex="-1">
&#xd7;
</button>
......
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