Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
1cd164d7
Commit
1cd164d7
authored
Oct 11, 2016
by
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
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 !== "" )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment