Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
a1c1b476
Commit
a1c1b476
authored
Feb 19, 2020
by
Sébastiaan Versteeg
Browse files
Merge branch '968-login-message-visible' into 'master'
Fixed login message visible Closes
#968
See merge request
!1500
parents
7a75101d
18dbb11a
Changes
1
Show whitespace changes
Inline
Side-by-side
website/events/templates/events/event.html
View file @
a1c1b476
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
onclick=
"return confirm('{% trans 'Are you sure you want to cancel your registration?' %}');"
/>
onclick=
"return confirm('{% trans 'Are you sure you want to cancel your registration?' %}');"
/>
{% endif %}
{% endif %}
</form>
</form>
{% elif request.user.is_authenticated
is False
%}
{% elif
not
request.user.is_authenticated
and event.registration_required
%}
<a
class=
"btn btn-primary"
<a
class=
"btn btn-primary"
href=
"{% url 'login' %}?next={{ request.path }}"
>
{% trans "Login" %}
</a>
href=
"{% url 'login' %}?next={{ request.path }}"
>
{% trans "Login" %}
</a>
{% endif %}
{% endif %}
...
@@ -204,7 +204,7 @@
...
@@ -204,7 +204,7 @@
</td>
</td>
<td>
<td>
<em>
<em>
{% if not request.user.is_authenticated %}
{% if not request.user.is_authenticated
and event.registration_required
%}
{% trans "You have to log in before you can register for this event." %}
{% trans "You have to log in before you can register for this event." %}
{% else %}
{% else %}
{% if not event.registration_required %}
{% if not event.registration_required %}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment