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

N°4667 - Remove call to tooltip function

Browse Source
This commit is contained in:
acognet
2022-01-21 11:11:21 +01:00
parent d005ff0099
commit 910638d93f
15 changed files with 34 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
View File

@@ -81,7 +81,7 @@
// For the same reason, tooltip widget is created in "drawCallback" instead of here.
if( (data.tooltip !== undefined) && ($(data.tooltip).text() !== ''))
{
cellElem.html( $('<span></span>').attr('title', data.tooltip).attr('data-toggle', 'tooltip').html(data.name).prop('outerHTML') );
cellElem.html( $('<span></span>').attr('data-tooltip-content', data.tooltip).attr('data-tooltip-html-enabled', true).html(data.name).prop('outerHTML') );
}
else
{
@@ -267,9 +267,7 @@
"columns": getColumnsDefinition(),
"order": [],
"drawCallback": function(settings){
// Tooltip has to be created here, as the render callback only returns a string, not an object.
$(this).find('[data-toggle="tooltip"]').tooltip({container: 'body', html: true, trigger: 'hover', placement: 'right'}); // container option is necessary when in a table
// Hiding pagination if only one page
// Hiding pagination if only one page
if($(this).closest('.dataTables_wrapper').find('.dataTables_paginate:last .paginate_button:not(.previous):not(.next)').length < 2)
{
$(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').hide();

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

@@ -217,7 +217,8 @@
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($(item.tooltip).text() !== '') )
{
aElem.attr('title', item.tooltip).attr('data-toggle', 'tooltip').tooltip({html: true, trigger: 'hover', placement: 'top'});
aElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
CombodoTooltip.InitTooltipFromMarkup(aElem);
}
// Building actions for that node

3
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
View File

@@ -206,7 +206,8 @@
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($(item.tooltip).text() !== '') )
{
nameElem.attr('title', item.tooltip).attr('data-toggle', 'tooltip').tooltip({html: true, trigger: 'hover', placement: 'right'});
nameElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
CombodoTooltip.InitTooltipFromMarkup(nameElem);
}
// Building description for the node
if( (item.description !== undefined) && (item.description !== '') )

8
datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig
View File

@@ -33,8 +33,7 @@
id="btn_export_excel_for_{{ aAreaData.sId }}"
data-toggle="modal" data-target="#modal-for-all">
<span class="fas fa-download fa-lg" style="float: right;"
data-toggle="tooltip" data-delay="300" data-placement="left"
title="{{ 'ExcelExporter:ExportMenu'|dict_s }}"></span>
data-tooltip-html-enabled="true" data-tooltip-content="{{ 'ExcelExporter:ExportMenu'|dict_s }}"></span>
</a>
{% endif %}
</div>
@@ -358,11 +357,6 @@
});
{% endfor %}
// Enable tooltips
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
// Auto collapse item actions popup
$('body').on('click', function () {
$('table .item-action-wrapper.collapse.in').collapse('hide');

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-badge.html.twig
View File

@@ -9,7 +9,7 @@
class="tile tile_badge{# vertical-center#}"
id="brick-{{ oBrick.GetId }}"
data-brick-id="{{ oBrick.GetId }}"
{% if oBrick.GetDescription is not empty %} data-toggle="tooltip" data-original-title="{{ oBrick.GetDescription|dict_s|raw }}"{% endif %}
{% if oBrick.GetDescription is not empty %} data-tooltip-html-enabled="true" data-tooltip-content="{{ oBrick.GetDescription|dict_s|raw }}"{% endif %}
>
<div>
<div>

7
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/layout.html.twig
View File

@@ -10,9 +10,10 @@
<h2>
{% if form.title_clipboard_text is defined %}
<i class="url-to-clipboard url-to-clipboard-icon fas fa-link fa-xs"
data-clipboard-text="{{ form.title_clipboard_text }}"
data-toggle="tooltip"
title="{{ 'Brick:Portal:Object:Copy:Tooltip' | dict_s }}"
data-clipboard-text="{{ form.title_clipboard_text }}"
data-toggle="tooltip"
data-tooltip-content="{{ 'Brick:Portal:Object:Copy:Tooltip' | dict_s }}"
data-tooltip-html-enabled="true"
data-copied-title="{{ 'Brick:Portal:Object:Copy:CopiedTooltip' | dict_s }}"
data-copied-icon="fas fa-check">
</i>

5
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/modal.html.twig
View File

@@ -6,8 +6,9 @@
{% if form.title_clipboard_text is defined %}
<i class="url-to-clipboard url-to-clipboard-icon fas fa-link fa-xs"
data-clipboard-text="{{ form.title_clipboard_text }}"
data-toggle="tooltip"
title="{{ 'Brick:Portal:Object:Copy:Tooltip' | dict_s }}"
data-toggle="tooltip"
data-tooltip-content="{{ 'Brick:Portal:Object:Copy:Tooltip' | dict_s }}"
data-tooltip-html-enabled="true"
data-copied-title="{{ 'Brick:Portal:Object:Copy:CopiedTooltip' | dict_s }}"
data-copied-icon="fas fa-check">
</i>

5
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -159,11 +159,6 @@
<script type="text/javascript" src="{{ js_file|add_itop_version }}"></script>
{% endfor %}
{% endif %}
<script type="text/javascript">
$(document).ready(function() {
$('.tile.tile_badge[data-toggle="tooltip"]').tooltip({'html': true});
});
</script>
{% endblock %}
</head>
<body class="{% block pPageBodyClass %}{% endblock %}" data-gui-type="portal">