diff --git a/flexiapi/public/css/style.css b/flexiapi/public/css/style.css index 5755601..7a1dd51 100644 --- a/flexiapi/public/css/style.css +++ b/flexiapi/public/css/style.css @@ -1089,10 +1089,14 @@ span.line::before { background-image: linear-gradient(to right, var(--grey-3), transparent, var(--grey-3)); } +*:has(+i.tooltip) { + display: inline-block; +} + i.tooltip { - vertical-align: middle; + vertical-align: center; font-size: 2rem; - line-height: 3rem; + margin-left: 1rem; } i.tooltip:hover { diff --git a/flexiapi/resources/views/account/call_forwardings/edit.blade.php b/flexiapi/resources/views/account/call_forwardings/edit.blade.php index ec5da08..d116acd 100644 --- a/flexiapi/resources/views/account/call_forwardings/edit.blade.php +++ b/flexiapi/resources/views/account/call_forwardings/edit.blade.php @@ -43,14 +43,18 @@
-

{{ __('All the calls') }}

+
{{ __('Priority rule') }} enabled) checked @endif name="always[enabled]" - onchange="if (this.checked) { setCheckboxValue('always[enabled]', false); document.querySelector('#always_dialog').showModal(); }"> + onchange="if (this.checked + && (document.querySelector('#away\\[enabled\\]').checked || document.querySelector('#busy\\[enabled\\]').checked)) { + setCheckboxValue('always[enabled]', false); + document.querySelector('#always_dialog').showModal(); + }">
@@ -61,13 +65,17 @@
-

@if ($account->admin){{ __('No answer') }}@else{{ __('If no one is answering') }}@endif

+
enabled) checked @endif name="away[enabled]" - onchange="if (this.checked) { setCheckboxValue('away[enabled]', false); document.querySelector('#away_dialog').showModal(); }"> + onchange="if (this.checked + && document.querySelector('#always\\[enabled\\]').checked) { + setCheckboxValue('away[enabled]', false); + document.querySelector('#away_dialog').showModal(); + }">
@@ -76,13 +84,17 @@
-

@if ($account->admin){{ __('Busy line') }}@else{{ __('If the line is busy') }}@endif

+
enabled) checked @endif name="busy[enabled]" - onchange="if (this.checked) { setCheckboxValue('busy[enabled]', false); document.querySelector('#busy_dialog').showModal(); }"> + onchange="if (this.checked + && document.querySelector('#always\\[enabled\\]').checked) { + setCheckboxValue('busy[enabled]', false); + document.querySelector('#busy_dialog').showModal(); + }">
diff --git a/flexiapi/resources/views/admin/account/telephony/show.blade.php b/flexiapi/resources/views/admin/account/telephony/show.blade.php index 05a7bb5..df5c8b4 100644 --- a/flexiapi/resources/views/admin/account/telephony/show.blade.php +++ b/flexiapi/resources/views/admin/account/telephony/show.blade.php @@ -11,7 +11,7 @@ @include('admin.account.parts.tabs')
-
+
@include('account.call_forwardings.edit', ['account' => $account])