holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update notification popup to fit theme better

Browse Source
This commit is contained in:
nathangray 2017-01-10 11:42:18 -07:00
parent 7e270dea76
commit ce58542f3d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -934,6 +934,10 @@ class calendar_boupdate extends calendar_bo
Api\Translation::init(); Api\Translation::init();
$lang = $part_prefs['common']['lang']; $lang = $part_prefs['common']['lang'];
} }
// Since we're running from cron, make sure notifications uses user's theme (for images)
$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
$event_arr = null; $event_arr = null;
$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event, $details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
$action, $event_arr, $disinvited); $action, $event_arr, $disinvited);

4
notifications/inc/hook_after_navbar.inc.php
View File

@ -25,11 +25,11 @@ if ($GLOBALS['egw_info']['user']['apps']['notifications'])
echo ' echo '
<div id="egwpopup" style="display: none; z-index: 999;"> <div id="egwpopup" style="display: none; z-index: 999;">
<div id="egwpopup_header">'.lang('Notification'). '<span style="float:right;">'. <div id="egwpopup_header">'.lang('Notification'). '<span style="float:right;">'.
Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button') . Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close') .
'</span></div> '</span></div>
<div id="egwpopup_message"></div> <div id="egwpopup_message"></div>
<div id="egwpopup_footer"> <div id="egwpopup_footer">
<input id="egwpopup_ok_button" type="button" value="'. lang('ok'). '"> <input id="egwpopup_ok_button" class="et2_button et2_button_text" type="button" value="'. lang('ok'). '">
</div> </div>
</div> </div>
'; ';