composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Customer portal : Allowed HTML in tile description. Also fixed tile description css to avoid text wrapping under the decoration.

Browse Source 
SVN:trunk[4140]
This commit is contained in:
Guillaume Lajarige
2016-05-25 09:44:30 +00:00
parent 201f5118b3
commit 1ea66646b6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig
View File

@@ -14,7 +14,7 @@
<div class="tile_body"> <div class="tile_body">
<div class="tile_title">{{ brick.GetTitleHome|dict_s }}</div> <div class="tile_title">{{ brick.GetTitleHome|dict_s }}</div>
{% if brick.HasDescription %} {% if brick.HasDescription %}
<div class="tile_description">{{ brick.GetDescription|dict_s }}</div> <div class="tile_description">{{ brick.GetDescription|dict_s|raw }}</div>
{% endif %} {% endif %}
</div> </div>
</a> </a>

7
datamodels/2.x/itop-portal-base/portal/web/css/portal.css
View File

@@ -591,6 +591,7 @@ a:hover, a:focus{
} }
.home .tile .tile_body{ .home .tile .tile_body{
display: block; display: block;
padding-left: 4.3em;
text-align: left; text-align: left;
line-height: 1.5em; line-height: 1.5em;
} }
@@ -611,6 +612,9 @@ a:hover, a:focus{
.home .tile .tile_decoration > span.icon{ .home .tile .tile_decoration > span.icon{
font-size: 4em; font-size: 4em;
} }
.home .tile .tile_body{
padding-left: 6.3em;
}
.home .tile .tile_title{ .home .tile .tile_title{
font-size: 1.4em; font-size: 1.4em;
} }
@@ -631,6 +635,9 @@ a:hover, a:focus{
.home .tile .tile_decoration > span.icon{ .home .tile .tile_decoration > span.icon{
font-size: 6em; font-size: 6em;
} }
.home .tile .tile_body{
padding-left: 9.1em;
}
.home .tile .tile_title{ .home .tile .tile_title{
font-size: 1.5em; font-size: 1.5em;
} }