diff --git a/core/dbobject.class.php b/core/dbobject.class.php index 1127b5910..2523614eb 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -1328,13 +1328,10 @@ abstract class DBObject implements iDisplay } else { - if ($bClickable) - { - $sIcon = ""; - } - else - { - $sIcon = ""; + if ($bClickable) { + $sIcon = ""; + } else { + $sIcon = ""; } } diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss index c2f92fd81..01736b566 100644 --- a/css/backoffice/components/_field.scss +++ b/css/backoffice/components/_field.scss @@ -27,6 +27,8 @@ $ibo-field--value--padding-x--is-fullscreen: $ibo-field--label--padding-x--is-fu $ibo-field--value--padding-top--is-fullscreen: $ibo-field--label--padding-y--is-fullscreen + 32px !default; $ibo-field--value--padding-bottom--is-fullscreen: $ibo-field--label--padding-y--is-fullscreen !default; +$ibo-field--value-decoration--spacing-x: 0.5rem !default; + /* SCSS rules */ .ibo-field { @extend %ibo-font-ral-nor-150; @@ -119,6 +121,7 @@ $ibo-field--value--padding-bottom--is-fullscreen: $ibo-field--label--padding-y-- display: inline-block; padding-left: 5px; } + /* Fullscreen mode */ .ibo-field-large { &.ibo-is-fullscreen { @@ -133,15 +136,24 @@ $ibo-field--value--padding-bottom--is-fullscreen: $ibo-field--label--padding-y-- background-color: $ibo-field--label--background-color--is-fullscreen; border-bottom: $ibo-field--label--border-bottom--is-fullscreen; } + .ibo-field--value { padding: $ibo-field--value--padding-top--is-fullscreen $ibo-field--value--padding-x--is-fullscreen $ibo-field--value--padding-bottom--is-fullscreen $ibo-field--value--padding-x--is-fullscreen; } } } -.mailto, .tel{ + +.mailto, .tel { white-space: nowrap; .text_decoration { - margin-right: 0.5rem; + margin-right: $ibo-field--value-decoration--spacing-x; + } +} + +.object-ref-icon, .object-ref-icon-disabled { + &.text_decoration { + margin-right: $ibo-field--value-decoration--spacing-x; + @extend %ibo-font-ral-nor-100; } } diff --git a/js/extkeywidget.js b/js/extkeywidget.js index e5a103170..afc7814dd 100644 --- a/js/extkeywidget.js +++ b/js/extkeywidget.js @@ -89,23 +89,19 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper render: { item: function (item) { if (item.obsolescence_flag == 1) { - val = ''+item.label; + val = ''+item.label; } else { val = item.label; } return $("
").append(val); }, option: function(item) { - if ( item.obsolescence_flag == 1) - { - val = ''+item.label; - } - else - { + if (item.obsolescence_flag == 1) { + val = ''+item.label; + } else { val = item.label; } - if (item.additional_field != undefined ) - { + if (item.additional_field != undefined) { val = val+'
'+item.additional_field+''; } return $("
").append(val); @@ -193,9 +189,8 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper $(ul).addClass('selectize-dropdown'); var term = this.term.replace("/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi", "\\$1"); var val = item.label.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term+")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); - if (item.obsolescence_flag == '1') - { - val = ' '+val; + if (item.obsolescence_flag == '1') { + val = ' '+val; } if (item.additional_field != undefined ) { diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js index c7913ad05..63f29168f 100644 --- a/js/search/search_form_criteria_enum.js +++ b/js/search/search_form_criteria_enum.js @@ -924,7 +924,7 @@ $(function() { var sEscapedLabel = sLabel; // Note: We don't escape this anymore as there is an issue with AttributeExternalKey being already escaped. This will be put back in iTop 2.7 with the AttributeDefinition::GetAllowedValues() refactoring. $('
').text(sLabel).html(); if (bObsolete == 1) { - sEscapedLabel = ''+sEscapedLabel; + sEscapedLabel = ''+sEscapedLabel; } if (sAdditionalField != undefined ) { diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index 4bbbf8060..643e3199e 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -310,7 +310,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory if ($sAttCode == '_key_') { if ($bViewLink) { if (MetaModel::IsValidAttCode($sClassName, 'obsolescence_flag')) { - $sDisplayFunction = "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;"; + $sDisplayFunction = "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;"; } else { $sDisplayFunction = "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; return displayField;"; } @@ -548,7 +548,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory 'attribute_code' => $sAttCode, 'attribute_type' => '_key_', 'attribute_label' => $aData['alias'], - "render" => "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;", + "render" => "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;", ]; } } else { @@ -675,7 +675,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory ]; $aColumnDefinition["data"] = $sClassAlias."/".$sAttCode; $aColumnDefinition["render"] = [ - "display" => "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;", + "display" => "let displayField = ''+row['".$sClassAlias."/friendlyname']+''; if (row['".$sClassAlias."/obsolescence_flag'].indexOf('no') == -1){displayField = ''+row['".$sClassAlias."/friendlyname']+'';} return displayField;", "_" => $sClassAlias."/".$sAttCode, ]; } else {