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

2021-03-12 16:55:26 +01:00 · 2021-03-12 16:55:26 +01:00 · 788e0f511f
commit 788e0f511f
parent 1461ceca06 016f09983f
10 changed files with 1 additions and 13 deletions
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ThemeController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ThemeController.php
@ -67,10 +67,7 @@ class ThemeController extends Controller

        $logo=$request->query->get('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');
        if(!empty($header)) $session->set('header',"bundles/cadolescore/themes/$themename/".$header);

--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/acpoitiers/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/acpoitiers/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig
@ -14,7 +14,6 @@
 render(url("cadoles_core_theme_setconfig",
    {
        'logo':logo,
-        'fgheader':fgheader,
        'header': header,
        'heightheader': heightheader,
        'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/red/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/red/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig
@ -14,7 +14,6 @@
    render(url("cadoles_core_theme_setconfig",
        {
            'logo':logo,
-            'fgheader':fgheader,
            'header': header,
            'heightheader': heightheader,
            'colormain': colormain,