+ _("ReplyAll")
+ "</a></span>"
- + "<span class=\"ctdl-msg-button\">" // Forward FIXME
- + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Re: ${subject}');">`
+ + "<span class=\"ctdl-msg-button\">"
+ + `<a href="javascript:mail_compose(msg.wefw, ${msgnum}, [], [], 'Fwd: ${subject}');">`
+ "<i class=\"fa fa-mail-forward\"></i> "
+ _("Forward")
+ "</a></span>";
"</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") {
// 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> ` + _("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> ` + _("Delete");
d.style.display = "block";
//d.addEventListener("click", mail_delete_selected);
- document.getElementById("ctdl-main").innerHTML
- = "<div id=\"ctdl-mailbox-grid-container\" class=\"ctdl-mailbox-grid-container\">"
- + "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
- + "<div id=\"ctdl-mailbox-reading-pane\" class=\"ctdl-mailbox-reading-pane\"></div>"
- + "</div>"
- ;
+ document.getElementById("ctdl-main").innerHTML = `
+ <div id="ctdl-mailbox-grid-container" class="ctdl-mailbox-grid-container">
+ <div id="ctdl-mailbox-pane" class="ctdl-mailbox-pane"></div>
+ <div id="ctdl-mailbox-reading-pane" class="ctdl-mailbox-reading-pane"></div>
+ </div>
+ `;
- highest_mailnum = 0; // Keep track of highest message number to track newly arrived messages
+ highest_mailnum = 0; // Keep track of highest msg number to track newly arrived msgs
render_mailbox_display(newmail_notify.NO);
try { // if this was already set up, clear it so there aren't multiple
clearInterval(RefreshMailboxInterval);
}
// begin rendering the mailbox table
- box = "<table id=\"ctdl-onscreen-mailbox\" class=\"ctdl-mailbox-table\" width=100%><tr>"
- + "<th>" + _("Subject") + "</th>"
- + "<th>" + _("Sender") + "</th>"
- + "<th>" + _("Date") + "</th>"
- + "<th>#</th>"
- + "</tr>";
+ box = `
+ <table id="ctdl-onscreen-mailbox" class="ctdl-mailbox-table" width=100%><tr>
+ <th>${_("Subject")}</th>
+ <th>${ _("Sender")}</th>
+ <th>${_("Date")}</th>
+ <th>#</th>
+ </tr>
+ `;
for (let i=0; i<msgs.length; ++i) {
let m = parseInt(msgs[i].msgnum);
let is_reply = 0;
let is_quoted = (quoted_msgnum > 0) ? true : false ;
+ let is_fwd = (is_quoted && m_to.length==0 && m_cc.length==0) ;
// m_to will be an array of zero or more recipients for the To: field. Convert it to a string.
m_to_str = recipient_array_to_string(m_to);
;
// If this is a quoted reply, insert a div within which we will render the original message.
- if (is_quoted) {
- compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTED MESSAGE HERE</div></blockquote>";
+ if (is_quoted && is_fwd) {
+ compose_screen += "<br><br>" + _("--- forwarded message ---") + "<br><div id=\"" + quoted_div_name + "\">QUOTE</div>";
+ }
+ else if (is_quoted) {
+ compose_screen += "<br><br><blockquote><div id=\"" + quoted_div_name + "\">QUOTE</div></blockquote>";
}
// The button bar is a Grid element, and is also a Flexbox container.
// If this is a quoted reply, render the original message into the div we set up earlier.
if (is_quoted) {
- document.getElementById(quoted_div_name).innerHTML = quoted_msgnum;
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) {
+ forward_attachments(quoted_msgnum);
+ }
+
if (is_reply) {
setTimeout(() => { document.getElementById("ctdl-editor-body").focus(); }, 0);
}