diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig index 27b8af774d..70e50a9090 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/browse/mode_mosaic.html.twig @@ -187,7 +187,7 @@ // - Adding stub div var textElem = $('
').addClass('mosaic-item-text'); // - Adding image - if( (item.image !== undefined) && (item.image !== '') ) + if( (item.image !== undefined) && (item.image !== '') && (item.image !== null) ) { iItemFlags += 4; aElem.append( $('
').addClass('mosaic-item-image').append( $('').attr('src', item.image) ) ); diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss index 8e8ef2c684..ec6e20cb3a 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss @@ -677,10 +677,19 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{ font-size: 1em; } -/****************/ -/* - Mosaic mode */ -/* Note: Some of the CSS is factorised in the "Tree mode" part */ -/****************/ +/****************************************************************/ +/* - Mosaic mode */ +/* */ +/* Note: Some of the CSS is factorised in the "Tree mode" part */ +/* */ +/* Note: .mosaic-item-layout-x classes are for different */ +/* presentation modes. Like in binary, add the values to know */ +/* which class to use. */ +/* - 1 is for name */ +/* - 2 is for description */ +/* - 4 is for image */ +/* eg. .mosaic-item-layout-5 when just name and image */ +/****************************************************************/ #brick_content_mosaic{ position: relative; padding: 10px 10px 1px 10px; diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 16441d587f..8cc2b01bb8 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1067,6 +1067,7 @@ ServiceFamily + icon @@ -1080,10 +1081,10 @@ description - + description - + icon Class:Service @@ -1100,6 +1101,7 @@ service_id description + description Class:ServiceSubcategory