widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #16269
[Merge] lp:~widelands-dev/widelands-website/post_registration_cleanup into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/post_registration_cleanup into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/post_registration_cleanup/+merge/364274
The latest server errors occur because:
1. I have overlooked renaming a template, so it was missing
2. Added the missing template as a new template... this was accidentally done this morning on alpha instead of wl.widelands.org. Took me two hours to find this mistake :D
So this branch is just a small cleanup.
- removed a (now) unused template
- fixed a url
To be clear i have also checked if registering is working, and the result is fine.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/post_registration_cleanup into lp:widelands-website.
=== removed file 'templates/django_registration/activate.html'
--- templates/django_registration/activate.html 2019-03-06 16:37:05 +0000
+++ templates/django_registration/activate.html 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-{% extends "mainpage/base.html" %}
-{% comment %}
-vim:ft=htmldjango:
-{% endcomment %}
-
-{% block title %}
-Activation - {{ block.super }}
-{% endblock %}
-
-{% block content_header %}
- <h1>Activation</h1>
-{% endblock %}
-
-{% block content_main %}
-<div class="blogEntry">
- <p class="errormessage">
- An error occured: Either this account has already been activated or activation key is invalid.<br />
- Try <a href="{% url 'login' %}">logging in</a>.
- </p>
-</div>
-{% endblock %}
=== modified file 'templates/django_registration/activation_failed.html'
--- templates/django_registration/activation_failed.html 2019-03-11 06:23:17 +0000
+++ templates/django_registration/activation_failed.html 2019-03-11 19:58:28 +0000
@@ -13,5 +13,8 @@
<p>
An error occured during activation: {{ activation_error.message }}
</p>
+ <p>
+ You can try to <a href="{% url 'login' %}">log in</a>.
+ </p>
</div>
{% endblock %}
=== modified file 'urls.py'
--- urls.py 2019-03-03 15:17:58 +0000
+++ urls.py 2019-03-11 19:58:28 +0000
@@ -25,7 +25,7 @@
url(r'^accounts/register/$', RegistrationView.as_view(
form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
url(r'^accounts/', include('django_registration.backends.activation.urls')),
- url('^', include('django.contrib.auth.urls')),
+ url(r'^', include('django.contrib.auth.urls')),
url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),
# Formerly 3rd party
Follow ups