From 1ea66646b6dbbc80ee07555d981d8a09be5574fe Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Wed, 25 May 2016 09:44:30 +0000 Subject: [PATCH] Customer portal : Allowed HTML in tile description. Also fixed tile description css to avoid text wrapping under the decoration. SVN:trunk[4140] --- .../portal/src/views/bricks/tile.html.twig | 2 +- datamodels/2.x/itop-portal-base/portal/web/css/portal.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig index e6b6bab31..fc7a4db26 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig @@ -14,7 +14,7 @@
{{ brick.GetTitleHome|dict_s }}
{% if brick.HasDescription %} -
{{ brick.GetDescription|dict_s }}
+
{{ brick.GetDescription|dict_s|raw }}
{% endif %}
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css index 694e12f25..9667378b7 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css @@ -591,6 +591,7 @@ a:hover, a:focus{ } .home .tile .tile_body{ display: block; + padding-left: 4.3em; text-align: left; line-height: 1.5em; } @@ -611,6 +612,9 @@ a:hover, a:focus{ .home .tile .tile_decoration > span.icon{ font-size: 4em; } + .home .tile .tile_body{ + padding-left: 6.3em; + } .home .tile .tile_title{ font-size: 1.4em; } @@ -631,6 +635,9 @@ a:hover, a:focus{ .home .tile .tile_decoration > span.icon{ font-size: 6em; } + .home .tile .tile_body{ + padding-left: 9.1em; + } .home .tile .tile_title{ font-size: 1.5em; }