From e190d19dc1ddbfbde0791966634fdff7b38a2634 Mon Sep 17 00:00:00 2001 From: Athozus Date: Sun, 26 Feb 2023 01:54:34 +0100 Subject: [PATCH] Show date time (#27) * Show date in message reading * Fix wrong registered dates Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com> * Rework header layout to add better space for date --------- Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com> Co-authored-by: AirSThib <75171564+AirSThib@users.noreply.github.com> --- gui.lua | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gui.lua b/gui.lua index 5e32c68..2c1a0bf 100644 --- a/gui.lua +++ b/gui.lua @@ -257,12 +257,19 @@ function mail.show_message(name, msgnumber) local message = messages[msgnumber] local formspec = [[ size[8,9] - button[7.25,0;0.75,0.5;back;X] - label[0,0;From: %s] - label[0,0.4;To: %s] - label[0,0.8;CC: %s] - label[0,1.3;Subject: %s] - textarea[0.25,1.8;8,7.8;;;%s] + + box[0,0;7,1.9;#466432] + + button[7.25,0.15;0.75,0.5;back;X] + + label[0.2,0.1;From: %s] + label[0.2,0.5;To: %s] + label[0.2,0.9;CC: %s] + label[0.2,1.3;Date: %s] + + label[0,2.1;Subject: %s] + textarea[0.25,2.6;8,7.0;;;%s] + button[0,8.5;2,1;reply;Reply] button[2,8.5;2,1;replyall;Reply All] button[4,8.5;2,1;forward;Forward] @@ -272,9 +279,11 @@ function mail.show_message(name, msgnumber) local from = minetest.formspec_escape(message.sender) or "" local to = minetest.formspec_escape(message.to) or "" local cc = minetest.formspec_escape(message.cc) or "" + local date = type(message.time) == "number" + and minetest.formspec_escape(os.date("%Y-%m-%d %X", message.time)) or "" local subject = minetest.formspec_escape(message.subject) or "" local body = minetest.formspec_escape(message.body) or "" - formspec = string.format(formspec, from, to, cc, subject, body) + formspec = string.format(formspec, from, to, cc, date, subject, body) if message.unread then message.unread = false