[ARVADOS] updated: 1.3.0-1835-g5e8235cf2
Git user
git at public.curoverse.com
Thu Nov 7 17:01:35 UTC 2019
Summary of changes:
apps/workbench/app/controllers/users_controller.rb | 2 +-
.../app/views/users/_setup_popup.html.erb | 6 ++---
.../workbench/app/views/users/_show_admin.html.erb | 30 ++++++++++------------
3 files changed, 17 insertions(+), 21 deletions(-)
via 5e8235cf2b61e0a44c2f74c227fdcf47fa1e5b37 (commit)
from a185309d194bb3073a5efb67d7a56a10b4a980a5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5e8235cf2b61e0a44c2f74c227fdcf47fa1e5b37
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Nov 7 11:11:18 2019 -0500
15803: Adjust workbench1 user panel to promote setup/unsetup buttons
"Admin" tab now is first (and the first one to be displayed).
"Setup user" text/button/dialog box is no longer specific to setting
up shell accounts, and doesn't imply that setting up a VM is required.
Move "Log in" button to the bottom so Setup and deactivate buttons are
more prominent.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index febd6e3a1..27fc12bf4 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -124,7 +124,7 @@ class UsersController < ApplicationController
def show_pane_list
if current_user.andand.is_admin
- super | %w(Admin)
+ %w(Admin) | super
else
super
end
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index d6f25136c..4c3a95e87 100644
--- 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">×</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/>
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
<% 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>
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index ddff79be0..1219ec3cf 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -4,35 +4,31 @@ SPDX-License-Identifier: AGPL-3.0 %>
<div class="row">
<div class="col-md-6">
- <p>
- As an admin, you can log in as this user. When you’ve
- finished, you will need to log out and log in again with your
- own account.
- </p>
-
- <blockquote>
- <%= button_to "Log in as #{@object.full_name}", sudo_user_url(id: @object.uuid), class: 'btn btn-primary' %>
- </blockquote>
<p>
- As an admin, you can setup a shell account for this user.
+ This button sets up an inactive user. After setup, they will be able to log in.
+ This dialog bog also allows you to optionally setup a shell account for this user.
The login name is automatically generated from the user's e-mail address.
</p>
- <blockquote>
- <%= link_to "Setup shell account #{'for ' if @object.full_name.present?} #{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#user-setup-modal-window'} %>
- </blockquote>
+ <%= link_to "Setup account #{'for ' if @object.full_name.present?} #{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#user-setup-modal-window'} %>
- <p>
+ <p style="margin-top: 3em">
As an admin, you can deactivate and reset this user. This will
remove all repository/VM permissions for the user. If you
"setup" the user again, the user will have to sign the user
agreement again.
</p>
- <blockquote>
- <%= button_to "Deactivate #{@object.full_name}", unsetup_user_url(id: @object.uuid), class: 'btn btn-primary', data: {confirm: "Are you sure you want to deactivate #{@object.full_name}?"} %>
- </blockquote>
+ <%= button_to "Deactivate #{@object.full_name}", unsetup_user_url(id: @object.uuid), class: 'btn btn-primary', data: {confirm: "Are you sure you want to deactivate #{@object.full_name}?"} %>
+
+ <p style="margin-top: 3em">
+ As an admin, you can log in as this user. When you’ve
+ finished, you will need to log out and log in again with your
+ own account.
+ </p>
+
+ <%= button_to "Log in as #{@object.full_name}", sudo_user_url(id: @object.uuid), class: 'btn btn-primary' %>
</div>
<div class="col-md-6">
<div class="panel panel-default">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list