mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

messaging MDL-22320 switched messaging over to using an overlay rather than a popup to notify the user of new messages

Browse Source
This commit is contained in:
Andrew Davis 2010-06-29 07:02:28 +00:00
parent efba7034b2
commit 9bd0affb30
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/moodlelib.php
View File

@ -8903,7 +8903,7 @@ function moodle_request_shutdown() {
* JavaScript required to pop up the messaging window.
*/
function message_popup_window() {
global $USER, $DB, $PAGE, $CFG;
global $USER, $DB, $PAGE, $CFG, $SITE;
if (defined('MESSAGE_WINDOW') || empty($CFG->messaging)) {
return;
@ -8926,10 +8926,23 @@ function message_popup_window() {
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id
WHERE m.useridto = :userid AND m.timecreated > :ts AND p.name='popup'";
if ($DB->count_records_sql($sql, array('userid'=>$USER->id, 'ts'=>$USER->message_lastpopup))) {
$count = $DB->count_records_sql($sql, array('userid'=>$USER->id, 'ts'=>$USER->message_lastpopup));
if ($count) {
$jsobj = array('url'=>'/message/index.php?ts='.$USER->message_lastpopup, 'name'=>'message', 'options'=>'menubar=0,location=0,scrollbars,status,resizable,width=400', 'fullscreen'=>0);
$PAGE->requires->js_function_call('openpopup', array(null, $jsobj));
$strmessages = get_string('unreadmessages', 'message', $count);
$strgomessage = get_string('gotomessages', 'message');
$strstaymessage = get_string('ignore','admin');
$content = html_writer::start_tag('div', array('id'=>'newmessageoverlay')).
html_writer::start_tag('div', array('id'=>'newmessagemessage')).
$strmessages.
html_writer::end_tag('div').
html_writer::tag('button', $strgomessage, array('id'=>'buttonreadmessage')).' '.
html_writer::tag('button', $strstaymessage, array('id'=>'buttondontreadmessage')).
html_writer::end_tag('div');
$url = $CFG->wwwroot.'/message/contacts_messages.php';
$PAGE->requires->js_init_call('M.core_message.init_notification', array('', $content, $url));
$USER->message_lastpopup = time();
}

2
theme/standard/style/message.css
View File

@ -50,3 +50,5 @@ table.message .searchresults td {padding:5px;}
.messagesearchresults {margin-bottom:40px;}
.messagesearchresults td {padding:0px 10px 0px 20px;}
.messagesearchresults td span {white-space:nowrap;}
#newmessageoverlay {background-color:LightGrey;padding:20px;}