Clear any existing mailbox refresh when setting up a new one

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 56b949565af979ca9eb60ef82a7b59d659a938e3..8967e00e17023dc8e9ee93974cbc729c085786e2 100644 (file)
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -12,7 +12,7 @@ html,body,h1,h2,h3,h4,h5 {
        background-color: #456789;
 }
 
-.ctdl-msg-wrapper {
+.ctdl-fmsg-wrapper {           /* message wrapper for forum view */
        overflow: hidden;
        border-radius: 10px;
        background-color: white;
@@ -20,6 +20,14 @@ html,body,h1,h2,h3,h4,h5 {
        padding: 5px;           /* inside the box */
 }
 
+.ctdl-mmsg-wrapper {           /* message wrapper for mailbox view */
+       overflow: hidden;
+       /* border-radius: 10px; */
+       background-color: white;
+       /* margin: 1vw; */
+       padding: 5px;           /* inside the box */
+}
+
 .ctdl-msg-reply {
        margin-left: 5vw;
 }

diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 2611f18cabdae831bfc24bc504e915fa2b027424..aee3666d7217eeaf52776a4a2b554d6fac2121f3 100644 (file)
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -175,7 +175,7 @@ function forum_render_one(msg, existing_div) {
 
        try {
                outmsg =
-                 "<div class=\"ctdl-msg-wrapper\">"                            // begin message wrapper
+                 "<div class=\"ctdl-fmsg-wrapper\">"                           // begin message wrapper
                + "<div class=\"ctdl-avatar\" onClick=\"javascript:user_profile('" + msg.from + "');\">"
                + "<img src=\"/ctdl/u/" + msg.from + "/userpic\" width=\"32\" "
                + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
@@ -229,7 +229,7 @@ function forum_render_one(msg, existing_div) {
                ;
        }
        catch(err) {
-               outmsg = "<div class=\"ctdl-msg-wrapper\">" + err.message + "</div>";
+               outmsg = "<div class=\"ctdl-fmsg-wrapper\">" + err.message + "</div>";
        }
 
        div.innerHTML = outmsg;
@@ -284,7 +284,7 @@ function open_reply_box(parent_div, is_quoted, references, msgid) {
        document.getElementById(parent_div).append(new_div);
 
        replybox =
-         "<div class=\"ctdl-msg-wrapper ctdl-msg-reply\">"             // begin message wrapper
+         "<div class=\"ctdl-fmsg-wrapper ctdl-msg-reply\">"            // begin message wrapper
        + "<div class=\"ctdl-avatar\">"                                 // begin avatar
        + "<img src=\"/ctdl/u/" + current_user + "/userpic\" width=\"32\" "
        + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index f093ec0fb8765d2373a0dc3ef660314198b07cd8..01c184970209efd9af86aba344324f40fef75b3f 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -6,12 +6,16 @@
 // disclosure are subject to the GNU General Public License v3.
 
 
+var selected_message = 0;                                                      // Remember the last message that was selected
+var RefreshMailboxInterval;                                                    // We store our refresh timer here
+
+
 // Render a message into the mailbox view (FIXME make this different from the forum view)
 function mail_render_one(msg, target_div) {
        let div = "FIXME";
        try {
                outmsg =
-                 "<div class=\"ctdl-msg-wrapper\">"                            // begin message wrapper
+                 "<div class=\"ctdl-mmsg-wrapper\">"                           // begin message wrapper
                + "<div class=\"ctdl-avatar\" onClick=\"javascript:user_profile('" + msg.from + "');\">"
                + "<img src=\"/ctdl/u/" + msg.from + "/userpic\" width=\"32\" "
                + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
@@ -65,7 +69,7 @@ function mail_render_one(msg, target_div) {
                ;
        }
        catch(err) {
-               outmsg = "<div class=\"ctdl-msg-wrapper\">" + err.message + "</div>";
+               outmsg = "<div class=\"ctdl-fmsg-wrapper\">" + err.message + "</div>";
        }
 
        target_div.innerHTML = outmsg;
@@ -86,11 +90,6 @@ function mail_display_message(msgnum, target_div) {
 }
 
 
-// Remember the last message that was selected
-var selected_message = 0;
-var RefreshMailboxInterval;
-
-
 // A message has been selected...
 function select_message(msgnum) {
        // unhighlight any previously selected message
@@ -131,6 +130,11 @@ function mail_render_row(msg) {
 function mail_display() {
        document.getElementById("ctdl-main").innerHTML = "<div id=\"ctdl-mailbox-pane\">mailbox pane</div><div id=\"ctdl-reading-pane\">reading pane</div>";
        refresh_mail_display();
+       try {                                                   // if this was already set up, clear it so there aren't multiple
+               clearInterval(RefreshMailboxInterval);
+       }
+       catch {
+       }
        RefreshMailboxInterval = setInterval(refresh_mail_display, 10000);
 }