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

web: separate spam button from read buttons and color red.

Browse Source
This commit is contained in:
Bill Thiede 2024-04-06 08:00:35 -07:00
parent 8abf9398e9
commit b0305b7411
3 changed files with 70 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/state.rs
View File

@ -42,7 +42,6 @@ pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
context: Context::None, context: Context::None,
query: "".to_string(), query: "".to_string(),
refreshing_state: RefreshingState::None, refreshing_state: RefreshingState::None,
ui_error: UIError::NoError,
tags: None, tags: None,
} }
} }
@ -450,7 +449,6 @@ pub struct Model {
pub query: String, pub query: String,
pub context: Context, pub context: Context,
pub refreshing_state: RefreshingState, pub refreshing_state: RefreshingState,
pub ui_error: UIError,
pub tags: Option<Vec<Tag>>, pub tags: Option<Vec<Tag>>,
} }

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

@ -255,35 +255,41 @@ fn search_toolbar(
.unwrap_or(0); .unwrap_or(0);
nav![ nav![
C!["level"], C!["level"],
IF!(show_bulk_edit =>
div![ div![
C!["level-left"], C!["level-left"],
IF!(show_bulk_edit => div![
span![ C!["level-item"],
// TODO(wathiede): add "Mark as spam" div![C!["buttons", "has-addons"],
C!["level-item", "buttons", "has-addons"],
button![ button![
C!["button"], C!["button","spam"],
attrs!{At::Title => "Mark as spam"}, attrs!{At::Title => "Mark as spam"},
span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]], span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
span!["Spam"], span!["Spam"],
ev(Ev::Click, |_| Msg::SelectionAddTag("Spam".to_string())) ev(Ev::Click, |_| Msg::SelectionAddTag("Spam".to_string()))
], ],
],
],
div![
C!["level-item"],
div![C!["buttons", "has-addons"],
button![ button![
C!["button"], C!["button","mark-read"],
attrs!{At::Title => "Mark as read"}, attrs!{At::Title => "Mark as read"},
span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]], span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
span!["Read"], span!["Read"],
ev(Ev::Click, |_| Msg::SelectionMarkAsRead) ev(Ev::Click, |_| Msg::SelectionMarkAsRead)
], ],
button![ button![
C!["button"], C!["button","mark-unread"],
attrs!{At::Title => "Mark as unread"}, attrs!{At::Title => "Mark as unread"},
span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]], span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
span!["Unread"], span!["Unread"],
ev(Ev::Click, |_| Msg::SelectionMarkAsUnread) ev(Ev::Click, |_| Msg::SelectionMarkAsUnread)
] ]
]
]
]), ]),
],
div![ div![
C!["level-right"], C!["level-right"],
nav![ nav![
@ -733,10 +739,14 @@ fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet<String>) -> No
C!["thread"], C!["thread"],
h3![C!["is-size-5"], subject], h3![C!["is-size-5"], subject],
span![C!["tags"], tags_chiclet(&tags, false)], span![C!["tags"], tags_chiclet(&tags, false)],
span![ div![
C!["level-item", "buttons", "has-addons"], C!["level"],
div![
C!["level-item"],
div![
C!["buttons", "has-addons"],
button![ button![
C!["button"], C!["button", "spam"],
attrs! {At::Title => "Spam"}, attrs! {At::Title => "Spam"},
span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]], span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
span!["Spam"], span!["Spam"],
@ -745,8 +755,14 @@ fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet<String>) -> No
"Spam".to_string() "Spam".to_string()
)), )),
], ],
],
],
div![
C!["level-item"],
div![
C!["buttons", "has-addons"],
button![ button![
C!["button"], C!["button", "mark-read"],
attrs! {At::Title => "Mark as read"}, attrs! {At::Title => "Mark as read"},
span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]], span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
span!["Read"], span!["Read"],
@ -756,7 +772,7 @@ fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet<String>) -> No
)), )),
], ],
button![ button![
C!["button"], C!["button", "mark-unread"],
attrs! {At::Title => "Mark as unread"}, attrs! {At::Title => "Mark as unread"},
span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]], span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
span!["Unread"], span!["Unread"],
@ -766,6 +782,8 @@ fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet<String>) -> No
)), )),
], ],
], ],
],
],
messages, messages,
/* TODO(wathiede): plumb in orignal id /* TODO(wathiede): plumb in orignal id
a![ a![

4
web/static/style.css
View File

@ -282,3 +282,7 @@ display: none;
.attachment .card-content { .attachment .card-content {
padding: 0.5rem 1.5rem; padding: 0.5rem 1.5rem;
} }
.button.spam {
color: #f00;
}