From e382bb904dd457fac0a28d950028241e81e37391 Mon Sep 17 00:00:00 2001 From: Flavio Tarsetti <flavio.tarsetti@idiap.ch> Date: Tue, 5 May 2020 22:53:01 +0200 Subject: [PATCH 1/2] [accounts][templates] update column expansion over full grid --- beat/web/accounts/templates/accounts/settings.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beat/web/accounts/templates/accounts/settings.html b/beat/web/accounts/templates/accounts/settings.html index b0fd7136b..ec23eda7b 100644 --- a/beat/web/accounts/templates/accounts/settings.html +++ b/beat/web/accounts/templates/accounts/settings.html @@ -501,11 +501,11 @@ You can remind them to revalidate their account before the expiration date or el {% if supervisors_pending|length > 0 or supervisiontracks_supervisors_valid|length > 0 %} <div class="row"> - <div class="col-sm-6 col-sm-offset-1"> + <div class="col-md-10 col-sm-offset-1"> <div class="panel panel-default"> <div class="panel-heading"><i class="fa fa-users"></i> Management of Supervisors - <a id="grant_access_inside" class="btn btn-success btn-sm" onclick="beat.accounts.new_supervisor_access('{% url "api_accounts:list_supervisor_candidates" %}', '{% url "api_accounts:update_supervisor_candidate" %}', '{{ request.user.username }}')"><i class="fa fa-plus fa-lg"></i> Grant access</a> + <a id="grant_access_inside" class="btn btn-success btn-sm col-sm-offset-9" onclick="beat.accounts.new_supervisor_access('{% url "api_accounts:list_supervisor_candidates" %}', '{% url "api_accounts:update_supervisor_candidate" %}', '{{ request.user.username }}')"><i class="fa fa-plus fa-lg"></i> Grant access</a> </div> <div class="panel-body"> <form id="token" method="post" action="" class="form"> @@ -619,7 +619,7 @@ You can remind them to revalidate their account before the expiration date or el {% if supervisiontracks_pending|length > 0 or supervisiontracks_valid|length > 0 %} <div class="row"> - <div class="col-sm-6 col-sm-offset-1"> + <div class="col-sm-10 col-sm-offset-1"> <div class="panel panel-default"> <div class="panel-heading"><i class="fa fa-users"></i> Management of Supervisees -- GitLab From c7ca995385005191629f68e84814a68a91a91e0a Mon Sep 17 00:00:00 2001 From: Flavio Tarsetti <flavio.tarsetti@idiap.ch> Date: Tue, 5 May 2020 22:53:55 +0200 Subject: [PATCH 2/2] [accounts][static] remove unused css margin Fixes #549 --- beat/web/accounts/static/accounts/css/dialogs.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/beat/web/accounts/static/accounts/css/dialogs.css b/beat/web/accounts/static/accounts/css/dialogs.css index c4fbebd87..aa0a68a5f 100644 --- a/beat/web/accounts/static/accounts/css/dialogs.css +++ b/beat/web/accounts/static/accounts/css/dialogs.css @@ -94,8 +94,3 @@ div.change_supervisor span.documentation padding-top: 0em; padding-bottom: 0em; } - -#grant_access_inside -{ - margin-left: 45em; -} -- GitLab