18995: Merge branch 'main' into 18995-code-cleanup-2

[arvados.git] / apps / workbench / app / views / users / _setup_popup.html.erb

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 3b3794bf50a8b791e23ef006d623c5ff121ca66a..4c3a95e87e96080b487875e1e519e30d6da350ff 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <div class="modal-header">
       <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
       <div>
-        <div class="col-sm-6"> <h4 class="modal-title">Setup Shell Account</h4> </div>
+        <div class="col-sm-6"> <h4 class="modal-title">Setup Account</h4> </div>
         <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
       </div>
       <br/>
@@ -44,11 +44,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
                value="<%=identity_url_prefix%>" disabled=true>
         <% else %>
         <input class="form-control" id="openid_prefix" maxlength="250" name="openid_prefix" type="text"
-               value="<%= Rails.configuration.default_openid_prefix %>">
+               value="<%= Rails.configuration.Workbench.DefaultOpenIdPrefix %>">
         <% end %>
       </div>
       <div class="form-group">
-        <label for="vm_uuid">Virtual Machine</label>
+        <label for="vm_uuid">Virtual Machine (optional)</label>
         <select class="form-control" name="vm_uuid">
           <option value="" <%= 'selected' unless selected_vm %>>
             Choose One:
@@ -62,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
         </select>
       </div>
       <div class="groups-group">
-        <label for="groups">Groups for virtual machine (comma separated list)</label>
+        <label for="groups">Groups for virtual machine (comma separated list) (optional)</label>
         <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>">
       </div>
     </div>