Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
218
Issue boards
Milestones
Code
Merge requests
70
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Merge requests
!233
Resolve "Show error message if permission denied"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Show error message if permission denied"
211-show-error-message-if-permission-denied
into
master
Overview
0
Commits
1
Pipelines
2
Changes
1
Merged
Jonathan Weth
requested to merge
211-show-error-message-if-permission-denied
into
master
4 years ago
Overview
0
Commits
1
Pipelines
2
Changes
1
Expand
Closes
#211 (closed)
Edited
4 years ago
by
Jonathan Weth
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
290bc06a
1 commit,
4 years ago
1 file
+
30
−
21
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
aleksis/core/templates/two_factor/core/login.html
+
30
−
21
Options
@@ -9,29 +9,38 @@
{% block content %}
<h4>
{% trans "Login" %}
</h4>
<div
class=
"alert primary"
>
<p>
<i
class=
"material-icons left"
>
info
</i>
{% if wizard.steps.current == "auth" and user.is_authenticated %}
<div
class=
"alert warning"
>
<p>
<i
class=
"material-icons left"
>
warning
</i>
{% blocktrans %}You have no permission to view this page. Please login with an other account.{% endblocktrans %}
</p>
</div>
{% else %}
<div
class=
"alert primary"
>
<p>
<i
class=
"material-icons left"
>
info
</i>
{% if wizard.steps.current == 'auth' %}
{% blocktrans %}Enter your credentials.{% endblocktrans %}
{% elif wizard.steps.current == 'token' %}
{% if device.method == 'call' %}
{% blocktrans %}We are calling your phone right now, please enter the
digits you hear.{% endblocktrans %}
{% elif device.method == 'sms' %}
{% blocktrans %}We sent you a text message, please enter the tokens we
sent.{% endblocktrans %}
{% else %}
{% blocktrans %}Please enter the tokens generated by your token
generator.{% endblocktrans %}
{% if wizard.steps.current == 'auth' %}
{% blocktrans %}Please login to see this page.{% endblocktrans %}
{% elif wizard.steps.current == 'token' %}
{% if device.method == 'call' %}
{% blocktrans %}We are calling your phone right now, please enter the
digits you hear.{% endblocktrans %}
{% elif device.method == 'sms' %}
{% blocktrans %}We sent you a text message, please enter the tokens we
sent.{% endblocktrans %}
{% else %}
{% blocktrans %}Please enter the tokens generated by your token
generator.{% endblocktrans %}
{% endif %}
{% elif wizard.steps.current == 'backup' %}
{% blocktrans %}Use this form for entering backup tokens for logging in.
These tokens have been generated for you to print and keep safe. Please
enter one of these backup tokens to login to your account.{% endblocktrans %}
{% endif %}
{% elif wizard.steps.current == 'backup' %}
{% blocktrans %}Use this form for entering backup tokens for logging in.
These tokens have been generated for you to print and keep safe. Please
enter one of these backup tokens to login to your account.{% endblocktrans %}
{% endif %}
</div>
</div>
{% endif %}
<form
action=
""
method=
"post"
>
Loading