Skip to content
Snippets Groups Projects
Commit 15d21983 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 edc51607 5c65c0b0
Branches
No related tags found
2 merge requests!483Bugfix des Ergebnisseiten-Themes,!475Development
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/StartpageController.php
+ 1
− 1
View file @ 15d21983
...@@ -26,7 +26,7 @@ class StartpageController extends Controller ...@@ -26,7 +26,7 @@ class StartpageController extends Controller
public function loadStartPage(Request $request) public function loadStartPage(Request $request)
{ {
$focusPages = []; $focusPages = [];
$theme = "none"; $theme = "default";
foreach ($request->all() as $key => $value) { foreach ($request->all() as $key => $value) {
if ($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab') { if ($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab') {
$focusPages[] = str_replace('param_', '', $key); $focusPages[] = str_replace('param_', '', $key);
......
app/MetaGer.php
+ 1
− 1
View file @ 15d21983
...@@ -811,7 +811,7 @@ class MetaGer ...@@ -811,7 +811,7 @@ class MetaGer
$this->sprueche = false; $this->sprueche = false;
} }
# Theme # 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: # Ergebnisse pro Seite:
$this->resultCount = $request->input('resultCount', '20'); $this->resultCount = $request->input('resultCount', '20');
# Manchmal müssen wir Parameter anpassen um den Sucheinstellungen gerecht zu werden: # Manchmal müssen wir Parameter anpassen um den Sucheinstellungen gerecht zu werden:
......
resources/views/quicktip.blade.php
+ 1
− 3
View file @ 15d21983
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
<title>{!! trans('quicktip.title') !!}</title> <title>{!! trans('quicktip.title') !!}</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" /> <link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/css/style.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', 'default') }}.css" />
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif
</head> </head>
<body> <body>
@if( $spruch !== "" ) @if( $spruch !== "" )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment