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

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/acpoitiers/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "icart.png" %}
 
-{% set fgheader         = "true" %}
 {% set header           = "header.jpg" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/constant.html.twig

@@ -1,5 +1,4 @@
 {% macro logo() %}{{ app.session.get('logo') }}{% endmacro %}
-{% macro fgheader() %}{{ app.session.get('fgheader') }}{% endmacro %}
 {% macro header() %}{{ app.session.get('header') }}{% endmacro %}
 {% macro heightheader() %}{{ app.session.get('heightheader') }}{% endmacro %}
 {% macro colorR() %}{{ app.session.get('color')['mainrgb']['r'] }}{% endmacro %}

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "logo.png" %}
 
-{% set fgheader         = "true" %}
 {% set header           = "" %}
 {% set heightheader     = "150" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/red/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig

@@ -1,6 +1,5 @@
 {% set logo             = "" %}
 
-{% set fgheader         = "" %}
 {% set header           = "" %}
 {% set heightheader     = "" %}
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig

@@ -149,7 +149,7 @@
                         value: true
                         {% endif %}
                     },
-                    success: function(idbookmark) {
+                    success: function() {
                         location.reload();
                     }            
                 });

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig

@@ -187,6 +187,7 @@
                 .header .title,
                 .panel-heading,
                 .widgetheader,
+                #navbarsmalltitle,
                 h1 {
                     font-family: var(--fontfacetitle);
                 }

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig

@@ -14,7 +14,6 @@
     {% import '@Theme/constant.html.twig' as constant %}
 
     {% set logo = constant.logo().__toString %}
-    {% set fgheader = constant.fgheader().__toString %}
     {% set header = constant.header().__toString %}
     {% set heightheader = constant.heightheader().__toString %}
     {% set colorR = constant.colorR.__toString %}