Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beat.web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
beat
beat.web
Commits
e47d4ede
Commit
e47d4ede
authored
4 years ago
by
André Anjos
Browse files
Options
Downloads
Plain Diff
Merge branch '549_fix_supervision_lists_expand' into 'master'
Fix supervision lists expand Closes
#549
See merge request
!329
parents
76e4f7ea
c7ca9953
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!329
Fix supervision lists expand
Pipeline
#39698
passed
4 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
beat/web/accounts/static/accounts/css/dialogs.css
+0
-5
0 additions, 5 deletions
beat/web/accounts/static/accounts/css/dialogs.css
beat/web/accounts/templates/accounts/settings.html
+3
-3
3 additions, 3 deletions
beat/web/accounts/templates/accounts/settings.html
with
3 additions
and
8 deletions
beat/web/accounts/static/accounts/css/dialogs.css
+
0
−
5
View file @
e47d4ede
...
@@ -94,8 +94,3 @@ div.change_supervisor span.documentation
...
@@ -94,8 +94,3 @@ div.change_supervisor span.documentation
padding-top
:
0em
;
padding-top
:
0em
;
padding-bottom
:
0em
;
padding-bottom
:
0em
;
}
}
#grant_access_inside
{
margin-left
:
45em
;
}
This diff is collapsed.
Click to expand it.
beat/web/accounts/templates/accounts/settings.html
+
3
−
3
View file @
e47d4ede
...
@@ -501,11 +501,11 @@ You can remind them to revalidate their account before the expiration date or el
...
@@ -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 %}
{% if supervisors_pending|length > 0 or supervisiontracks_supervisors_valid|length > 0 %}
<div
class=
"row"
>
<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 panel-default"
>
<div
class=
"panel-heading"
><i
class=
"fa fa-users"
></i>
Management of Supervisors
<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>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<form
id=
"token"
method=
"post"
action=
""
class=
"form"
>
<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
...
@@ -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 %}
{% if supervisiontracks_pending|length > 0 or supervisiontracks_valid|length > 0 %}
<div
class=
"row"
>
<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 panel-default"
>
<div
class=
"panel-heading"
><i
class=
"fa fa-users"
></i>
Management of Supervisees
<div
class=
"panel-heading"
><i
class=
"fa fa-users"
></i>
Management of Supervisees
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment