diff --git 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 index 4a26cb07..f228252e 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "icart.png" %} -{% set fgheader = "true" %} {% set header = "header.jpg" %} {% set heightheader = "" %} diff --git 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 index b87d079f..1d5d6076 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/constant.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/constant.html.twig index b9227120..974f4eca 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/constant.html.twig +++ b/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 %} diff --git 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 index f5d07e0c..18f9aeb0 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git 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 index f54b0c1e..947ed68c 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git 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 index 58d3a8af..4bf63935 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "logo.png" %} -{% set fgheader = "true" %} {% set header = "" %} {% set heightheader = "150" %} diff --git 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 index 0b2314d4..fde88b29 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git 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 index dce1ebc4..ba8b414d 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git 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 index 1bda1b5d..f9ad848a 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git 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 index b1f49ed9..8aca2d01 100644 --- 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 @@ -1,6 +1,5 @@ {% set logo = "" %} -{% set fgheader = "" %} {% set header = "" %} {% set heightheader = "" %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig index 30e2e489..92586780 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig +++ b/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(); } }); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig index 8e30e0e9..c4521fe5 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig +++ b/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); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index c988b71c..65d4958f 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/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 %}