TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 18:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ui updates: place result message below buttons

Browse Source
This commit is contained in:
Eike Kettner 2021-02-16 23:00:57 +01:00
parent 539a93151d
commit 29d80adace
8 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
View File

@ -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
]
]
]

5
modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
View File

@ -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

3
modules/webapp/src/main/elm/Comp/EquipmentManage.elm
View File

@ -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
]

7
modules/webapp/src/main/elm/Comp/FolderDetail.elm
View File

@ -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"

17
modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
View File

@ -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

3
modules/webapp/src/main/elm/Comp/OrgManage.elm
View File

@ -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
]

3
modules/webapp/src/main/elm/Comp/PersonManage.elm
View File

@ -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)
]

3
modules/webapp/src/main/elm/Comp/TagManage.elm
View File

@ -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
]