Merge branch '15424-wb2-welcome-page' refs #15424

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 4e3bf6d6c937d89ccdc8cdd1781e5f3d76425965..52856c8438c6d672eb47d4ee631a913a0d59cfcd 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1057,5 +1057,23 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Workbench welcome screen, this is HTML text that will be
+      # incorporated directly onto the page.
+      WelcomePageHTML: |
+        <img src="arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <h2>Please log in.</h2>
+
+        <p>The "Log in" button below will show you a sign-in
+        page. After you log in, you will be redirected back to
+        Arvados Workbench.</p>
+
+        <p>If you have never used Arvados Workbench before, logging in
+        for the first time will automatically create a new
+        account.</p>
+
+        <i>Arvados Workbench uses your name and email address only for
+        identification, and does not retrieve any other personal
+        information.</i>
+
     # Use experimental controller code (see https://dev.arvados.org/issues/14287)
     EnableBetaController14287: false

diff --git a/lib/config/export.go b/lib/config/export.go
index 5437836f6fee05f3aded39954ea8d626d3c12f6e..cd58868ed105a6143205b79e21a47147360307cd 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -207,6 +207,7 @@ var whitelist = map[string]bool{
        "Workbench.UserProfileFormFields.*.*.*":        true,
        "Workbench.UserProfileFormMessage":             true,
        "Workbench.VocabularyURL":                      true,
+       "Workbench.WelcomePageHTML":                    true,
 }
 
 func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index d21bb2d284b57d5dfff01a346c0708d98ca8db13..6e7aba81dfc84db1f9b8d1c807b2aa2cf1bb566a 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1063,6 +1063,24 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Workbench welcome screen, this is HTML text that will be
+      # incorporated directly onto the page.
+      WelcomePageHTML: |
+        <img src="arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <h2>Please log in.</h2>
+
+        <p>The "Log in" button below will show you a sign-in
+        page. After you log in, you will be redirected back to
+        Arvados Workbench.</p>
+
+        <p>If you have never used Arvados Workbench before, logging in
+        for the first time will automatically create a new
+        account.</p>
+
+        <i>Arvados Workbench uses your name and email address only for
+        identification, and does not retrieve any other personal
+        information.</i>
+
     # Use experimental controller code (see https://dev.arvados.org/issues/14287)
     EnableBetaController14287: false
 `)

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 7c1c3538094869ff82a510226575a2dbbd0491ab..638c56fb95d16b28f57216dca86145b77353319c 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -207,6 +207,7 @@ type Cluster struct {
                }
                UserProfileFormMessage string
                VocabularyURL          string
+               WelcomePageHTML        string
        }
 
        EnableBetaController14287 bool