web/src/state.rs

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

web/src/view/desktop.rs

@@ -9,28 +9,20 @@ use crate::{
 
 #[topo::nested]
 pub(super) fn view(model: &Model) -> Node<Msg> {
-    let show_icon_text = true;
     // Do two queries, one without `unread` so it loads fast, then a second with unread.
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
         Context::ThreadResult {
             thread,
             open_messages,
-        } => view::thread(thread, open_messages, show_icon_text),
+        } => view::thread(thread, open_messages),
         Context::SearchResult {
             query,
             results,
             count,
             pager,
             selected_threads,
-        } => view_search_results(
+        } => view_search_results(&query, results.as_slice(), *count, pager, selected_threads),
-            &query,
-            results.as_slice(),
-            *count,
-            pager,
-            selected_threads,
-            show_icon_text,
-        ),
     };
     fn view_tag_li(display_name: &str, indent: usize, t: &Tag, search_unread: bool) -> Node<Msg> {
         let href = if search_unread {

web/src/view/mobile.rs

@@ -10,27 +10,19 @@ use crate::{
 };
 
 pub(super) fn view(model: &Model) -> Node<Msg> {
-    let show_icon_text = false;
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
         Context::ThreadResult {
             thread,
             open_messages,
-        } => view::thread(thread, open_messages, show_icon_text),
+        } => view::thread(thread, open_messages),
         Context::SearchResult {
             query,
             results,
             count,
             pager,
             selected_threads,
-        } => search_results(
+        } => search_results(&query, results.as_slice(), *count, pager, selected_threads),
-            &query,
-            results.as_slice(),
-            *count,
-            pager,
-            selected_threads,
-            show_icon_text,
-        ),
     };
     div![
         view_header(&model.query, &model.refreshing_state),
@@ -45,7 +37,6 @@ fn search_results(
     count: usize,
     pager: &FrontPageQuerySearchPageInfo,
     selected_threads: &HashSet<String>,
-    show_icon_text: bool,
 ) -> Node<Msg> {
     if query.is_empty() {
         set_title("all mail");
@@ -105,8 +96,8 @@ fn search_results(
     let show_bulk_edit = !selected_threads.is_empty();
     div![
         C!["search-results"],
-        search_toolbar(count, pager, show_bulk_edit, show_icon_text),
+        search_toolbar(count, pager, show_bulk_edit),
         div![C!["index"], rows],
-        search_toolbar(count, pager, show_bulk_edit, show_icon_text),
+        search_toolbar(count, pager, show_bulk_edit),
     ]
 }

web/src/view/mod.rs

@@ -116,7 +116,6 @@ fn view_search_results(
     count: usize,
     pager: &FrontPageQuerySearchPageInfo,
     selected_threads: &HashSet<String>,
-    show_icon_text: bool,
 ) -> Node<Msg> {
     if query.is_empty() {
         set_title("all mail");
@@ -204,7 +203,7 @@ fn view_search_results(
 
     div![
         C!["search-results"],
-        search_toolbar(count, pager, show_bulk_edit, show_icon_text),
+        search_toolbar(count, pager, show_bulk_edit),
         table![
             C![
                 "table",
@@ -240,7 +239,7 @@ fn view_search_results(
             ]],
             tbody![rows]
         ],
-        search_toolbar(count, pager, show_bulk_edit, show_icon_text)
+        search_toolbar(count, pager, show_bulk_edit)
     ]
 }
 
@@ -248,7 +247,6 @@ fn search_toolbar(
     count: usize,
     pager: &FrontPageQuerySearchPageInfo,
     show_bulk_edit: bool,
-    show_icon_text: bool,
 ) -> Node<Msg> {
     let start = pager
         .start_cursor
@@ -256,42 +254,36 @@ fn search_toolbar(
         .map(|i| i.parse().unwrap_or(0))
         .unwrap_or(0);
     nav![
-        C!["level", "is-mobile"],
+        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", "spam"],
+                    C!["button"],
-                        attrs!{At::Title => "Mark as spam"},
+                    attrs!{At::Title => "Mark as spam"},
                         span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
-                        IF!(show_icon_text=>span!["Spam"]),
+                        span!["Spam"],
                         ev(Ev::Click, |_| Msg::SelectionAddTag("Spam".to_string()))
-                    ],
-                    ],
                 ],
-                div![
+                button![
-                    C!["level-item"],
+                    C!["button"],
-                    div![C!["buttons", "has-addons"],
+                    attrs!{At::Title => "Mark as read"},
-                    button![
-                        C!["button", "mark-read"],
-                        attrs!{At::Title => "Mark as read"},
                         span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
-                        IF!(show_icon_text=>span!["Read"]),
+                        span!["Read"],
                         ev(Ev::Click, |_| Msg::SelectionMarkAsRead)
-                    ],
+                ],
-                    button![
+                button![
-                        C!["button", "mark-unread"],
+                    C!["button"],
-                        attrs!{At::Title => "Mark as unread"},
+                    attrs!{At::Title => "Mark as unread"},
                         span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
-                        IF!(show_icon_text=>span!["Unread"]),
+                        span!["Unread"],
                         ev(Ev::Click, |_| Msg::SelectionMarkAsUnread)
                     ]
-                ]
+            ]),
-                ]
+        ],
-        ]),
         div![
             C!["level-right"],
             nav![
@@ -712,11 +704,7 @@ fn message_render(msg: &ShowThreadQueryThreadMessages, open: bool) -> Node<Msg>
 }
 
 #[topo::nested]
-fn thread(
+fn thread(thread: &ShowThreadQueryThread, open_messages: &HashSet<String>) -> Node<Msg> {
-    thread: &ShowThreadQueryThread,
-    open_messages: &HashSet<String>,
-    show_icon_text: bool,
-) -> Node<Msg> {
     // TODO(wathiede): show per-message subject if it changes significantly from top-level subject
     let subject = if thread.subject.is_empty() {
         "(no subject)"
@@ -745,49 +733,37 @@ fn thread(
         C!["thread"],
         h3![C!["is-size-5"], subject],
         span![C!["tags"], tags_chiclet(&tags, false)],
-        div![
+        span![
-            C!["level", "is-mobile"],
+            C!["level-item", "buttons", "has-addons"],
-            div![
+            button![
-                C!["level-item"],
+                C!["button"],
-                div![
+                attrs! {At::Title => "Spam"},
-                    C!["buttons", "has-addons"],
+                span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
-                    button![
+                span!["Spam"],
-                        C!["button", "spam"],
+                ev(Ev::Click, move |_| Msg::AddTag(
-                        attrs! {At::Title => "Spam"},
+                    format!("thread:{spam_thread_id}"),
-                        span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
+                    "Spam".to_string()
-                        IF!(show_icon_text=>span!["Spam"]),
+                )),
-                        ev(Ev::Click, move |_| Msg::AddTag(
-                            format!("thread:{spam_thread_id}"),
-                            "Spam".to_string()
-                        )),
-                    ],
-                ],
             ],
-            div![
+            button![
-                C!["level-item"],
+                C!["button"],
-                div![
+                attrs! {At::Title => "Mark as read"},
-                    C!["buttons", "has-addons"],
+                span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
-                    button![
+                span!["Read"],
-                        C!["button", "mark-read"],
+                ev(Ev::Click, move |_| Msg::SetUnread(
-                        attrs! {At::Title => "Mark as read"},
+                    format!("thread:{read_thread_id}"),
-                        span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
+                    false
-                        IF!(show_icon_text=>span!["Read"]),
+                )),
-                        ev(Ev::Click, move |_| Msg::SetUnread(
+            ],
-                            format!("thread:{read_thread_id}"),
+            button![
-                            false
+                C!["button"],
-                        )),
+                attrs! {At::Title => "Mark as unread"},
-                    ],
+                span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
-                    button![
+                span!["Unread"],
-                        C!["button", "mark-unread"],
+                ev(Ev::Click, move |_| Msg::SetUnread(
-                        attrs! {At::Title => "Mark as unread"},
+                    format!("thread:{unread_thread_id}"),
-                        span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
+                    true
-                        IF!(show_icon_text=>span!["Unread"]),
+                )),
-                        ev(Ev::Click, move |_| Msg::SetUnread(
-                            format!("thread:{unread_thread_id}"),
-                            true
-                        )),
-                    ],
-                ],
             ],
         ],
         messages,

web/src/view/tablet.rs

@@ -6,28 +6,20 @@ use crate::{
 };
 
 pub(super) fn view(model: &Model) -> Node<Msg> {
-    let show_icon_text = false;
     // Do two queries, one without `unread` so it loads fast, then a second with unread.
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
         Context::ThreadResult {
             thread,
             open_messages,
-        } => view::thread(thread, open_messages, show_icon_text),
+        } => view::thread(thread, open_messages),
         Context::SearchResult {
             query,
             results,
             count,
             pager,
             selected_threads,
-        } => view_search_results(
+        } => view_search_results(&query, results.as_slice(), *count, pager, selected_threads),
-            &query,
-            results.as_slice(),
-            *count,
-            pager,
-            selected_threads,
-            show_icon_text,
-        ),
     };
     div![
         C!["main-content"],

web/static/style.css

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