Skip to content

Commit

Permalink
Merge pull request #1153 from ds-wizard/hotfix/4.6.2
Browse files Browse the repository at this point in the history
Hotfix 4.6.2
  • Loading branch information
janslifka committed May 22, 2024
2 parents 38d7566 + cdb8182 commit d684ddc
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions engine-registry/elm/Registry/Data/AppState.elm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Registry.Data.AppState exposing
( AppState
, default
, getAppTitle
, getOrganizationId
, init
, setSession
Expand Down Expand Up @@ -74,3 +75,8 @@ setSession mbSession appState =
getOrganizationId : AppState -> Maybe String
getOrganizationId appState =
Maybe.map .organizationId appState.session


getAppTitle : AppState -> String
getAppTitle appState =
Maybe.withDefault "DSW Registry" appState.appTitle
4 changes: 2 additions & 2 deletions engine-registry/elm/Registry/Layouts/AppLayout.elm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Html exposing (Html, a, div, header, img, li, main_, section, small, text
import Html.Attributes exposing (class, classList, height, href, src)
import Html.Events exposing (onClick)
import Registry.Components.FontAwesome exposing (fas)
import Registry.Data.AppState exposing (AppState)
import Registry.Data.AppState as AppState exposing (AppState)
import Registry.Routes as Routes


Expand All @@ -24,7 +24,7 @@ app : AppState -> AppLayoutConfig msg -> Document msg
app appState cfg =
let
appTitle =
Maybe.withDefault "DSW Registry" appState.appTitle
AppState.getAppTitle appState
in
{ title = appTitle
, body =
Expand Down
6 changes: 3 additions & 3 deletions engine-registry/elm/Registry/Pages/Homepage.elm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Gettext exposing (gettext)
import Html exposing (Html, a, div, h1, p, span, text)
import Html.Attributes exposing (class, href)
import Registry.Components.FontAwesome exposing (fas)
import Registry.Data.AppState exposing (AppState)
import Registry.Data.AppState as AppState exposing (AppState)
import Registry.Routes as Routes


Expand All @@ -14,10 +14,10 @@ view appState =
[ div [ class "row" ]
[ div [ class "col-12 mb-5" ]
[ h1 [ class "text-center" ]
[ text "DSW Registry"
[ text (AppState.getAppTitle appState)
]
, p [ class "text-center" ]
[ text "Customize your experience with prepared content and translations."
[ text (gettext "Customize your experience with prepared content and translations." appState.locale)
]
]
, div [ class "row" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ viewResourcePageReferences appState =

viewResourcePageReference : ResourcePageReferenceData -> Html msg
viewResourcePageReference data =
a [ href <| "/book-references/" ++ data.shortUuid, target "_blank" ]
a [ href <| "/wizard/book-references/" ++ data.shortUuid, target "_blank" ]
[ text data.shortUuid ]


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "engine-frontend",
"version": "4.6.1",
"version": "4.6.2",
"repository": "https://github.com/ds-wizard/engine-frontend",
"license": "Apache-2.0",
"scripts": {
Expand Down

0 comments on commit d684ddc

Please sign in to comment.