Make item detail header a link list

This commit is contained in:
Eike Kettner 2020-11-14 12:11:04 +01:00
parent e2545de347
commit cf578a88d3
3 changed files with 14 additions and 18 deletions

View File

@ -26,6 +26,7 @@ import Comp.Dropdown
import Comp.Dropzone import Comp.Dropzone
import Comp.ItemMail import Comp.ItemMail
import Comp.KeyInput import Comp.KeyInput
import Comp.LinkTarget exposing (LinkTarget)
import Comp.MarkdownInput import Comp.MarkdownInput
import Comp.SentMails import Comp.SentMails
import Comp.YesNoDimmer import Comp.YesNoDimmer
@ -273,6 +274,7 @@ type Msg
| KeyInputMsg Comp.KeyInput.Msg | KeyInputMsg Comp.KeyInput.Msg
| ToggleAttachMenu | ToggleAttachMenu
| UiSettingsUpdated | UiSettingsUpdated
| SetLinkTarget LinkTarget
type SaveNameState type SaveNameState

View File

@ -1285,6 +1285,9 @@ update key flags inav settings msg model =
in in
noSub ( model_, Cmd.none ) noSub ( model_, Cmd.none )
SetLinkTarget lt ->
noSub ( model, Cmd.none )
--- Helper --- Helper

View File

@ -11,6 +11,7 @@ import Comp.ItemDetail.AttachmentTabMenu
import Comp.ItemDetail.Model exposing (Model, Msg(..), NotesField(..), SaveNameState(..)) import Comp.ItemDetail.Model exposing (Model, Msg(..), NotesField(..), SaveNameState(..))
import Comp.ItemMail import Comp.ItemMail
import Comp.KeyInput import Comp.KeyInput
import Comp.LinkTarget
import Comp.MarkdownInput import Comp.MarkdownInput
import Comp.SentMails import Comp.SentMails
import Comp.YesNoDimmer import Comp.YesNoDimmer
@ -519,13 +520,9 @@ renderItemInfo settings model =
[ class "item" [ class "item"
, title "Correspondent" , title "Correspondent"
] ]
[ Icons.correspondentIcon "" (Icons.correspondentIcon ""
, List.filterMap identity [ model.item.corrOrg, model.item.corrPerson ] :: Comp.LinkTarget.makeCorrLink model.item SetLinkTarget
|> List.map .name )
|> String.join ", "
|> Util.String.withDefault "(None)"
|> text
]
, Data.UiSettings.fieldVisible settings Data.Fields.CorrOrg , Data.UiSettings.fieldVisible settings Data.Fields.CorrOrg
|| Data.UiSettings.fieldVisible settings Data.Fields.CorrPerson || Data.UiSettings.fieldVisible settings Data.Fields.CorrPerson
) )
@ -535,13 +532,9 @@ renderItemInfo settings model =
[ class "item" [ class "item"
, title "Concerning" , title "Concerning"
] ]
[ Icons.concernedIcon (Icons.concernedIcon
, List.filterMap identity [ model.item.concPerson, model.item.concEquipment ] :: Comp.LinkTarget.makeConcLink model.item SetLinkTarget
|> List.map .name )
|> String.join ", "
|> Util.String.withDefault "(None)"
|> text
]
, Data.UiSettings.fieldVisible settings Data.Fields.ConcEquip , Data.UiSettings.fieldVisible settings Data.Fields.ConcEquip
|| Data.UiSettings.fieldVisible settings Data.Fields.ConcPerson || Data.UiSettings.fieldVisible settings Data.Fields.ConcPerson
) )
@ -552,9 +545,7 @@ renderItemInfo settings model =
, title "Folder" , title "Folder"
] ]
[ Icons.folderIcon "" [ Icons.folderIcon ""
, Maybe.map .name model.item.folder , Comp.LinkTarget.makeFolderLink model.item SetLinkTarget
|> Maybe.withDefault "-"
|> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.Folder , Data.UiSettings.fieldVisible settings Data.Fields.Folder
) )
@ -592,7 +583,7 @@ renderItemInfo settings model =
[ text "New!" [ text "New!"
] ]
, div [ class "sub header" ] , div [ class "sub header" ]
[ div [ class "ui horizontal bulleted list" ] [ div [ class "ui horizontal bulleted link list" ]
(List.filter Tuple.second (List.filter Tuple.second
[ date [ date
, corr , corr