From 994631e872031bb1ec7e3410bff1f702291480e9 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Mon, 26 Feb 2024 11:24:09 -0800 Subject: [PATCH] web: display To/CC differently on expansion --- web/src/view/mod.rs | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/web/src/view/mod.rs b/web/src/view/mod.rs index 1ae881c..b125dcd 100644 --- a/web/src/view/mod.rs +++ b/web/src/view/mod.rs @@ -240,6 +240,7 @@ fn search_toolbar( C!["level-left"], IF!(show_bulk_edit => span![ + // TODO(wathiede): add "Mark as spam" C!["level-item", "buttons", "has-addons"], button![ C!["button"], @@ -424,11 +425,13 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node { small![from_detail], table![ IF!(!msg.to.is_empty() => - msg.to.iter().enumerate().map(|(i, to)| - tr![ - td![ if i==0 { "To" }else { "" } ], - td![ + tr![ + td![ "To" ], + //td![ if i==0 { "To" }else { "" } ], + td![ + msg.to.iter().enumerate().map(|(i, to)| small![ + if i>0 { ", " }else { "" }, match to { ShowThreadQueryThreadMessagesTo { name: Some(name), @@ -440,18 +443,20 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node { } => format!("{name}"), ShowThreadQueryThreadMessagesTo { addr: Some(addr), .. - } => format!("<{addr}>"), + } => format!("{addr}"), _ => String::from("UNKNOWN"), } - ] - ]])), + ]) + ] + ]), IF!(!msg.cc.is_empty() => - msg.cc.iter().enumerate().map(|(i, cc)| - tr![ - td![ if i==0 { "CC" }else { "" } ], - td![ + tr![ + td![ "CC" ], + td![ + msg.cc.iter().enumerate().map(|(i, cc)| small![ + if i>0 { ", " }else { "" }, match cc { ShowThreadQueryThreadMessagesCc { name: Some(name), @@ -467,8 +472,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node { _ => String::from("UNKNOWN"), } - ] - ]])), + ]) + ] + ]), tr![ td!["Date"], td![msg.timestamp.map(|ts| span![C!["header"], human_age(ts)])] @@ -657,6 +663,7 @@ fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet) -> No h3![C!["is-size-5"], &thread.subject], span![C!["tags"], tags_chiclet(&tags, false)], span![ + // TODO(wathiede): add "Mark as spam" C!["level-item", "buttons", "has-addons"], button![ C!["button"],