composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Retrofit from trunk) N°1094

Browse Source 
- Adding "icon" attribute to ServiceFamily and Service classes
- Show icon on ServiceFamily and Service levels in BrowseBrick


SVN:2.4[5043]
This commit is contained in:
Guillaume Lajarige
2017-10-18 15:00:50 +00:00
parent 9f4d07aaa5
commit 52c3ff0406
6 changed files with 77 additions and 13 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.css
View File

@@ -628,10 +628,19 @@ table .group-actions {
border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px;
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;

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;

24
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2"> <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
<classes> <classes>
<class id="Organization"> <class id="Organization">
<fields> <fields>
@@ -951,6 +951,14 @@
<default_value/> <default_value/>
<is_null_allowed>false</is_null_allowed> <is_null_allowed>false</is_null_allowed>
</field> </field>
<field id="icon" xsi:type="AttributeImage">
<display_max_width>96</display_max_width>
<display_max_height>96</display_max_height>
<storage_max_width>256</storage_max_width>
<storage_max_height>256</storage_max_height>
<default_image/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="services_list" xsi:type="AttributeLinkedSet"> <field id="services_list" xsi:type="AttributeLinkedSet">
<linked_class>Service</linked_class> <linked_class>Service</linked_class>
<ext_key_to_me>servicefamily_id</ext_key_to_me> <ext_key_to_me>servicefamily_id</ext_key_to_me>
@@ -967,6 +975,9 @@
<item id="name"> <item id="name">
<rank>10</rank> <rank>10</rank>
</item> </item>
<item id="icon">
<rank>15</rank>
</item>
<item id="services_list"> <item id="services_list">
<rank>20</rank> <rank>20</rank>
</item> </item>
@@ -1070,6 +1081,14 @@
<is_null_allowed>true</is_null_allowed> <is_null_allowed>true</is_null_allowed>
<display_style>list</display_style> <display_style>list</display_style>
</field> </field>
<field id="icon" xsi:type="AttributeImage">
<display_max_width>96</display_max_width>
<display_max_height>96</display_max_height>
<storage_max_width>256</storage_max_width>
<storage_max_height>256</storage_max_height>
<default_image/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect"> <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
<linked_class>lnkCustomerContractToService</linked_class> <linked_class>lnkCustomerContractToService</linked_class>
<ext_key_to_me>service_id</ext_key_to_me> <ext_key_to_me>service_id</ext_key_to_me>
@@ -1106,6 +1125,9 @@
<item id="status"> <item id="status">
<rank>50</rank> <rank>50</rank>
</item> </item>
<item id="icon">
<rank>55</rank>
</item>
<item id="servicesubcategories_list"> <item id="servicesubcategories_list">
<rank>60</rank> <rank>60</rank>
</item> </item>

24
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2"> <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
<classes> <classes>
<class id="Organization"> <class id="Organization">
<fields> <fields>
@@ -935,6 +935,14 @@
<default_value/> <default_value/>
<is_null_allowed>false</is_null_allowed> <is_null_allowed>false</is_null_allowed>
</field> </field>
<field id="icon" xsi:type="AttributeImage">
<display_max_width>96</display_max_width>
<display_max_height>96</display_max_height>
<storage_max_width>256</storage_max_width>
<storage_max_height>256</storage_max_height>
<default_image/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="services_list" xsi:type="AttributeLinkedSet"> <field id="services_list" xsi:type="AttributeLinkedSet">
<linked_class>Service</linked_class> <linked_class>Service</linked_class>
<ext_key_to_me>servicefamily_id</ext_key_to_me> <ext_key_to_me>servicefamily_id</ext_key_to_me>
@@ -951,6 +959,9 @@
<item id="name"> <item id="name">
<rank>10</rank> <rank>10</rank>
</item> </item>
<item id="icon">
<rank>15</rank>
</item>
<item id="services_list"> <item id="services_list">
<rank>20</rank> <rank>20</rank>
</item> </item>
@@ -1054,6 +1065,14 @@
<is_null_allowed>true</is_null_allowed> <is_null_allowed>true</is_null_allowed>
<display_style>list</display_style> <display_style>list</display_style>
</field> </field>
<field id="icon" xsi:type="AttributeImage">
<display_max_width>96</display_max_width>
<display_max_height>96</display_max_height>
<storage_max_width>256</storage_max_width>
<storage_max_height>256</storage_max_height>
<default_image/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect"> <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
<linked_class>lnkCustomerContractToService</linked_class> <linked_class>lnkCustomerContractToService</linked_class>
<ext_key_to_me>service_id</ext_key_to_me> <ext_key_to_me>service_id</ext_key_to_me>
@@ -1106,6 +1125,9 @@
<item id="status"> <item id="status">
<rank>50</rank> <rank>50</rank>
</item> </item>
<item id="icon">
<rank>55</rank>
</item>
<item id="servicesubcategories_list"> <item id="servicesubcategories_list">
<rank>60</rank> <rank>60</rank>
</item> </item>

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">