From ee6b54006c571d4143a8cc005162385b2cba3901 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Sat, 14 Nov 2020 10:41:20 +0100
Subject: [PATCH] Fix reset search for content-only and provide it on top bar

---
 .../webapp/src/main/elm/Page/Home/Update.elm  |  1 +
 .../webapp/src/main/elm/Page/Home/View.elm    | 66 +++++++++++--------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm
index 3a72dd3d..46505ee1 100644
--- a/modules/webapp/src/main/elm/Page/Home/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Home/Update.elm
@@ -47,6 +47,7 @@ update mId key flags settings msg model =
                     { model
                         | searchOffset = 0
                         , searchType = defaultSearchType flags
+                        , contentOnlySearch = Nothing
                     }
             in
             update mId key flags settings (SearchMenuMsg Comp.SearchMenu.ResetForm) nm
diff --git a/modules/webapp/src/main/elm/Page/Home/View.elm b/modules/webapp/src/main/elm/Page/Home/View.elm
index 1dbf2f36..dd2d3ef1 100644
--- a/modules/webapp/src/main/elm/Page/Home/View.elm
+++ b/modules/webapp/src/main/elm/Page/Home/View.elm
@@ -311,39 +311,49 @@ viewSearchBar flags model =
             ]
             [ i [ class "filter icon" ] []
             ]
-        , div [ class "right fitted item" ]
-            [ div [ class "ui left icon right action input" ]
-                [ i
-                    [ classList
-                        [ ( "search link icon", not model.searchInProgress )
-                        , ( "loading spinner icon", model.searchInProgress )
-                        ]
-                    , href "#"
-                    , onClick DoSearch
-                    ]
-                    (if hasMoreSearch model && model.searchTypeForm == BasicSearch then
-                        [ i [ class "icons search-corner-icons" ]
-                            [ i [ class "tiny blue circle icon" ] []
+        , div [ class "right menu" ]
+            [ div [ class "fitted item" ]
+                [ div [ class "ui left icon right action input" ]
+                    [ i
+                        [ classList
+                            [ ( "search link icon", not model.searchInProgress )
+                            , ( "loading spinner icon", model.searchInProgress )
                             ]
+                        , href "#"
+                        , onClick DoSearch
                         ]
+                        (if hasMoreSearch model && model.searchTypeForm == BasicSearch then
+                            [ i [ class "icons search-corner-icons" ]
+                                [ i [ class "tiny blue circle icon" ] []
+                                ]
+                            ]
 
-                     else
+                         else
+                            []
+                        )
+                    , input
+                        [ type_ "text"
+                        , placeholder "Quick Search …"
+                        , onInput SetBasicSearch
+                        , Util.Html.onKeyUpCode KeyUpMsg
+                        , Maybe.map value searchInput
+                            |> Maybe.withDefault (value "")
+                        ]
                         []
-                    )
-                , input
-                    [ type_ "text"
-                    , placeholder "Quick Search …"
-                    , onInput SetBasicSearch
-                    , Util.Html.onKeyUpCode KeyUpMsg
-                    , Maybe.map value searchInput
-                        |> Maybe.withDefault (value "")
+                    , Html.map SearchTypeMsg
+                        (Comp.FixedDropdown.viewStyled searchTypeClass
+                            (Just searchTypeItem)
+                            model.searchTypeDropdown
+                        )
+                    , a
+                        [ class "ui icon basic button"
+                        , href "#"
+                        , onClick ResetSearch
+                        , title "Reset search form"
+                        ]
+                        [ i [ class "undo icon" ] []
+                        ]
                     ]
-                    []
-                , Html.map SearchTypeMsg
-                    (Comp.FixedDropdown.viewStyled searchTypeClass
-                        (Just searchTypeItem)
-                        model.searchTypeDropdown
-                    )
                 ]
             ]
         ]