Skip to content

Commit

Permalink
Merge pull request #2067 from LiveHelperChat/master-433
Browse files Browse the repository at this point in the history
4.33v
  • Loading branch information
remdex committed Mar 18, 2024
2 parents 3172229 + 0738ae4 commit 718db25
Show file tree
Hide file tree
Showing 43 changed files with 406 additions and 121 deletions.
31 changes: 29 additions & 2 deletions lhc_web/design/defaulttheme/css/app.css
Expand Up @@ -855,12 +855,13 @@ div.message-row.message-admin div.msg-body{
.blockquote {
font-size:12px;
background: #f7f7f7;
border-radius: 15px;
border-radius:5px;
font-style: italic;
margin:4px;
color:#000;
box-shadow: 1px 1px 5px -1px rgba(0,0,0,0.75);
border:1px solid #c3c3c3;
padding:10px 10px 10px 20px;
scrollbar-width: thin;
}

.blockquote:before {
Expand All @@ -870,6 +871,32 @@ div.message-row.message-admin div.msg-body{
color: grey;
}

code {
background: #f7f7f7;
padding:3px;
border-radius: 5px;
color:#000;
border:1px solid #c3c3c3
}

.blockquote-code > code{
padding: 0px;
margin: 0px;
color:#000;
border:0;
background:none;
}

.blockquote-code{
padding: 5px;
padding-top:0;
}

.blockquote-code:before{
content:'';
margin-left:0;
}

.btn-block-department label{
font-size:13px;
padding:3px 2px 2px 3px;
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

32 changes: 30 additions & 2 deletions lhc_web/design/defaulttheme/css/widgetv2/widget.css
Expand Up @@ -772,12 +772,13 @@ div.show-msg-ts-below > div.message-row:last-child .msg-date
.blockquote {
font-size:12px;
background: #f7f7f7;
border-radius: 15px;
border-radius:5px;
font-style: italic;
margin:4px;
color:#000;
box-shadow: 1px 1px 5px -1px rgba(0,0,0,0.75);
border:1px solid #c3c3c3;
padding:10px 10px 10px 20px;
scrollbar-width: thin;
}

.blockquote:before {
Expand All @@ -787,6 +788,33 @@ div.show-msg-ts-below > div.message-row:last-child .msg-date
color: grey;
}

code {
background: #f7f7f7;
padding:3px;
border-radius: 5px;
color:#000;
border:1px solid #c3c3c3;
}

.blockquote-code > code{
padding: 0px;
margin: 0px;
color:#000;
border:0;
background:none;
line-height: 120%;
}

.blockquote-code{
padding: 5px;
padding-top:0;
}

.blockquote-code:before{
content:'';
margin-left:0;
}

.operator-info{
background-color:#FFF;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion lhc_web/design/defaulttheme/js/svelte/public/build/main.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lhc_web/design/defaulttheme/js/svelte/src/LHC.svelte
Expand Up @@ -694,7 +694,7 @@
lhinst.forgetChat(chatOpen,'gachat_id');
});
ee.emitEvent('eventLoadInitialData', [data]);
ee.emitEvent('eventLoadInitialData', [data, $lhcList, lhcServices]);
window['$_LHC_API']['initial_data'] = data;
Expand Down Expand Up @@ -1258,7 +1258,7 @@
lhcLogic.lastd_activity = 0;
ee.emitEvent('eventGetSyncFilterSvelte', [lhcList]);
ee.emitEvent('eventGetSyncFilterSvelte', [$lhcList]);
filter += $lhcList.custom_extension_filter;
Expand Down Expand Up @@ -1372,7 +1372,7 @@
$lhcList.lhcConnectivityProblem = false;
}
ee.emitEvent('eventLoadChatListSvelte', [data, lhcList]);
ee.emitEvent('eventLoadChatListSvelte', [data, $lhcList, lhcLogic]);
if (typeof data.items_processed == 'undefined') {
Expand Down
23 changes: 21 additions & 2 deletions lhc_web/design/defaulttheme/js/svelte/src/Widgets/LHCWidget.svelte
Expand Up @@ -10,6 +10,16 @@
export let type = "pending_chats";
export let no_collapse = false;
export let no_expand = false;
export let show_username_title = false;
export let hide_third_column = false;
export let hide_op_avatar = false;
export let hide_ac_stats = false;
export let hide_ac_op_icon = false;
export let custom_visitor_title = null;
export let mh_widget = null;
export let custom_visitor_icon = null;
export let show_visitor_title = false;
export let list_identifier = "pending";
export let no_panel_id = false;
export let custom_settings_url_icon = null;
Expand All @@ -19,9 +29,15 @@
export let status_key = "chat_status_ids";
export let hide_header = false
export let hide_filter_options = false
export let show_department_title = false
export let show_subject_title = false
export let default_expand = false;
export let show_username_always = false;
export let show_always_subject = false;
export let right_panel_mode = false;
export let no_additional_column = false;
export let override_item_open = null;
export let no_chat_preview = false;
export let default_sort = 'id_asc';
export let www_dir_flags = null;
export let base_url = "chat/list";
Expand Down Expand Up @@ -82,7 +98,10 @@
<a class="material-icons" target="_blank" href={WWW_DIR_JAVASCRIPT + 'statistic/departmentstatusxls'} title={$t("widget.download_xls")}>file_download</a>
{/if}

{#if !no_expand}
<a title={$t("widget.collapse_expand")} on:click={(e) => lhcServices.toggleWidget(lhcList,expand_identifier)} class="fs24 float-end material-icons exp-cntr">{$lhcList.toggleWidgetData[expand_identifier] == false ? 'expand_less' : 'expand_more'}</a>
{/if}

{#if !no_duration && $lhcList[type].tt}
<span title={$t("widget.taken_time")} class="d-none d-xl-inline badge me-1 float-end bg-light text-muted p-1 fs11 fw-light border">
{$lhcList[type].tt} s.
Expand All @@ -109,8 +128,8 @@
{#if type == 'onlineusers'}
<LHCOnlineVisitors {...$$props}></LHCOnlineVisitors>
{:else}
<div class="panel-list" id={no_panel_id === false ? panel_list_identifier : null} style:max-height={$lhcList[_optionsPanel['panelid'] + '_m_h'] ?? '330px'}>
<WidgetBodyPending no_additional_column={no_additional_column} additional_sort={additional_sort} column_1_width={column_1_width} column_3_width={column_3_width} column_2_width={column_2_width} permissions={_permissions} www_dir_flags={www_dir_flags} panel_id={_optionsPanel['panelid']} lhcList={lhcList} type={type} sort_identifier={sort_identifier} />
<div class="panel-list" id={no_panel_id === false ? panel_list_identifier : null} style:max-height={mh_widget ? mh_widget : ($lhcList[_optionsPanel['panelid'] + '_m_h'] ?? '330px')}>
<WidgetBodyPending hide_ac_stats={hide_ac_stats} hide_ac_op_icon={hide_ac_op_icon} hide_op_avatar={hide_op_avatar} hide_third_column={hide_third_column} custom_visitor_icon={custom_visitor_icon} show_visitor_title={show_visitor_title} custom_visitor_title={custom_visitor_title} show_username_title={show_username_title} show_subject_title={show_subject_title} show_department_title={show_department_title} no_expand={no_expand} show_always_subject={show_always_subject} show_username_always={show_username_always} override_item_open={override_item_open} no_chat_preview={no_chat_preview} no_additional_column={no_additional_column} additional_sort={additional_sort} column_1_width={column_1_width} column_3_width={column_3_width} column_2_width={column_2_width} permissions={_permissions} www_dir_flags={www_dir_flags} custom_sort_icons={_optionsPanel['custom_sort_icons'] ? _optionsPanel['custom_sort_icons'] : []} custom_icons={_optionsPanel['custom_icons'] ? _optionsPanel['custom_icons'] : []} panel_id={_optionsPanel['panelid']} lhcList={lhcList} type={type} sort_identifier={sort_identifier} />
</div>
{/if}
{/if}
Expand Down

0 comments on commit 718db25

Please sign in to comment.