projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14812-wb1-new-config' refs #14812
[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 7432b81a6924f23d538a38cb0ca790093cc58730..d6f25136c438a39c6eb9659c198effec62afbd69 100644
(file)
--- a/
apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/
apps/workbench/app/views/users/_setup_popup.html.erb
@@
-1,3
+1,7
@@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
<div class="modal-dialog modal-with-loading-spinner">
<div class="modal-content">
<div class="modal-dialog modal-with-loading-spinner">
<div class="modal-content">
@@
-7,7
+11,7
@@
<div class="modal-header">
<button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
<div>
<div class="modal-header">
<button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
<div>
- <div class="col-sm-6"> <h4 class="modal-title">Setup
User
</h4> </div>
+ <div class="col-sm-6"> <h4 class="modal-title">Setup
Shell Account
</h4> </div>
<div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
</div>
<br/>
<div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
</div>
<br/>
@@
-21,7
+25,6
@@
<% disable_email = uuid != nil %>
<% identity_url_prefix = @current_selections[:identity_url_prefix] %>
<% disable_url_prefix = identity_url_prefix != nil %>
<% disable_email = uuid != nil %>
<% identity_url_prefix = @current_selections[:identity_url_prefix] %>
<% disable_url_prefix = identity_url_prefix != nil %>
- <% selected_repo = @current_selections[:repo_name] %>
<% selected_vm = @current_selections[:vm_uuid] %>
<% groups = @current_selections[:groups] %>
<% selected_vm = @current_selections[:vm_uuid] %>
<% groups = @current_selections[:groups] %>
@@
-41,13
+44,9
@@
value="<%=identity_url_prefix%>" disabled=true>
<% else %>
<input class="form-control" id="openid_prefix" maxlength="250" name="openid_prefix" type="text"
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_p
refix %>">
+ value="<%= Rails.configuration.
Workbench.DefaultOpenIdP
refix %>">
<% end %>
</div>
<% end %>
</div>
- <div class="form-group">
- <label for="repo_name">Repository Name and Shell Login</label>
- <input class="form-control" id="repo_name" maxlength="250" name="repo_name" type="text" value="<%=selected_repo%>">
- </div>
<div class="form-group">
<label for="vm_uuid">Virtual Machine</label>
<select class="form-control" name="vm_uuid">
<div class="form-group">
<label for="vm_uuid">Virtual Machine</label>
<select class="form-control" name="vm_uuid">