diff --git a/modules/webapp/src/main/elm/App/Data.elm b/modules/webapp/src/main/elm/App/Data.elm index 1ebd5ae9..15782dc0 100644 --- a/modules/webapp/src/main/elm/App/Data.elm +++ b/modules/webapp/src/main/elm/App/Data.elm @@ -6,7 +6,6 @@ module App.Data exposing ) import Api.Model.AuthResult exposing (AuthResult) -import Api.Model.BasicResult exposing (BasicResult) import Api.Model.VersionInfo exposing (VersionInfo) import Browser exposing (UrlRequest) import Browser.Navigation exposing (Key) diff --git a/modules/webapp/src/main/elm/App/View2.elm b/modules/webapp/src/main/elm/App/View2.elm index dce4129b..7c907437 100644 --- a/modules/webapp/src/main/elm/App/View2.elm +++ b/modules/webapp/src/main/elm/App/View2.elm @@ -152,7 +152,7 @@ styleMain = dataMenu : AuthResult -> Model -> Html Msg -dataMenu acc model = +dataMenu _ model = div [ class "relative" ] [ a [ class dropdownLink @@ -374,7 +374,7 @@ viewLogin model = [ Html.map LoginMsg (Login.viewSidebar model.sidebarVisible model.flags model.uiSettings model.loginModel) , Html.map LoginMsg - (Login.viewContent model.flags model.uiSettings model.loginModel) + (Login.viewContent model.flags model.version model.uiSettings model.loginModel) ] diff --git a/modules/webapp/src/main/elm/Comp/Basic.elm b/modules/webapp/src/main/elm/Comp/Basic.elm index 615a2dd1..0686b6ea 100644 --- a/modules/webapp/src/main/elm/Comp/Basic.elm +++ b/modules/webapp/src/main/elm/Comp/Basic.elm @@ -11,6 +11,7 @@ module Comp.Basic exposing , secondaryBasicButton , secondaryButton , stats + , tooltipRight ) import Html exposing (..) @@ -264,6 +265,17 @@ inputRequired = ] +tooltipRight : Bool -> String -> Html msg +tooltipRight show msg = + div + [ class "absolute bottom-0 right-5 px-2 py-2 rounded-lg z-50 w-40" + , class "bg-white border" + , class "text-sm font-thin" + ] + [ text msg + ] + + --- Helpers diff --git a/modules/webapp/src/main/elm/Page/Login/View2.elm b/modules/webapp/src/main/elm/Page/Login/View2.elm index af8bf534..9f5e8695 100644 --- a/modules/webapp/src/main/elm/Page/Login/View2.elm +++ b/modules/webapp/src/main/elm/Page/Login/View2.elm @@ -1,5 +1,6 @@ module Page.Login.View2 exposing (viewContent, viewSidebar) +import Api.Model.VersionInfo exposing (VersionInfo) import Data.Flags exposing (Flags) import Data.UiSettings exposing (UiSettings) import Html exposing (..) @@ -19,8 +20,8 @@ viewSidebar _ _ _ _ = [] -viewContent : Flags -> UiSettings -> Model -> Html Msg -viewContent flags _ model = +viewContent : Flags -> VersionInfo -> UiSettings -> Model -> Html Msg +viewContent flags versionInfo _ model = div [ id "content" , class "h-full flex flex-col items-center justify-center w-full" @@ -136,6 +137,21 @@ viewContent flags _ model = ] ] ] + , a + [ class "inline-flex items-center mt-4 text-xs opacity-50 hover:opacity-90" + , href "https://docspell.org" + , target "_new" + ] + [ img + [ src (flags.config.docspellAssetPath ++ "/img/logo-mc-96.png") + , class "w-3 h-3 mr-1" + ] + [] + , span [] + [ text "Docspell " + , text versionInfo.version + ] + ] ]