From 063c9895dd75d1d7f493950ec801870c58990850 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sun, 15 Nov 2020 00:09:29 +0100 Subject: [PATCH] Fix table layout and notification form The styling is broken if th elements are outside a tr. The notification form had the same problem as the scan-mailbox form reported in #382 --- .../src/main/elm/Comp/EmailSettingsTable.elm | 8 +++++--- .../webapp/src/main/elm/Comp/FolderTable.elm | 14 +++++++------ .../src/main/elm/Comp/ImapSettingsTable.elm | 6 ++++-- .../src/main/elm/Comp/NotificationForm.elm | 2 +- .../src/main/elm/Comp/NotificationList.elm | 16 ++++++++------- .../src/main/elm/Comp/ScanMailboxList.elm | 20 ++++++++++--------- .../webapp/src/main/elm/Comp/SentMails.elm | 10 ++++++---- 7 files changed, 44 insertions(+), 32 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm index bfa3a388..f2f9e50c 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm @@ -46,9 +46,11 @@ view : Model -> Html Msg view model = table [ class "ui selectable pointer table" ] [ thead [] - [ th [ class "collapsible" ] [ text "Name" ] - , th [] [ text "Host/Port" ] - , th [] [ text "From" ] + [ tr [] + [ th [ class "collapsible" ] [ text "Name" ] + , th [] [ text "Host/Port" ] + , th [] [ text "From" ] + ] ] , tbody [] (List.map (renderLine model) model.emailSettings) diff --git a/modules/webapp/src/main/elm/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Comp/FolderTable.elm index a44f5e59..46fb55f2 100644 --- a/modules/webapp/src/main/elm/Comp/FolderTable.elm +++ b/modules/webapp/src/main/elm/Comp/FolderTable.elm @@ -45,12 +45,14 @@ view _ items = div [] [ table [ class "ui very basic center aligned table" ] [ thead [] - [ th [ class "collapsing" ] [] - , th [] [ text "Name" ] - , th [] [ text "Owner" ] - , th [] [ text "Owner or Member" ] - , th [] [ text "#Member" ] - , th [] [ text "Created" ] + [ tr [] + [ th [ class "collapsing" ] [] + , th [] [ text "Name" ] + , th [] [ text "Owner" ] + , th [] [ text "Owner or Member" ] + , th [] [ text "#Member" ] + , th [] [ text "Created" ] + ] ] , tbody [] (List.map viewItem items) diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm index a69bdc1e..bfacb5e0 100644 --- a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm +++ b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm @@ -46,8 +46,10 @@ view : Model -> Html Msg view model = table [ class "ui selectable pointer table" ] [ thead [] - [ th [ class "collapsible" ] [ text "Name" ] - , th [] [ text "Host/Port" ] + [ tr [] + [ th [ class "collapsible" ] [ text "Name" ] + , th [] [ text "Host/Port" ] + ] ] , tbody [] (List.map (renderLine model) model.emailSettings) diff --git a/modules/webapp/src/main/elm/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Comp/NotificationForm.elm index 82ddaefb..869996ab 100644 --- a/modules/webapp/src/main/elm/Comp/NotificationForm.elm +++ b/modules/webapp/src/main/elm/Comp/NotificationForm.elm @@ -131,7 +131,7 @@ init : Flags -> ( Model, Cmd Msg ) init flags = let initialSchedule = - Data.Validated.Unknown Data.CalEvent.everyMonth + Data.Validated.Valid Data.CalEvent.everyMonth sm = Comp.CalEventInput.initDefault diff --git a/modules/webapp/src/main/elm/Comp/NotificationList.elm b/modules/webapp/src/main/elm/Comp/NotificationList.elm index 537668f9..deab16e3 100644 --- a/modules/webapp/src/main/elm/Comp/NotificationList.elm +++ b/modules/webapp/src/main/elm/Comp/NotificationList.elm @@ -44,14 +44,16 @@ view _ items = div [] [ table [ class "ui very basic center aligned table" ] [ thead [] - [ th [ class "collapsing" ] [] - , th [ class "collapsing" ] - [ i [ class "check icon" ] [] + [ tr [] + [ th [ class "collapsing" ] [] + , th [ class "collapsing" ] + [ i [ class "check icon" ] [] + ] + , th [] [ text "Schedule" ] + , th [] [ text "Connection" ] + , th [] [ text "Recipients" ] + , th [] [ text "Remind Days" ] ] - , th [] [ text "Schedule" ] - , th [] [ text "Connection" ] - , th [] [ text "Recipients" ] - , th [] [ text "Remind Days" ] ] , tbody [] (List.map viewItem items) diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm index 98d6f9d5..578b4a47 100644 --- a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm +++ b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm @@ -44,16 +44,18 @@ view _ items = div [] [ table [ class "ui very basic center aligned table" ] [ thead [] - [ th [ class "collapsing" ] [] - , th [ class "collapsing" ] - [ i [ class "check icon" ] [] + [ tr [] + [ th [ class "collapsing" ] [] + , th [ class "collapsing" ] + [ i [ class "check icon" ] [] + ] + , th [] [ text "Schedule" ] + , th [] [ text "Connection" ] + , th [] [ text "Folders" ] + , th [] [ text "Received Since" ] + , th [] [ text "Target" ] + , th [] [ text "Delete" ] ] - , th [] [ text "Schedule" ] - , th [] [ text "Connection" ] - , th [] [ text "Folders" ] - , th [] [ text "Received Since" ] - , th [] [ text "Target" ] - , th [] [ text "Delete" ] ] , tbody [] (List.map viewItem items) diff --git a/modules/webapp/src/main/elm/Comp/SentMails.elm b/modules/webapp/src/main/elm/Comp/SentMails.elm index a07dbced..a3da70cd 100644 --- a/modules/webapp/src/main/elm/Comp/SentMails.elm +++ b/modules/webapp/src/main/elm/Comp/SentMails.elm @@ -103,10 +103,12 @@ view model = Nothing -> table [ class "ui selectable pointer very basic table" ] [ thead [] - [ th [ class "collapsing" ] [ text "Recipients" ] - , th [] [ text "Subject" ] - , th [ class "collapsible" ] [ text "Sent" ] - , th [ class "collapsible" ] [ text "Sender" ] + [ tr [] + [ th [ class "collapsing" ] [ text "Recipients" ] + , th [] [ text "Subject" ] + , th [ class "collapsible" ] [ text "Sent" ] + , th [ class "collapsible" ] [ text "Sender" ] + ] ] , tbody [] <| List.map