From cf578a88d37dfa2fd1331a0de6f42b443a0499cc Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 14 Nov 2020 12:11:04 +0100 Subject: [PATCH] Make item detail header a link list --- .../src/main/elm/Comp/ItemDetail/Model.elm | 2 ++ .../src/main/elm/Comp/ItemDetail/Update.elm | 3 +++ .../src/main/elm/Comp/ItemDetail/View.elm | 27 +++++++------------ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm index 36aea44c..651132d4 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm @@ -26,6 +26,7 @@ import Comp.Dropdown import Comp.Dropzone import Comp.ItemMail import Comp.KeyInput +import Comp.LinkTarget exposing (LinkTarget) import Comp.MarkdownInput import Comp.SentMails import Comp.YesNoDimmer @@ -273,6 +274,7 @@ type Msg | KeyInputMsg Comp.KeyInput.Msg | ToggleAttachMenu | UiSettingsUpdated + | SetLinkTarget LinkTarget type SaveNameState diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm index 578a11ef..2de62646 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm @@ -1285,6 +1285,9 @@ update key flags inav settings msg model = in noSub ( model_, Cmd.none ) + SetLinkTarget lt -> + noSub ( model, Cmd.none ) + --- Helper diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/View.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/View.elm index 04c00406..93ad348d 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/View.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/View.elm @@ -11,6 +11,7 @@ import Comp.ItemDetail.AttachmentTabMenu import Comp.ItemDetail.Model exposing (Model, Msg(..), NotesField(..), SaveNameState(..)) import Comp.ItemMail import Comp.KeyInput +import Comp.LinkTarget import Comp.MarkdownInput import Comp.SentMails import Comp.YesNoDimmer @@ -519,13 +520,9 @@ renderItemInfo settings model = [ class "item" , title "Correspondent" ] - [ Icons.correspondentIcon "" - , List.filterMap identity [ model.item.corrOrg, model.item.corrPerson ] - |> List.map .name - |> String.join ", " - |> Util.String.withDefault "(None)" - |> text - ] + (Icons.correspondentIcon "" + :: Comp.LinkTarget.makeCorrLink model.item SetLinkTarget + ) , Data.UiSettings.fieldVisible settings Data.Fields.CorrOrg || Data.UiSettings.fieldVisible settings Data.Fields.CorrPerson ) @@ -535,13 +532,9 @@ renderItemInfo settings model = [ class "item" , title "Concerning" ] - [ Icons.concernedIcon - , List.filterMap identity [ model.item.concPerson, model.item.concEquipment ] - |> List.map .name - |> String.join ", " - |> Util.String.withDefault "(None)" - |> text - ] + (Icons.concernedIcon + :: Comp.LinkTarget.makeConcLink model.item SetLinkTarget + ) , Data.UiSettings.fieldVisible settings Data.Fields.ConcEquip || Data.UiSettings.fieldVisible settings Data.Fields.ConcPerson ) @@ -552,9 +545,7 @@ renderItemInfo settings model = , title "Folder" ] [ Icons.folderIcon "" - , Maybe.map .name model.item.folder - |> Maybe.withDefault "-" - |> text + , Comp.LinkTarget.makeFolderLink model.item SetLinkTarget ] , Data.UiSettings.fieldVisible settings Data.Fields.Folder ) @@ -592,7 +583,7 @@ renderItemInfo settings model = [ text "New!" ] , div [ class "sub header" ] - [ div [ class "ui horizontal bulleted list" ] + [ div [ class "ui horizontal bulleted link list" ] (List.filter Tuple.second [ date , corr