wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

web: show email address on hover of name in message view

Browse Source
This commit is contained in:
Bill Thiede 2024-12-08 18:03:20 -08:00
parent a6f0971f0f
commit 962b3542ce
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/src/view/mod.rs
View File

@ -440,6 +440,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
C!["px-4", "mr-auto"], C!["px-4", "mr-auto"],
span![ span![
C!["font-semibold", "text-sm"], C!["font-semibold", "text-sm"],
from_detail.as_ref().map(|addr| attrs! {
At::Title => addr
}),
&from, &from,
" ", " ",
from_detail.as_ref().map(|text| copy_text_widget(&text)) from_detail.as_ref().map(|text| copy_text_widget(&text))
@ -454,6 +457,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
msg.to.iter().map(|to| { msg.to.iter().map(|to| {
let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to; let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
span![ span![
addr.as_ref().map(|addr| attrs! {
At::Title => addr
}),
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)), name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ", " ",
addr.as_ref().map(|addr| copy_text_widget(&addr)), addr.as_ref().map(|addr| copy_text_widget(&addr)),
@ -472,6 +478,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
msg.cc.iter().map(|cc| { msg.cc.iter().map(|cc| {
let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc; let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
span![ span![
addr.as_ref().map(|addr| attrs! {
At::Title => addr
}),
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)), name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ", " ",
addr.as_ref().map(|addr| copy_text_widget(&addr)), addr.as_ref().map(|addr| copy_text_widget(&addr)),
@ -504,14 +513,15 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
} }
fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<Msg> { fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<Msg> {
let from: String = match &msg.from { let (from, from_detail) = match &msg.from {
Some(ShowThreadQueryThreadOnEmailThreadMessagesFrom { Some(ShowThreadQueryThreadOnEmailThreadMessagesFrom {
name: Some(name), .. name: Some(name),
}) => name.to_string(), addr,
}) => (name.to_string(), addr.clone()),
Some(ShowThreadQueryThreadOnEmailThreadMessagesFrom { Some(ShowThreadQueryThreadOnEmailThreadMessagesFrom {
addr: Some(addr), .. addr: Some(addr), ..
}) => addr.to_string(), }) => (addr.to_string(), None),
_ => String::from("UNKNOWN"), _ => (String::from("UNKNOWN"), None),
}; };
// TODO(wathiede): get this from server // TODO(wathiede): get this from server
let avatar: Option<String> = None; let avatar: Option<String> = None;
@ -525,7 +535,13 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
div![avatar], div![avatar],
div![ div![
C!["px-4", "mr-auto"], C!["px-4", "mr-auto"],
span![C!["font-semibold", "text-sm"], &from], span![
C!["font-semibold", "text-sm"],
from_detail.as_ref().map(|addr| attrs! {
At::Title => addr
}),
&from
],
" ", " ",
IF!(!msg.to.is_empty() => div![ IF!(!msg.to.is_empty() => div![
C!["text-xs"], C!["text-xs"],
@ -537,6 +553,9 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
msg.to.iter().enumerate().map(|(i, to)| { msg.to.iter().enumerate().map(|(i, to)| {
let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to; let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
span![ span![
addr.as_ref().map(|addr| attrs! {
At::Title => addr
}),
if i > 0 { ", " } else { "" }, if i > 0 { ", " } else { "" },
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)) name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
] ]
@ -550,11 +569,15 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
C!["font-semibold"], C!["font-semibold"],
"CC: " "CC: "
], ],
msg.cc.iter().map(|cc| { msg.cc.iter().enumerate().map(|(i,cc)| {
let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc; let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
span![ span![
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)) addr.as_ref().map(|addr| attrs! {
, " "] At::Title => addr
}),
if i > 0 { ", " } else { "" },
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
]
}) })
]) ])
], ],
@ -1076,6 +1099,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
//let avatar: Option<String> = Some(String::from("https://bulma.io/images/placeholders/64x64.png")); //let avatar: Option<String> = Some(String::from("https://bulma.io/images/placeholders/64x64.png"));
let id = post.thread_id.clone(); let id = post.thread_id.clone();
let is_unread = !post.is_read; let is_unread = !post.is_read;
// TODO: use https://www.google.com/s2/favicons?domain={domain}
let avatar = render_avatar(avatar, &from, true); let avatar = render_avatar(avatar, &from, true);
div![ div![
C!["flex", "p-4"], C!["flex", "p-4"],