Tuned up the CSS on more banner buttons

[citadel.git] / webcit-ng / static / js / view_mail.js

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 6d6fbcf45f1a8103f7c24b12e5a9546452f39139..4b2470021b121ec1345b4e1ae60203d901e49a69 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -216,8 +216,8 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                          "</div>";                                             // end header
                }
 
-               // Display attachments, if any are present
-               if (msg.part) {
+               // Display attachments, if any are present (don't do this if we're quoting the message)
+               if ( (msg.part) && (include_controls) ) {
                        let display_attachments = 0;
                        for (let r=0; r<msg.part.length; ++r) {
                                if (msg.part[r].disp == "attachment") {
@@ -337,12 +337,12 @@ function mail_render_row(msg, is_selected) {
 // RENDERER FOR THIS VIEW
 function view_render_mail() {
        // Put the "enter new message" button into the topbar
-       document.getElementById("ctdl-newmsg-button").innerHTML = "<i class=\"fa fa-edit\"></i>" + _("Write mail");
+       document.getElementById("ctdl-newmsg-button").innerHTML = `<i class="fa fa-edit"></i>&nbsp;` + _("Write mail");
        document.getElementById("ctdl-newmsg-button").style.display = "block";
 
        // Put the "delete message(s)" button into the topbar
        let d = document.getElementById("ctdl-delete-button");
-       d.innerHTML = "<i class=\"fa fa-trash\"></i>" + _("Delete");
+       d.innerHTML = `<i class="fa fa-trash"></i>&nbsp;` + _("Delete");
        d.style.display = "block";
        //d.addEventListener("click", mail_delete_selected);
 
@@ -562,8 +562,10 @@ function mail_compose(references, quoted_msgnum, m_to, m_cc, m_subject) {
        if (is_quoted) {
                mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
        }
+
+       // If this is a forwarded messages, preload its attachments into the forwarded copy.
        if (is_fwd) {
-               console.log("FIXME we have to load the attachments from message " + quoted_msgnum);
+               forward_attachments(quoted_msgnum);
        }
 
        if (is_reply) {