From 325de094d005c8854e5e8ce48ccdc370873394ee Mon Sep 17 00:00:00 2001 From: Pierre Cadeot Date: Fri, 5 Feb 2021 10:20:14 +0400 Subject: [PATCH 1/4] ajout d'une variable --path : chemin d'acces au theme --- .../CoreBundle/Resources/public/themes/metice/style.css | 4 ++-- .../Cadoles/CoreBundle/Resources/views/Include/head.html.twig | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css index 595966aa..9fbb1d2b 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css @@ -25,7 +25,7 @@ display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(/ninegate/bundles/cadolescore/themes/metice2021/small-logo.svg) no-repeat; + background: url(var(--path) 'small-logo.svg') no-repeat; width: 62px; /* Width of new image */ height: 23px; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ @@ -235,7 +235,7 @@ div.header { display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(/ninegate/bundles/cadolescore/themes/metice2021/small-logo.svg) no-repeat; + background: url(var(--path) 'small-logo.svg') no-repeat; width: 62px; /* Width of new image */ height: 23px; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ 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 73309bdc..43f95836 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 @@ -29,6 +29,7 @@ --fontfacebody: {{ app.session.get('fontfacebody') }}; --header: url(/{{ alias }}/{{ header }}); --logo: url(/{{ alias }}/{{ logo }}); + --path: url(/{{ alias }}/); {% if not app.session.get('sublogo') is empty %} --sublogo: url(/{{ alias }}/{{ app.session.get('sublogo') }}); {% else %} From d878f3ca9f5db367062707fea60c3ef0873d6e4f Mon Sep 17 00:00:00 2001 From: Pierre Cadeot Date: Fri, 5 Feb 2021 17:16:49 +0400 Subject: [PATCH 2/4] =?UTF-8?q?variable=20--themespath=20plus=20g=C3=A9n?= =?UTF-8?q?=C3=A9rique=20pour=20viser=20un=20fichier=20du=20dossier=20them?= =?UTF-8?q?e=20de=20son=20choix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Resources/public/themes/metice/style.css | 4 ++-- .../Cadoles/CoreBundle/Resources/views/Include/head.html.twig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css index 9fbb1d2b..ee463c12 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css @@ -25,7 +25,7 @@ display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(var(--path) 'small-logo.svg') no-repeat; + background: url(var(--themespath) 'metice/small-logo.svg') no-repeat; width: 62px; /* Width of new image */ height: 23px; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ @@ -235,7 +235,7 @@ div.header { display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(var(--path) 'small-logo.svg') no-repeat; + background: url(var(--themespath) 'metice/small-logo.svg') no-repeat; width: 62px; /* Width of new image */ height: 23px; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ 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 43f95836..efcc2b9e 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 @@ -29,7 +29,7 @@ --fontfacebody: {{ app.session.get('fontfacebody') }}; --header: url(/{{ alias }}/{{ header }}); --logo: url(/{{ alias }}/{{ logo }}); - --path: url(/{{ alias }}/); + --themespath: url(/{{ alias }}/bundles/cadolescore/themes/); {% if not app.session.get('sublogo') is empty %} --sublogo: url(/{{ alias }}/{{ app.session.get('sublogo') }}); {% else %} From e1152ab89b88e9d8447ab4f4942d34c94255965f Mon Sep 17 00:00:00 2001 From: Pierre Cadeot Date: Mon, 8 Feb 2021 14:47:45 +0400 Subject: [PATCH 3/4] =?UTF-8?q?mise=20en=20coh=C3=A9rence=20theme=20m?= =?UTF-8?q?=C3=A9tice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/themes/metice/small-logo.svg | 101 ------------------ .../Resources/public/themes/metice/style.css | 8 +- .../Resources/views/Include/head.html.twig | 1 - 3 files changed, 4 insertions(+), 106 deletions(-) delete mode 100644 src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/small-logo.svg diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/small-logo.svg b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/small-logo.svg deleted file mode 100644 index 647050df..00000000 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/small-logo.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css index ee463c12..2b010aae 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css @@ -25,9 +25,9 @@ display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(var(--themespath) 'metice/small-logo.svg') no-repeat; + background: var(--logo) no-repeat; width: 62px; /* Width of new image */ - height: 23px; /* Height of new image */ + height: 23px !important; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ margin-top: 21px; margin-left: 11px; @@ -235,9 +235,9 @@ div.header { display: block; -moz-box-sizing: border-box; box-sizing: border-box; - background: url(var(--themespath) 'metice/small-logo.svg') no-repeat; + background: var(--logo) no-repeat; width: 62px; /* Width of new image */ - height: 23px; /* Height of new image */ + height: 23px !important; /* Height of new image */ padding-left: 62px; /* Equal to width of new image */ margin-top: -1px; margin-left: 86px; 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 efcc2b9e..73309bdc 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 @@ -29,7 +29,6 @@ --fontfacebody: {{ app.session.get('fontfacebody') }}; --header: url(/{{ alias }}/{{ header }}); --logo: url(/{{ alias }}/{{ logo }}); - --themespath: url(/{{ alias }}/bundles/cadolescore/themes/); {% if not app.session.get('sublogo') is empty %} --sublogo: url(/{{ alias }}/{{ app.session.get('sublogo') }}); {% else %} From 7dfa172682b8c32f9f714bad4236ee548148dc8d Mon Sep 17 00:00:00 2001 From: Pierre Cadeot Date: Tue, 9 Feb 2021 07:42:17 +0400 Subject: [PATCH 4/4] fix regression entre #105 et #106 rajout template 'orm: CadolesEdispatcherBundle: ~' --- tmpl/ninegate-template.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml index c53330a1..8918eb95 100644 --- a/tmpl/ninegate-template.yml +++ b/tmpl/ninegate-template.yml @@ -591,6 +591,7 @@ doctrine: CadolesCronBundle: ~ CadolesPortalBundle: ~ CadolesWebsocketBundle: ~ + CadolesEdispatcherBundle: ~ - \ No newline at end of file +