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

Bugfix des Ergebnisseiten-Themes See merge request !483

Merge branch '286-gulp-fur-less-einrichten' into 'development'
Bugfix des Ergebnisseiten-Themes See merge request !483
15d21983 · Phil Höfer · edc51607 · 5c65c0b0 · 15d21983 · 15d21983
Commit 15d21983 authored 8 years ago by Phil Höfer
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -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);

--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -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:

--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -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 !== "" )