From f91939ff5b6ec355bece094945310188bedf90a5 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 22 May 2021 20:29:30 +0200 Subject: [PATCH 1/2] Use a configured placeholde instead of hardcoded string --- modules/webapp/src/main/elm/Comp/Dropdown.elm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/webapp/src/main/elm/Comp/Dropdown.elm b/modules/webapp/src/main/elm/Comp/Dropdown.elm index 9e1b19e0..cd82f6b9 100644 --- a/modules/webapp/src/main/elm/Comp/Dropdown.elm +++ b/modules/webapp/src/main/elm/Comp/Dropdown.elm @@ -569,7 +569,7 @@ viewMultiple2 cfg settings model = (List.map renderSelectMultiple model.selected) , input [ type_ "text" - , placeholder "Search…" + , placeholder cfg.placeholder , onInput (Filter (cfg.makeOption >> .text)) , value model.filterString , class "inline-flex w-16 border-0 px-0 focus:ring-0 h-6" From b3c73dafc07ca73bf7a09562de52948de6829d82 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 22 May 2021 20:30:05 +0200 Subject: [PATCH 2/2] Only show user menu when successfully logged in Closes: #814 --- modules/webapp/src/main/elm/App/View2.elm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/webapp/src/main/elm/App/View2.elm b/modules/webapp/src/main/elm/App/View2.elm index c339ac8f..00c807b6 100644 --- a/modules/webapp/src/main/elm/App/View2.elm +++ b/modules/webapp/src/main/elm/App/View2.elm @@ -36,7 +36,11 @@ topNavbar : Model -> Html Msg topNavbar model = case model.flags.account of Just acc -> - topNavUser acc model + if acc.success then + topNavUser acc model + + else + topNavAnon model Nothing -> topNavAnon model