Sergey Maranchuk avatar Sergey Maranchuk committed 6a3ccf8

added activation_complete.html; drop some magic from urls

Comments (0)

Files changed (3)

basic_project/templates/registration/activate.html

-{% extends "djangobb_forum/base.html" %}
-{% load i18n %}
-
-{% block head %}
-{% endblock %}
-
-{% block content %}
-<div class="blockform">
-    <h2><span>{% trans "Activation" %}</span></h2>
-    <div class="box">
-            <p>{% trans 'Your account is now activated.' %}</p>
-        </div>
-</div>
-{% endblock %}

basic_project/templates/registration/activation_complete.html

+{% extends "djangobb_forum/base.html" %}
+{% load i18n %}
+
+{% block head %}
+{% endblock %}
+
+{% block content %}
+<div class="blockform">
+    <h2><span>{% trans "Activation" %}</span></h2>
+    <div class="box">
+            <p>{% trans 'Your account is now activated.' %}</p>
+        </div>
+</div>
+{% endblock %}

basic_project/urls.py

 from forms import RegistrationFormUtfUsername
 from djangobb_forum import settings as forum_settings
 
-# HACK for add default_params with RegistrationFormUtfUsername and backend to registration urlpattern
-# Must be changed after django-authopenid #50 (signup-page-does-not-work-whih-django-registration)
-# will be fixed
-from django_authopenid.urls import urlpatterns as authopenid_urlpatterns
-for i, rurl in enumerate(authopenid_urlpatterns):
-    if rurl.name == 'registration_register':
-        authopenid_urlpatterns[i].default_args.update({'form_class': RegistrationFormUtfUsername,
-                                                  'backend': 'registration.backends.default.DefaultBackend'})
-    elif rurl.name == 'registration_activate':
-                authopenid_urlpatterns[i].default_args = {'backend': 'registration.backends.default.DefaultBackend'}
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
     # Admin
     (r'^admin/', include(admin.site.urls)),
-    
+
     # Sitemap
     (r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
-    
+
     # Apps
-    (r'^forum/account/', include(authopenid_urlpatterns)),
+    (r'^forum/account/', include('django_authopenid.urls')),
     (r'^forum/', include('djangobb_forum.urls', namespace='djangobb')),
 )
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.