From 29d80adace74cdfadbc046da1ea8b7c4353eb1d7 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 16 Feb 2021 23:00:57 +0100 Subject: [PATCH] Ui updates: place result message below buttons --- .../src/main/elm/Comp/CustomFieldForm.elm | 24 +++++++++---------- .../src/main/elm/Comp/EmailSettingsManage.elm | 5 ++-- .../src/main/elm/Comp/EquipmentManage.elm | 3 ++- .../webapp/src/main/elm/Comp/FolderDetail.elm | 7 +++++- .../src/main/elm/Comp/ImapSettingsManage.elm | 17 ++++++------- .../webapp/src/main/elm/Comp/OrgManage.elm | 3 ++- .../webapp/src/main/elm/Comp/PersonManage.elm | 3 ++- .../webapp/src/main/elm/Comp/TagManage.elm | 3 ++- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm index 2c2055b7..4bf5ed3b 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm @@ -340,6 +340,18 @@ view2 viewSettings model = dimmerSettings model.deleteDimmer ) + , div + [ classList + [ ( "hidden", model.result == Nothing ) + , ( S.errorMessage, Maybe.map .success model.result == Just False ) + , ( S.successMessage, Maybe.map .success model.result == Just True ) + ] + , class "my-2" + ] + [ Maybe.map .message model.result + |> Maybe.withDefault "" + |> text + ] , if model.field.id == "" then div [ class "py-2 text-lg opacity-75" ] [ text "Create a new custom field." @@ -416,18 +428,6 @@ view2 viewSettings model = , text "this field in the ui. If not present, the name is used." ] ] - , div - [ classList - [ ( "hidden", model.result == Nothing ) - , ( S.errorMessage, Maybe.map .success model.result == Just False ) - , ( S.successMessage, Maybe.map .success model.result == Just True ) - ] - , class "mb-4" - ] - [ Maybe.map .message model.result - |> Maybe.withDefault "" - |> text - ] ] ] diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm index db50d18c..15007387 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm @@ -373,16 +373,17 @@ viewForm2 settings model = [] , rootClasses = "mb-4" } - , Html.map FormMsg - (Comp.EmailSettingsForm.view2 settings model.formModel) , div [ classList [ ( "hidden", model.formError == Nothing ) ] + , class "my-2" , class S.errorMessage ] [ Maybe.withDefault "" model.formError |> text ] + , Html.map FormMsg + (Comp.EmailSettingsForm.view2 settings model.formModel) , Html.map YesNoMsg (Comp.YesNoDimmer.viewN True diff --git a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm index 2d4b1c00..17065b30 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm @@ -414,14 +414,15 @@ viewForm2 model = [] , rootClasses = "mb-4" } - , Html.map FormMsg (Comp.EquipmentForm.view2 model.formModel) , div [ classList [ ( "hidden", Util.Maybe.isEmpty model.formError ) ] , class S.errorMessage + , class "my-2" ] [ Maybe.withDefault "" model.formError |> text ] + , Html.map FormMsg (Comp.EquipmentForm.view2 model.formModel) , B.loadingDimmer model.loading ] diff --git a/modules/webapp/src/main/elm/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Comp/FolderDetail.elm index a65a147b..f8105f40 100644 --- a/modules/webapp/src/main/elm/Comp/FolderDetail.elm +++ b/modules/webapp/src/main/elm/Comp/FolderDetail.elm @@ -477,6 +477,7 @@ view2 flags model = , onInput SetName , Maybe.withDefault "" model.name |> value + , classList [ ( S.inputErrorBorder, model.name == Nothing ) ] , class S.textInput , id "folder-name" ] @@ -585,11 +586,15 @@ viewButtons2 model = } ] , end = - [ MB.DeleteButton + [ MB.CustomButton { tagger = RequestDelete , label = "Delete" , icon = Just "fa fa-trash" , title = "Delete this folder" + , inputClass = + [ ( S.deleteButton, True ) + , ( "hidden", model.folder.id == "" ) + ] } ] , rootClasses = "mb-4" diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm index 04087010..e6073bc0 100644 --- a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm @@ -376,19 +376,20 @@ viewForm2 settings model = [] , rootClasses = "mb-4" } + , div + [ classList + [ ( "hidden", model.formError == Nothing ) + ] + , class "my-2" + , class S.errorMessage + ] + [ Maybe.withDefault "" model.formError |> text + ] , Html.map FormMsg (Comp.ImapSettingsForm.view2 settings model.formModel ) - , div - [ classList - [ ( "hidden", model.formError == Nothing ) - ] - , class S.errorMessage - ] - [ Maybe.withDefault "" model.formError |> text - ] , Html.map YesNoMsg (Comp.YesNoDimmer.viewN True diff --git a/modules/webapp/src/main/elm/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Comp/OrgManage.elm index 6b299b00..d184f0d1 100644 --- a/modules/webapp/src/main/elm/Comp/OrgManage.elm +++ b/modules/webapp/src/main/elm/Comp/OrgManage.elm @@ -408,14 +408,15 @@ viewForm2 settings model = [] , rootClasses = "mb-4" } - , Html.map FormMsg (Comp.OrgForm.view2 False settings model.formModel) , div [ classList [ ( "hidden", Util.Maybe.isEmpty model.formError ) ] , class S.errorMessage + , class "my-2" ] [ Maybe.withDefault "" model.formError |> text ] + , Html.map FormMsg (Comp.OrgForm.view2 False settings model.formModel) , B.loadingDimmer model.loading ] diff --git a/modules/webapp/src/main/elm/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Comp/PersonManage.elm index b7087513..5e9078ca 100644 --- a/modules/webapp/src/main/elm/Comp/PersonManage.elm +++ b/modules/webapp/src/main/elm/Comp/PersonManage.elm @@ -456,14 +456,15 @@ viewForm2 settings model = [] , rootClasses = "mb-4" } - , Html.map FormMsg (Comp.PersonForm.view2 False settings model.formModel) , div [ classList [ ( "hidden", Util.Maybe.isEmpty model.formError ) ] , class S.errorMessage + , class "my-2" ] [ Maybe.withDefault "" model.formError |> text ] + , Html.map FormMsg (Comp.PersonForm.view2 False settings model.formModel) , B.loadingDimmer (isLoading model) ] diff --git a/modules/webapp/src/main/elm/Comp/TagManage.elm b/modules/webapp/src/main/elm/Comp/TagManage.elm index aef67a8c..89d4d3a9 100644 --- a/modules/webapp/src/main/elm/Comp/TagManage.elm +++ b/modules/webapp/src/main/elm/Comp/TagManage.elm @@ -424,14 +424,15 @@ viewForm2 model = [] , rootClasses = "mb-4" } - , Html.map FormMsg (Comp.TagForm.view2 model.tagFormModel) , div [ classList [ ( "hidden", Util.Maybe.isEmpty model.formError ) ] + , class "my-2" , class S.errorMessage ] [ Maybe.withDefault "" model.formError |> text ] + , Html.map FormMsg (Comp.TagForm.view2 model.tagFormModel) , B.loadingDimmer model.loading ]