diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index e8c42601d..5d49e1189 100644 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -478,11 +478,13 @@ $(document).ready(function() { $('.no-htl-access-option').on('click', function() { $(this).prop('selected', false); }); - initTooltip(); + + initUITooltip(); + }); //end dom ready -function initTooltip($target, contentFn, items) { - var $elements = $target || $('.tooltip-trigger'); +function initUITooltip($target, contentFn, items) { + var $elements = $target || $('.ui-tooltip-trigger'); if (!$elements.length) { return; } @@ -491,11 +493,11 @@ function initTooltip($target, contentFn, items) { if (!contentFn && $this.data('ui-tooltip')) { return; } - $this.tooltip({ + $this.uiTooltip({ content: contentFn || $this.next('.tooltip-content').html(), items: items || 'span', trigger: 'hover', - tooltipClass: 'tooltip-popup', + tooltipClass: 'ui-tooltip-popup', open: function (event, ui) { if (event.buttons == 1 || event.buttons == 3) { ui.tooltip.remove(); diff --git a/admin-dev/themes/default/sass/partials/_tooltip.sass b/admin-dev/themes/default/sass/partials/_tooltip.sass index d1f445386..f3ef5f4b2 100644 --- a/admin-dev/themes/default/sass/partials/_tooltip.sass +++ b/admin-dev/themes/default/sass/partials/_tooltip.sass @@ -1,57 +1,44 @@ -.tooltip_cont - width: 100% - font-size: 14px - font-weight: 600 - .tip_header - margin-bottom: 10px - .tip-body > div - margin-bottom: 6px - margin-right: 10px - -.tip_element_head - font-size: 12px - -.tip_element_value - font-size: 14px - font-weight: 400 - opacity: 0.8 - -.tip-body - display: grid - grid-template-columns: auto auto - &.tip-body-grid - grid-template-columns: 1fr 1fr - gap: 8px 16px - -.ui-tooltip, -.ui-tooltip.ui-widget-content +.ui-tooltip.ui-tooltip-popup border: none padding: 10px box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15) width: auto -.tooltip-trigger +.ui-tooltip-trigger cursor: pointer display: inline-block vertical-align: middle +.ui-tooltip-content + width: 100% +.ui-tooltip-wrapper + width: 100% + font-size: 14px + font-weight: 600 -.ui-tooltip.tooltip-popup - ul - margin: 0 - padding: 0 0 0 16px - list-style: disc - li - padding: 2px 0 +.ui-tooltip-header + margin-bottom: 5px -.tooltip-popup-row - display: flex - justify-content: space-between - align-items: center - gap: 12px - margin: 3px 0 - white-space: nowrap - label - font-weight: 600 - margin: 0 +.ui-tooltip-body + + > div + margin-bottom: 6px + margin-right: 10px + &.ui-tooltip-body-grid + display: grid + grid-template-columns: auto auto + grid-template-columns: 1fr 1fr + gap: 8px 2px + +.ui-tooltip-elem-head + font-size: 12px + +.ui-tooltip-elem-txt + font-size: 13px + font-weight: 400 + opacity: 0.8 + +.ui-tooltip-label + font-weight: 600 + margin: 0 diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl index 8a41e9221..940a17f8e 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl @@ -220,39 +220,37 @@ {/if} - {if $hotels.unselected|@count + $hotels.selected|@count > 1} -
- -
-|
- {l s='Unselected hotels'} - - {l s='Add'} - |
-
- {l s='Selected hotels'} - - {l s='Remove'} - |
-
+ +
+|
+ {l s='Unselected Properties'} + + {l s='Add'} + |
+
+ {l s='Selected Properties'} + + {l s='Remove'} + |
+
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl index 469679641..eca4b71f3 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl @@ -24,17 +24,17 @@ {$hotel_names_first|escape:'html':'UTF-8'} {if $hotel_names_remaining} {capture name='hotel_names_tooltip'} -
{convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->id}/{l s='day'}
| {l s='Duration'} | -{l s='Rooms'} | +{l s='Duration'} | +{l s='Rooms'} |
|---|---|---|---|
| {$stay_period.from} – {$stay_period.to} | -{$stay_period.count} | +{$stay_period.from} – {$stay_period.to} | +{$stay_period.count} |