From 82b09a4fc1abee1c65684d5dede3a8c54b9b2db2 Mon Sep 17 00:00:00 2001 From: afornerot Date: Thu, 22 Aug 2019 15:01:03 +0200 Subject: [PATCH] correctif sur affichage widget --- .../Resources/views/Pagewidget/constants.twig | 10 ---------- .../Resources/views/Pagewidget/viewblog.html.twig | 6 +++--- .../Resources/views/Pagewidget/viewgroup.html.twig | 6 +++--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig index df869625..ce26b3c1 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig @@ -196,17 +196,7 @@ {% set stylewidgetbody = "" %} {% set stylewidgetbody = stylewidgetbody ~ "background-color: #" ~ colorbodyback ~ "; " %} {% set stylewidgetbody = stylewidgetbody ~ "color: #" ~ colorbodyfont ~ "; " %} - {% if not entity.autoajust %} - {% set stylewidgetbody = stylewidgetbody ~ "height: " ~ (entity.height-50-2) ~ "px; overflow-y: auto;" %} - {% endif %} - {% if entity.border %} - {% set stylewidgetbody = stylewidgetbody ~ "padding:10px" %} - {% endif %} - - {% if not entity.opened %} - {% set stylewidgetbody = stylewidgetbody ~ "display:none" %} - {% endif %} {{ stylewidgetbody }} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig index 61b3835f..b2ce5478 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig @@ -54,13 +54,13 @@
{% endif %} -
+
{% if blogarticle.image is not empty %} {% endif %} -
-

{{ blogarticle.name}}

+
+

{{ blogarticle.name}}

publié par {{ blogarticle.user.username }} le {{ blogarticle.submit|date("d/m/Y à H:i") }}
dans le blog {{blogarticle.blog.name }}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig index 1a521b2d..cec8dc8d 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig @@ -37,9 +37,9 @@
{% for group in groups %} -