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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
#	datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
This commit is contained in:
Pierre Goiffon
2022-02-22 09:40:37 +01:00
parent f9e8bf88c8 815870fe6b
commit 9ce88699ca
51 changed files with 768 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/combodo-backoffice-darkmoon-theme/precompiled-themes/main.css
View File

File diff suppressed because one or more lines are too long

3
datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
View File

@@ -183,6 +183,9 @@ $ibo-tab-container--tabs-list--background-color: $ibo-color-grey-500;
$ibo-tab-container--tab-header--text-color--is-active: $ibo-color-blue-300;
$ibo-tab-container--tab-header--text-color--on-hover: $ibo-color-blue-200;
$ibo-tab-container--tab-header--background-color--on-hover: $ibo-color-grey-400;
$ibo-tab-container--extra-tab-toggler--text-color: $ibo-color-blue-100 !default;
$ibo-tab-container--extra-tab-toggler--text-color--on-hover: $ibo-color-blue-200 !default;
$ibo-tab-container--extra-tab-toggler--background-color--on-hover: $ibo-color-grey-500 !default;
$ibo-activity-panel--header--background-color: $ibo-color-grey-400;
$ibo-activity-panel--tab-toggler--is-active--background-color: $ibo-color-grey-200;
$ibo-activity-panel--tab-toolbar--background-color: $ibo-activity-panel--tab-toggler--is-active--background-color;

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

@@ -205,26 +205,27 @@
if( (item.description !== undefined) && (item.description !== '') )
{
iItemFlags += 2;
textWrapperElem.append( $('<div></div>').addClass('mosaic-item-description').html(item.description) );
}
aElem.append( textElem );
// - Adding CSS class to adjust the layout regarding which properties are available
aElem.addClass('mosaic-item-layout-'+iItemFlags);
textWrapperElem.append($('<div></div>').addClass('mosaic-item-description').html(item.description));
}
aElem.append(textElem);
// - Adding CSS class to adjust the layout regarding which properties are available
aElem.addClass('mosaic-item-layout-'+iItemFlags);
// - Appending element
$('div[data-level-id="'+nodeId+'"]').append(itemElem);
itemElem.append(aElem);
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== '') )
{
$('div[data-level-id="'+nodeId+'"]').append(itemElem);
itemElem.append(aElem);
// Building tooltip for the node
// N°4662 - Surround tooltip with div to ensure text retrival
if ((item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== ''))
{
aElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
CombodoTooltip.InitTooltipFromMarkup(aElem);
}
// Building actions for that node
switch(levelPrimaryAction.type)
{
case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}':
}
// Building actions for that node
switch (levelPrimaryAction.type)
{
case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}':
aElem.addClass('mosaic-drilldown');
break;
case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':

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

@@ -195,25 +195,26 @@
var levelPrimaryAction = levelActions[levelActionsKeys[0]];
var url = '';
var liElem = $('<li></li>').addClass('list-group-item');
var aElem = $('<span></span>').addClass('tree-item-wrapper').attr('data-item-id', item.id).attr('data-level-alias', item.level_alias);
var nameElem = $('<a></a>').addClass('tree-item').text(item.name);
// Building node
$('ul[data-level-id="'+nodeId+'"]').append(liElem);
aElem.append(nameElem);
liElem.append(aElem);
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== '') )
{
nameElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
var liElem = $('<li></li>').addClass('list-group-item');
var aElem = $('<span></span>').addClass('tree-item-wrapper').attr('data-item-id', item.id).attr('data-level-alias', item.level_alias);
var nameElem = $('<a></a>').addClass('tree-item').text(item.name);
// Building node
$('ul[data-level-id="'+nodeId+'"]').append(liElem);
aElem.append(nameElem);
liElem.append(aElem);
// Building tooltip for the node
// N°4662 - Surround tooltip with div to ensure text retrival
if ((item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== ''))
{
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 !== '') )
{
aElem.append( $('<span class="list-group-item-description">'+item.description+'</span>') );
}
}
// Building description for the node
if ((item.description !== undefined) && (item.description !== ''))
{
aElem.append($('<span class="list-group-item-description">'+item.description+'</span>'));
}
// Building actions for that node
switch(levelPrimaryAction.type)

6
datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
View File

File diff suppressed because one or more lines are too long

6
datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
View File

File diff suppressed because one or more lines are too long