composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1094.2 Portal: Showing "icon" attribute on ServiceFamily and Service levels in "mosaic" mode of "services" BrowseBrick.

Browse Source 
SVN:trunk[5038]
This commit is contained in:
Guillaume Lajarige
2017-10-18 14:29:53 +00:00
parent 54858c63f5
commit 8e83baf72b
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@
// - Adding stub div // - Adding stub div
var textElem = $('<div></div>').addClass('mosaic-item-text'); var textElem = $('<div></div>').addClass('mosaic-item-text');
// - Adding image // - Adding image
if( (item.image !== undefined) && (item.image !== '') ) if( (item.image !== undefined) && (item.image !== '') && (item.image !== null) )
{ {
iItemFlags += 4; iItemFlags += 4;
aElem.append( $('<div></div>').addClass('mosaic-item-image').append( $('<img />').attr('src', item.image) ) ); aElem.append( $('<div></div>').addClass('mosaic-item-image').append( $('<img />').attr('src', item.image) ) );

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

@@ -677,10 +677,19 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
font-size: 1em; font-size: 1em;
} }
/****************/ /****************************************************************/
/* - Mosaic mode */ /* - Mosaic mode */
/* Note: Some of the CSS is factorised in the "Tree mode" part */ /* */
/****************/ /* 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{ #brick_content_mosaic{
position: relative; position: relative;
padding: 10px 10px 1px 10px; padding: 10px 10px 1px 10px;

6
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -1067,6 +1067,7 @@
<levels> <levels>
<level id="1"> <level id="1">
<class>ServiceFamily</class> <class>ServiceFamily</class>
<image_att>icon</image_att>
<levels> <levels>
<!-- Level IDs must be numeric --> <!-- Level IDs must be numeric -->
<level id="1"> <level id="1">
@@ -1080,10 +1081,10 @@
<tooltip_att>description</tooltip_att> <tooltip_att>description</tooltip_att>
<!-- Attribute code of the above class [from the OQL] used to display a small text beside the object's name --> <!-- Attribute code of the above class [from the OQL] used to display a small text beside the object's name -->
<!-- Note: This is not used in "list" mode --> <!-- Note: This is not used in "list" mode -->
<description_att/> <description_att>description</description_att>
<!-- Attribute code of the above class [from the OQL] used to display a image beside the object's name --> <!-- Attribute code of the above class [from the OQL] used to display a image beside the object's name -->
<!-- Note: This is used in "mosaic" mode only for now --> <!-- Note: This is used in "mosaic" mode only for now -->
<!--<image_att/>--> <image_att>icon</image_att>
<!-- Title of the level, will be display in lists and others browse modes --> <!-- Title of the level, will be display in lists and others browse modes -->
<title>Class:Service</title> <title>Class:Service</title>
<!-- Optional tag to add attributes to the table by their code, can be specified for each level --> <!-- Optional tag to add attributes to the table by their code, can be specified for each level -->
@@ -1100,6 +1101,7 @@
<parent_att>service_id</parent_att> <parent_att>service_id</parent_att>
<name_att/> <name_att/>
<tooltip_att>description</tooltip_att> <tooltip_att>description</tooltip_att>
<description_att>description</description_att>
<title>Class:ServiceSubcategory</title> <title>Class:ServiceSubcategory</title>
<actions> <actions>
<action id="create_from_this" xsi:type="create_from_this"> <action id="create_from_this" xsi:type="create_from_this">