messaging MDL-22320 switched messaging over to using an overlay rathe…

…r than a popup to notify the user of new messages
anovikov · Jun 29, 2010 · 9bd0aff · 9bd0aff
1 parent efba703
commit 9bd0aff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -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))) {
-
-        $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));
+    $count = $DB->count_records_sql($sql, array('userid'=>$USER->id, 'ts'=>$USER->message_lastpopup));
+    if ($count) {
+
+        $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();
     }

diff --git a/theme/standard/style/message.css b/theme/standard/style/message.css
@@ -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;}