projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6254: instead of tooltip, use a self explanatory label for groups text field.
[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 a1a664ce838115b875c460cd988d5260490430f1..8097b36c1ef90bb8a4a3f96d10f38fd9c4e97175 100644
(file)
--- a/
apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/
apps/workbench/app/views/users/_setup_popup.html.erb
@@
-23,10
+23,11
@@
<% disable_url_prefix = identity_url_prefix != nil %>
<% selected_repo = @current_selections[:repo_name] %>
<% selected_vm = @current_selections[:vm_uuid] %>
<% disable_url_prefix = identity_url_prefix != nil %>
<% selected_repo = @current_selections[:repo_name] %>
<% 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 %>
@@
-51,16
+52,20
@@
<label for="vm_uuid">Virtual Machine</label>
<select class="form-control" name="vm_uuid">
<option value="" <%= 'selected' unless selected_vm %>>
<label for="vm_uuid">Virtual Machine</label>
<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 (comma separated list)</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">