mirror of
https://github.com/Combodo/iTop.git
synced 2026-03-14 05:24:12 +01:00
Compare commits
3 Commits
feature/93
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
32ddf1c980 | ||
|
|
0f7540dec8 | ||
|
|
a36a7cc832 |
@@ -1646,7 +1646,6 @@
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<state_attribute>status</state_attribute>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-application-window.svg</icon>
|
||||
@@ -1714,13 +1713,6 @@
|
||||
<min_up_mode>user</min_up_mode>
|
||||
<min_up_type>count</min_up_type>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
</fields>
|
||||
<presentation>
|
||||
<details>
|
||||
@@ -1754,11 +1746,8 @@
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
</items>
|
||||
<rank>10</rank>
|
||||
@@ -1853,7 +1842,6 @@
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<state_attribute>status</state_attribute>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-process-improvement.svg</icon>
|
||||
@@ -1902,13 +1890,6 @@
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
<display_style>list</display_style>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
</fields>
|
||||
<presentation>
|
||||
<details>
|
||||
@@ -1942,11 +1923,8 @@
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
</items>
|
||||
<rank>10</rank>
|
||||
@@ -2210,40 +2188,7 @@
|
||||
</items>
|
||||
</list>
|
||||
</presentation>
|
||||
<methods>
|
||||
<method id="GetIcon">
|
||||
<comment> /**
|
||||
* Overrides the GetIcon method to return the logo of the associated Software if any, otherwise the default icon of the class will be returned
|
||||
*
|
||||
*/</comment>
|
||||
<static>false</static>
|
||||
<access>public</access>
|
||||
<type>Custom</type>
|
||||
<code><![CDATA[ public function GetIcon($bImgTag = true)
|
||||
{
|
||||
// If there is an image defined on the associated Software, we use it
|
||||
$sIconClass = 'Software'; // the class storing the image which will be used as icon for the current object
|
||||
$sExtKeyCode = 'software_id'; // the attribute code pointing to the class having the image to display
|
||||
$sIconAttCode = 'logo'; // the attribute code of the image to display on the IconClass
|
||||
|
||||
$iObj = $this->Get($sExtKeyCode);
|
||||
if ($iObj > 0) {
|
||||
$oObj = MetaModel::GetObject($sIconClass, $iObj, true, true);
|
||||
$oImage = $oObj->Get($sIconAttCode);
|
||||
$sIconUrl = $oImage->IsEmpty() ? '' : $oImage->GetDisplayURL($sIconClass, $iObj, $sIconAttCode);
|
||||
if (strlen($sIconUrl) > 0) {
|
||||
if ($bImgTag) {
|
||||
return "<img src=\"$sIconUrl\" alt=''/>";
|
||||
} else {
|
||||
return $sIconUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Return the default image
|
||||
return parent::GetIcon($bImgTag);
|
||||
}]]></code>
|
||||
</method>
|
||||
</methods>
|
||||
<methods/>
|
||||
</class>
|
||||
<class id="Middleware" _delta="define">
|
||||
<parent>SoftwareInstance</parent>
|
||||
@@ -3141,9 +3086,6 @@
|
||||
<attribute id="middleware_name"/>
|
||||
</complementary_attributes>
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-automatic.svg</icon>
|
||||
</style>
|
||||
@@ -3171,13 +3113,6 @@
|
||||
<extkey_attcode>middleware_id</extkey_attcode>
|
||||
<target_attcode>name</target_attcode>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
</fields>
|
||||
<presentation>
|
||||
<details>
|
||||
@@ -3216,11 +3151,8 @@
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
</items>
|
||||
<rank>10</rank>
|
||||
@@ -3480,9 +3412,6 @@
|
||||
<attribute id="webserver_name"/>
|
||||
</complementary_attributes>
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-web.svg</icon>
|
||||
</style>
|
||||
@@ -3514,13 +3443,6 @@
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
<target>_blank</target>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
</fields>
|
||||
<presentation>
|
||||
<details>
|
||||
@@ -3560,10 +3482,7 @@
|
||||
<item id="fieldset:ConfigMgnt:otherinfo">
|
||||
<items>
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
@@ -3674,9 +3593,6 @@
|
||||
<attribute id="type"/>
|
||||
</complementary_attributes>
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-software.svg</icon>
|
||||
</style>
|
||||
@@ -3736,13 +3652,6 @@
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
<display_style>list</display_style>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
<field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
|
||||
<linked_class>SoftwareInstance</linked_class>
|
||||
<ext_key_to_me>software_id</ext_key_to_me>
|
||||
@@ -3781,20 +3690,17 @@
|
||||
<item id="type">
|
||||
<rank>40</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<item id="documents_list">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="documents_list">
|
||||
<item id="softwareinstance_list">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="softwareinstance_list">
|
||||
<item id="softwarepatch_list">
|
||||
<rank>70</rank>
|
||||
</item>
|
||||
<item id="softwarepatch_list">
|
||||
<rank>80</rank>
|
||||
</item>
|
||||
<item id="softwarelicence_list">
|
||||
<rank>90</rank>
|
||||
<rank>80</rank>
|
||||
</item>
|
||||
</items>
|
||||
</details>
|
||||
|
||||
@@ -228,10 +228,6 @@
|
||||
<attribute id="containervirtualhost_id_friendlyname"/>
|
||||
</complementary_attributes>
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<state_attribute>status</state_attribute>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<reconciliation>
|
||||
<attributes>
|
||||
<attribute id="name"/>
|
||||
@@ -239,6 +235,9 @@
|
||||
<attribute id="finalclass"/>
|
||||
</attributes>
|
||||
</reconciliation>
|
||||
<fields_semantic>
|
||||
<state_attribute>status</state_attribute>
|
||||
</fields_semantic>
|
||||
<style>
|
||||
<icon>images/icons8-application-container.svg</icon>
|
||||
</style>
|
||||
@@ -256,13 +255,6 @@
|
||||
<on_target_delete>DEL_AUTO</on_target_delete>
|
||||
<tracking_level>all</tracking_level>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
<field id="containerimages_list" xsi:type="AttributeLinkedSetIndirect">
|
||||
<linked_class>lnkContainerApplicationToImage</linked_class>
|
||||
<ext_key_to_me>containerapplication_id</ext_key_to_me>
|
||||
@@ -365,11 +357,8 @@
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
</items>
|
||||
<rank>10</rank>
|
||||
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
@@ -44,6 +44,7 @@ Dict::Add('EN US', 'English', 'English', [
|
||||
//
|
||||
|
||||
Dict::Add('EN US', 'English', 'English', [
|
||||
'Class:FiberChannelInterface/Name' => '%2$s %1$s',
|
||||
'Class:FiberChannelInterface/Attribute:org_id' => 'Org id',
|
||||
'Class:FiberChannelInterface/Attribute:org_id+' => '',
|
||||
'Class:FiberChannelInterface/Attribute:location_id' => 'Location id',
|
||||
|
||||
@@ -43,6 +43,7 @@ Dict::Add('FR FR', 'French', 'Français', [
|
||||
//
|
||||
|
||||
Dict::Add('FR FR', 'French', 'Français', [
|
||||
'Class:FiberChannelInterface/Name' => '%2$s %1$s',
|
||||
'Class:FiberChannelInterface/Attribute:org_id' => 'Organisation',
|
||||
'Class:FiberChannelInterface/Attribute:org_id+' => '',
|
||||
'Class:FiberChannelInterface/Attribute:location_id' => 'Site',
|
||||
|
||||
@@ -994,9 +994,6 @@
|
||||
<attribute id="location_id_friendlyname"/>
|
||||
</complementary_attributes>
|
||||
</naming>
|
||||
<fields_semantic>
|
||||
<image_attribute>logo</image_attribute>
|
||||
</fields_semantic>
|
||||
<reconciliation>
|
||||
<attributes>
|
||||
<attribute id="name"/>
|
||||
@@ -1006,7 +1003,7 @@
|
||||
</attributes>
|
||||
</reconciliation>
|
||||
<style>
|
||||
<icon>../../images/icons/icons8-cloud.svg</icon>
|
||||
<icon>images/icons8-cloud.svg</icon>
|
||||
</style>
|
||||
</properties>
|
||||
<fields>
|
||||
@@ -1029,13 +1026,6 @@
|
||||
<on_target_delete>DEL_MANUAL</on_target_delete>
|
||||
<tracking_level>all</tracking_level>
|
||||
</field>
|
||||
<field id="logo" xsi:type="AttributeImage">
|
||||
<display_max_width>96</display_max_width>
|
||||
<display_max_height>96</display_max_height>
|
||||
<storage_max_width>128</storage_max_width>
|
||||
<storage_max_height>128</storage_max_height>
|
||||
<is_null_allowed>true</is_null_allowed>
|
||||
</field>
|
||||
</fields>
|
||||
<methods/>
|
||||
<presentation>
|
||||
@@ -1116,11 +1106,8 @@
|
||||
<item id="move2production">
|
||||
<rank>50</rank>
|
||||
</item>
|
||||
<item id="logo">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="description">
|
||||
<rank>70</rank>
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
</items>
|
||||
<rank>10</rank>
|
||||
|
||||
@@ -54,6 +54,7 @@ Dict::Add('EN US', 'English', 'English', [
|
||||
//
|
||||
|
||||
Dict::Add('EN US', 'English', 'English', [
|
||||
'Class:LogicalInterface/Name' => '%2$s %1$s',
|
||||
'Class:LogicalInterface/Attribute:org_id' => 'Organization',
|
||||
'Class:LogicalInterface/Attribute:org_id+' => '',
|
||||
]);
|
||||
|
||||
@@ -54,6 +54,7 @@ Dict::Add('FR FR', 'French', 'Français', [
|
||||
//
|
||||
|
||||
Dict::Add('FR FR', 'French', 'Français', [
|
||||
'Class:LogicalInterface/Name' => '%2$s %1$s',
|
||||
'Class:LogicalInterface/Attribute:org_id' => 'Organisation',
|
||||
'Class:LogicalInterface/Attribute:org_id+' => '',
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user