Use collective settings for shares

modules/webapp/src/main/elm/Comp/UiSettingsForm.elm

@@ -580,7 +580,6 @@ update flags sett msg model =
                         TagsTab ->
                             { sett | tagCategoryColors = Nothing }
 
-                        -- no reset here
                         FieldsTab ->
                             { sett | formFields = Nothing }
 
@@ -658,7 +657,7 @@ settingFormTabs texts flags _ model =
                 , onClick (ResetTab tab)
                 ]
                 [ i [ class "fa fa-eraser mr-1" ] []
-                , text "Reset"
+                , text texts.resetLabel
                 ]
     in
     [ { name = akkordionTabName GeneralTab

modules/webapp/src/main/elm/Comp/UiSettingsManage.elm

@@ -28,7 +28,9 @@ import Html.Attributes exposing (..)
 import Http
 import Messages.Comp.UiSettingsManage exposing (Texts)
 import Page.Search.Data exposing (Msg(..))
+import Process
 import Styles as S
+import Task
 
 
 type alias Model =
@@ -67,6 +69,7 @@ type Msg
     | ReceiveServerSettings (Result Http.Error ( StoredUiSettings, StoredUiSettings ))
     | ToggleExpandCollapse
     | SwitchForm AccountScope
+    | ResetFormState
 
 
 init : Flags -> ( Model, Cmd Msg )
@@ -134,12 +137,6 @@ update flags settings msg model =
                                                 | collSettings = Maybe.withDefault data.collSettings sett
                                                 , collModel = m_
                                             }
-                                    , formResult =
-                                        if sett /= Nothing then
-                                            FormInit
-
-                                        else
-                                            model.formResult
                                 }
 
                         Data.AccountScope.User ->
@@ -155,12 +152,6 @@ update flags settings msg model =
                                                 | userSettings = Maybe.withDefault data.userSettings sett
                                                 , userModel = m_
                                             }
-                                    , formResult =
-                                        if sett /= Nothing then
-                                            FormInit
-
-                                        else
-                                            model.formResult
                                 }
 
         Submit ->
@@ -198,9 +189,13 @@ update flags settings msg model =
                             update flags
                                 settings
                                 (ReceiveServerSettings (Ok ( data.collSettings, data.userSettings )))
-                                model
+                                { model | formResult = FormSaved }
+
+                        cmd =
+                            Process.sleep 2000
+                                |> Task.perform (\_ -> ResetFormState)
                     in
-                    { result | appEvent = AppReloadUiSettings }
+                    { result | appEvent = AppReloadUiSettings, cmd = Cmd.batch [ cmd, result.cmd ] }
 
                 _ ->
                     unit { model | formResult = FormUnknownError }
@@ -231,7 +226,13 @@ update flags settings msg model =
                                 , collSettings = coll
                                 , collModel = cm
                                 }
-                        , formModel = ViewUser
+                        , formModel =
+                            case model.formModel of
+                                ViewLoading ->
+                                    ViewUser
+
+                                _ ->
+                                    model.formModel
                     }
 
                 cmds =
@@ -262,6 +263,14 @@ update flags settings msg model =
             in
             Data.AccountScope.fold forUser forColl scope
 
+        ResetFormState ->
+            case model.formResult of
+                FormSaved ->
+                    unit { model | formResult = FormInit }
+
+                _ ->
+                    unit model
+
 
 isError : Model -> Bool
 isError model =
@@ -364,6 +373,9 @@ view2 texts flags _ classes model =
                             [ h2 [ class S.header2 ]
                                 [ text texts.collectiveHeader
                                 ]
+                            , div [ class "py-1 opacity-80" ]
+                                [ text texts.collectiveInfo
+                                ]
                             , Html.map (UiFormMsg scope)
                                 (Comp.UiSettingsForm.view2
                                     texts.uiSettingsForm

modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm

@@ -56,6 +56,7 @@ type alias Texts =
     , fieldLabel : Field -> String
     , templateHelpMessage : String
     , pdfMode : PdfMode -> String
+    , resetLabel : String
     }
 
 
@@ -131,6 +132,7 @@ and if that is not present the person. If both are absent a dash `-`
 is rendered.
 """
     , pdfMode = Messages.Data.PdfMode.gb
+    , resetLabel = "Reset"
     }
 
 
@@ -208,4 +210,5 @@ oder, wenn diese leer ist, die Person. Sind beide leer wird ein `-`
 dargestellt.
 """
     , pdfMode = Messages.Data.PdfMode.de
+    , resetLabel = "Zurücksetzen"
     }

modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm

@@ -30,6 +30,7 @@ type alias Texts =
     , userHeader : String
     , userInfo : String
     , collectiveHeader : String
+    , collectiveInfo : String
     , expandCollapse : String
     }
 
@@ -45,8 +46,9 @@ gb =
     , unknownSaveError = "Unknown error while trying to save settings."
     , httpError = Messages.Comp.HttpError.gb
     , userHeader = "Personal settings"
-    , userInfo = "Your personal settings override those of the collective. On reset, settings are set back to those of the collective."
+    , userInfo = "Your personal settings override those of the collective. On reset, settings are taken from the collective settings."
     , collectiveHeader = "Collective settings"
+    , collectiveInfo = "These settings apply to all users, unless overriden by personal ones. A reset loads the provided default values of the application."
     , expandCollapse = "Expand/collapse all"
     }
 
@@ -62,7 +64,8 @@ de =
     , unknownSaveError = "Unbekannter Fehler beim Speichern der Einstellungen."
     , httpError = Messages.Comp.HttpError.de
     , userHeader = "Persönliche Einstellungen"
-    , userInfo = "Die persönlichen Einstellungen überschreiben die des Kollektivs. Wenn Einstellungen zurückgesetzt werden, werden sie auf die Werte des Kollektivs gesetzt."
+    , userInfo = "Die persönlichen Einstellungen überschreiben die des Kollektivs. Wenn Einstellungen zurückgesetzt werden, gelten automatisch die Werte des Kollektivs."
     , collectiveHeader = "Kollektiv Einstellungen"
+    , collectiveInfo = "Diese Einstellungen sind für alle Benutzer, können aber in den persönlichen Einstellungen überschrieben werden. Durch ein Zurücksetzen erhält man die bereitgestellten Standardwerte der Anwendung."
     , expandCollapse = "Alle ein-/ausklappen"
     }