projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few fixes for workbench in the way it displays the ARVADOS_API_HOST
[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 7757298f9ab43dd1c0013b623e2aab08d04a4b19..4c3a95e87e96080b487875e1e519e30d6da350ff 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">
@@
-6,11
+10,14
@@
<div class="modal-header">
<button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
<div class="modal-header">
<button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
- <h4 class="modal-title">Setup User</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/>
</div>
<div class="modal-body">
</div>
<div class="modal-body">
- <div class="spinner spinner-32px spinner-h-center spinner-v-center" hidden="true"></div>
<% if @object%>
<% uuid = @object.uuid %>
<% email = @object.email %>
<% if @object%>
<% uuid = @object.uuid %>
<% email = @object.email %>
@@
-18,12
+25,12
@@
<% 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] %>
<% selected_vm = @current_selections[:vm_uuid] %>
+ <% groups = @current_selections[:groups] %>
<input id="user_uuid" maxlength="250" name="user_uuid" type="hidden" value="<%=uuid%>">
<div class="form-group">
<input id="user_uuid" maxlength="250" name="user_uuid" type="hidden" value="<%=uuid%>">
<div class="form-group">
- <label for="email">Email</label>
+
<label for="email">Email</label>
<% if disable_email %>
<input class="form-control" id="email" maxlength="250" name="email" type="text" value="<%=email%>" disabled>
<% else %>
<% if disable_email %>
<input class="form-control" id="email" maxlength="250" name="email" type="text" value="<%=email%>" disabled>
<% else %>
@@
-37,32
+44,32
@@
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>
<div class="form-group">
<% end %>
</div>
<div class="form-group">
- <label for="repo_name">Repository Name</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>
+ <label for="vm_uuid">Virtual Machine (optional)</label>
<select class="form-control" name="vm_uuid">
<option value="" <%= 'selected' unless selected_vm %>>
<select class="form-control" name="vm_uuid">
<option value="" <%= 'selected' unless selected_vm %>>
- Choose One:
- </option>
+
Choose One:
+
</option>
<% @vms.each do |vm| %>
<option value="<%=vm.uuid%>"
<% @vms.each do |vm| %>
<option value="<%=vm.uuid%>"
-
<%= 'selected' if selected_vm == vm.uuid %>>
- <%= vm.hostname %>
- </option>
+ <%= 'selected' if selected_vm == vm.uuid %>>
+
<%= vm.hostname %>
+
</option>
<% end %>
</select>
</div>
<% end %>
</select>
</div>
+ <div class="groups-group">
+ <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>
<div class="modal-footer">
</div>
<div class="modal-footer">
- <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
<button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+ <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
</div>
<% end #form %>
</div>
<% end #form %>