Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-03-12 16:55:26 +01:00
commit 788e0f511f
10 changed files with 1 additions and 13 deletions

View File

@ -67,10 +67,7 @@ class ThemeController extends Controller
$logo=$request->query->get('logo'); $logo=$request->query->get('logo');
if(!empty($logo)) $session->set('logo',"bundles/cadolescore/themes/$themename/".$logo); if(!empty($logo)) $session->set('logo',"bundles/cadolescore/themes/$themename/".$logo);
$fgheader=$request->query->get('fgheader');
if(!empty($fgheader)) $session->set('fgheader',boolval($fgheader));
$header=$request->query->get('header'); $header=$request->query->get('header');
if(!empty($header)) $session->set('header',"bundles/cadolescore/themes/$themename/".$header); if(!empty($header)) $session->set('header',"bundles/cadolescore/themes/$themename/".$header);

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,

View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig", render(url("cadoles_core_theme_setconfig",
{ {
'logo':logo, 'logo':logo,
'fgheader':fgheader,
'header': header, 'header': header,
'heightheader': heightheader, 'heightheader': heightheader,
'colormain': colormain, 'colormain': colormain,