diff --git a/modules/webapp/src/main/elm/Messages/Page/Share.elm b/modules/webapp/src/main/elm/Messages/Page/Share.elm index 53061b7d..e89d09aa 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Share.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Share.elm @@ -24,6 +24,7 @@ type alias Texts = , authFailed : String , fulltextPlaceholder : String , powerSearchPlaceholder : String + , normalSearchPlaceholder : String , extendedSearch : String } @@ -39,6 +40,7 @@ gb = , fulltextPlaceholder = "Fulltext search…" , powerSearchPlaceholder = "Extended search…" , extendedSearch = "Extended search query" + , normalSearchPlaceholder = "Search…" } @@ -53,4 +55,5 @@ de = , fulltextPlaceholder = "Volltextsuche…" , powerSearchPlaceholder = "Erweiterte Suche…" , extendedSearch = "Erweiterte Suchanfrage" + , normalSearchPlaceholder = "Suche…" } diff --git a/modules/webapp/src/main/elm/Page/Share/Menubar.elm b/modules/webapp/src/main/elm/Page/Share/Menubar.elm index 1bfcc08c..59b4054b 100644 --- a/modules/webapp/src/main/elm/Page/Share/Menubar.elm +++ b/modules/webapp/src/main/elm/Page/Share/Menubar.elm @@ -10,7 +10,7 @@ module Page.Share.Menubar exposing (view) import Comp.Basic as B import Comp.MenuBar as MB import Comp.PowerSearchInput -import Comp.SearchMenu +import Data.Flags exposing (Flags) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput) @@ -20,16 +20,9 @@ import Styles as S import Util.Html -view : Texts -> Model -> Html Msg -view texts model = +view : Texts -> Flags -> Model -> Html Msg +view texts flags model = let - btnStyle = - S.secondaryBasicButton ++ " text-sm" - - searchInput = - Comp.SearchMenu.textSearchString - model.searchMenuModel.textSearchModel - powerSearchBar = div [ class "flex-grow flex flex-col relative" ] [ div @@ -67,7 +60,11 @@ view texts model = [ type_ "text" , class S.textInput , class "text-sm" - , placeholder texts.fulltextPlaceholder + , if flags.config.fullTextSearchEnabled then + placeholder texts.fulltextPlaceholder + + else + placeholder texts.normalSearchPlaceholder , onInput SetContentSearch , value (Maybe.withDefault "" model.contentSearch) , Util.Html.onKeyUpCode ContentSearchKey diff --git a/modules/webapp/src/main/elm/Page/Share/Update.elm b/modules/webapp/src/main/elm/Page/Share/Update.elm index e7f6c852..c72aa2af 100644 --- a/modules/webapp/src/main/elm/Page/Share/Update.elm +++ b/modules/webapp/src/main/elm/Page/Share/Update.elm @@ -214,7 +214,11 @@ makeSearchCmd flags model = model.powerSearchInput.input SearchBarContent -> - Maybe.map (Q.Contents >> Q.render) model.contentSearch + if flags.config.fullTextSearchEnabled then + Maybe.map (Q.Contents >> Q.render) model.contentSearch + + else + Maybe.map (Q.AllNames >> Q.render) model.contentSearch ] request mq = diff --git a/modules/webapp/src/main/elm/Page/Share/View.elm b/modules/webapp/src/main/elm/Page/Share/View.elm index 924b4631..69bbb9eb 100644 --- a/modules/webapp/src/main/elm/Page/Share/View.elm +++ b/modules/webapp/src/main/elm/Page/Share/View.elm @@ -80,7 +80,7 @@ mainContent texts flags settings shareId model = ] [ text <| Maybe.withDefault "" model.verifyResult.name ] - , Menubar.view texts model + , Menubar.view texts flags model , errorMessage texts model , Results.view texts settings flags shareId model ]