فهرست منبع

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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4140 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 9 سال پیش
والد
کامیت
760fcce3cc

+ 1 - 1
datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig

@@ -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 - 0
datamodels/2.x/itop-portal-base/portal/web/css/portal.css

@@ -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;
 	}
 	}