From 751257ee422289354b49da4bf2ff0acbd95953da Mon Sep 17 00:00:00 2001 From: echicken <echicken@bbs.electronicchicken.com> Date: Thu, 8 Oct 2020 00:19:20 -0400 Subject: [PATCH] No functional change. --- webv4/pages/000-mail.xjs | 73 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/webv4/pages/000-mail.xjs b/webv4/pages/000-mail.xjs index 7c1b9aada3..a4c71fec2a 100644 --- a/webv4/pages/000-mail.xjs +++ b/webv4/pages/000-mail.xjs @@ -11,33 +11,33 @@ } ?> -<?xjs function writeMessage(header) { ?> - <li id="li-<?xjs write(header.number); ?>" class="list-group-item mail striped <?xjs write(header.attr&MSG_READ ? 'read' : 'unread'); ?>"> +<? function writeMessage(header) { ?> + <li id="li-<? write(header.number); ?>" class="list-group-item mail striped <? write(header.attr&MSG_READ ? 'read' : 'unread'); ?>"> <div class="row"> <div class="col-sm-1"> <div class="checkbox"> <label class="checkbox-inline"> - <input id="check-<?xjs write(header.number); ?>" type="checkbox" class="mail-select"> + <input id="check-<? write(header.number); ?>" type="checkbox" class="mail-select"> </label> </div> </div> - <div class="col-sm-11" style="cursor:pointer;" onclick="getMailBody(<?xjs write(header.number); ?>)"> - <?xjs write(_mail_tab == 'sent' ? locale.strings.page_mail.label_message_to : locale.strings.page_mail.label_message_from); ?>: - <strong><?xjs write(_mail_tab == 'sent' ? header.to : header.from); ?></strong> - <?xjs if (header.from_net_type != NET_NONE) { ?> - <<?xjs write(_mail_tab == 'sent' ? (header.to + '@' + header.to_net_addr) : (header.from + '@' + header.from_net_addr)); ?>> - <?xjs } ?> - <?xjs write(locale.strings.page_mail.label_message_date); ?> - <?xjs write((new Date(header.when_written_time * 1000)).toLocaleString()); ?> + <div class="col-sm-11" style="cursor:pointer;" onclick="getMailBody(<? write(header.number); ?>)"> + <? write(_mail_tab == 'sent' ? locale.strings.page_mail.label_message_to : locale.strings.page_mail.label_message_from); ?>: + <strong><? write(_mail_tab == 'sent' ? header.to : header.from); ?></strong> + <? if (header.from_net_type != NET_NONE) { ?> + <<? write(_mail_tab == 'sent' ? (header.to + '@' + header.to_net_addr) : (header.from + '@' + header.from_net_addr)); ?>> + <? } ?> + <? write(locale.strings.page_mail.label_message_date); ?> + <? write((new Date(header.when_written_time * 1000)).toLocaleString()); ?> <p> - <?xjs write(locale.strings.page_mail.label_message_subject); ?>: - <strong><?xjs write(header.subject); ?></strong> + <? write(locale.strings.page_mail.label_message_subject); ?>: + <strong><? write(header.subject); ?></strong> </p> </div> </div> - <div class="message" id="message-<?xjs write(header.number); ?>" hidden></div> + <div class="message" id="message-<? write(header.number); ?>" hidden></div> </li> -<?xjs } ?> +<? } ?> <?xjs function _read_unread(tab) { @@ -47,8 +47,7 @@ } else { write(_mail[tab].unread); } - write('/' + _mail[tab].read); - write(')'); + write('/' + _mail[tab].read + ')'); } ?> @@ -74,51 +73,51 @@ </script> -<?xjs if (typeof http_request.query.notice != "undefined") { ?> +<? if (typeof http_request.query.notice != "undefined") { ?> <div id="noticebox" class="alert alert-warning"> - <?xjs write(http_request.query.notice[0]); ?> + <? write(http_request.query.notice[0]); ?> </div> <script type="text/javascript"> $("#noticebox").fadeOut(3000, function () { $("#noticebox").remove(); }); </script> -<?xjs } ?> +<? } ?> -<?xjs if (!(user.security.restrictions&UFLAG_E) && !(user.security.restrictions&UFLAG_M)) { ?> - <button class="btn btn-default icon" aria-label="<?xjs write(locale.strings.page_mail.button_post_new); ?>" title="<?xjs write(locale.strings.page_mail.button_post_new); ?>" onclick="addNew('mail')"> +<? if (!(user.security.restrictions&UFLAG_E) && !(user.security.restrictions&UFLAG_M)) { ?> + <button class="btn btn-default icon" aria-label="<? write(locale.strings.page_mail.button_post_new); ?>" title="<? write(locale.strings.page_mail.button_post_new); ?>" onclick="addNew('mail')"> <span class="glyphicon glyphicon-pencil"></span> </button> - <button class="btn btn-default icon" aria-label="<?xjs write(locale.strings.page_mail.button_select_all); ?>" title="<?xjs write(locale.strings.page_mail.button_select_all); ?>" onclick="selectAllMail()"> + <button class="btn btn-default icon" aria-label="<? write(locale.strings.page_mail.button_select_all); ?>" title="<? write(locale.strings.page_mail.button_select_all); ?>" onclick="selectAllMail()"> <span class="glyphicon glyphicon-check"></span> </button> - <button class="btn btn-default icon" aria-label="<?xjs write(locale.strings.page_mail.button_delete_selected); ?>" title="<?xjs write(locale.strings.page_mail.button_delete_selected); ?>" onclick="deleteSelectedMail()"> + <button class="btn btn-default icon" aria-label="<? write(locale.strings.page_mail.button_delete_selected); ?>" title="<? write(locale.strings.page_mail.button_delete_selected); ?>" onclick="deleteSelectedMail()"> <span class="glyphicon glyphicon-trash"></span> </button> -<?xjs } ?> +<? } ?> <ul class="nav nav-tabs"> - <li role="presentation" class="<?xjs write(_active_tab('inbox')); ?>"> - <a href="./?page=<?xjs write(page); ?>&tab=inbox"> - <?xjs write(locale.strings.page_mail.label_tab_inbox); ?> - <?xjs _read_unread('inbox'); ?> + <li role="presentation" class="<? write(_active_tab('inbox')); ?>"> + <a href="./?page=<? write(page); ?>&tab=inbox"> + <? write(locale.strings.page_mail.label_tab_inbox); ?> + <? _read_unread('inbox'); ?> </a> </li> - <li role="presentation" class="<?xjs write(_active_tab('spam')); ?>"> - <a href="./?page=<?xjs write(page); ?>&tab=spam"> + <li role="presentation" class="<? write(_active_tab('spam')); ?>"> + <a href="./?page=<? write(page); ?>&tab=spam"> Spam - <?xjs _read_unread('spam'); ?> + <? _read_unread('spam'); ?> </a> </li> - <li role="presentation" class="<?xjs write(_active_tab('sent')); ?>"> - <a href="./?page=<?xjs write(page); ?>&tab=sent"> - <?xjs write(locale.strings.page_mail.label_tab_sent); ?> - <?xjs _read_unread('sent'); ?> + <li role="presentation" class="<? write(_active_tab('sent')); ?>"> + <a href="./?page=<? write(page); ?>&tab=sent"> + <? write(locale.strings.page_mail.label_tab_sent); ?> + <? _read_unread('sent'); ?> </a> </li> </ul> <br> <ul id="forum-list-container" class="list-group"> - <?xjs _mail.headers.forEach(writeMessage); ?> + <? _mail.headers.forEach(writeMessage); ?> </ul> -- GitLab