Skip to content

GitLab

Commit 1cd164d7 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '286-gulp-fur-less-einrichten' into 'development' 

Bugfix des Ergebnisseiten-Themes



See merge request !483
parents b7554bd9 c767724c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
app/Http/Controllers/StartpageController.php
View file @ 1cd164d7
......@@ -26,7 +26,7 @@ class StartpageController extends Controller
public function loadStartPage(Request $request)
{
$focusPages = [];
$theme = "none";
$theme = "default";
foreach ($request->all() as $key => $value) {
if ($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab') {
$focusPages[] = str_replace('param_', '', $key);
......
app/MetaGer.php
View file @ 1cd164d7
......@@ -811,7 +811,7 @@ class MetaGer
$this->sprueche = false;
}
# Theme
$this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'none'));
$this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default'));
# Ergebnisse pro Seite:
$this->resultCount = $request->input('resultCount', '20');
# Manchmal müssen wir Parameter anpassen um den Sucheinstellungen gerecht zu werden:
......
resources/views/quicktip.blade.php
View file @ 1cd164d7
......@@ -3,9 +3,7 @@
<title>{!! trans('quicktip.title') !!}</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/css/style.css" />
@if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
</head>
<body>
@if( $spruch !== "" )
......
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