extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for videoconference alarm notification:

Browse Source 
- Send necessary info to the client via calendar notification
- Show dialog always on the top
This commit is contained in:
Hadi Nategh 2020-04-08 11:28:09 +02:00
parent 55c90c880c
commit bdd0eef739
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1164,7 +1164,10 @@ class calendar_boupdate extends calendar_bo
$notification->set_popupdata('calendar', $notification->set_popupdata('calendar',
array('egw_pr_notify' => 1, array('egw_pr_notify' => 1,
'type' => $m_type, 'type' => $m_type,
'videoconference' => $details['videoconference']) 'videoconference' => $details['videoconference'],
'account_id' => $userid,
'name' => $fullname
)
+ ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : [])); + ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : []));
} }
$notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n"); $notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n");

8
notifications/js/notificationajaxpopup.js
View File

@ -358,13 +358,13 @@
case EGW_PR_NOTIFY_HEIGH: case EGW_PR_NOTIFY_HEIGH:
if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300) if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300)
{ {
app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference']); app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference'],
notifymessages[id]['extra_data']['account_id'], notifymessages[id]['extra_data']['name']);
} }
else { else {
poped.push(id); this.toggle(true);
} }
poped.push(id);
this.toggle(true);
break; break;
case EGW_PR_NOTIFY_MEDIUM: case EGW_PR_NOTIFY_MEDIUM:
case EGW_PR_NOTIFY_LOW: case EGW_PR_NOTIFY_LOW:

1
pixelegg/css/pixelegg.css
View File

@ -1373,6 +1373,7 @@ span.ui-icon-search {
background: #CDCDCD; background: #CDCDCD;
} }
.ui-dialog { .ui-dialog {
z-index: 1000;
box-shadow: -2px 1px 9px 3px #B4B4B4; box-shadow: -2px 1px 9px 3px #B4B4B4;
} }
.ui-dialog .ui-dialog-buttonpane { .ui-dialog .ui-dialog-buttonpane {

1
pixelegg/less/jquery-ui.less
View File

@ -288,6 +288,7 @@ span.ui-icon-search {
background: @gray_20; background: @gray_20;
} }
.ui-dialog { .ui-dialog {
z-index: 1000;
box-shadow: -2px 1px 9px 3px @gray_30; box-shadow: -2px 1px 9px 3px @gray_30;
.ui-dialog-buttonpane { .ui-dialog-buttonpane {
padding-left: .8em; padding-left: .8em;