EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Gluejar/regluit

pull/1/head
Ed Summers 2011-09-30 01:01:33 +00:00
parent dea578e019 1fe7bf3dc9
commit ce080f893e
7 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/templates/base.html
View File

@ -1,4 +1,6 @@
<!DOCTYPE html>
{# raw url references raise test errors in tests for django registration; this is a workaround #}
{% url privacy as privacyurl %}
<html>
<head>
<title>unglue.it {% block title %}{% endblock %}</title>
@ -44,7 +46,7 @@
<div id="footer">
<ul class="menu">
<li><a href="{% url privacy %}"><span>Privacy</span></a></li>
<li><a href="{{privacyurl}}"><span>Privacy</span></a></li>
</ul>
</div>

7
frontend/templates/registration/activation_complete.html
View File

@ -2,7 +2,12 @@
{% block title %}Activation complete{% endblock %}
{% block content %}
<div id="registration">
Thanks, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.
Thanks, your activation is complete! You may now sign in using the username and password you set at registration:
{% include "login_form.html" %}
<a href="{% url auth_password_reset %}">Already forgot</a> your password?
</div>
{% endblock %}

21
frontend/templates/registration/login.html
View File

@ -10,26 +10,7 @@
<h3>Login to your account:</h3>
<form method="post" action="{% url django.contrib.auth.views.login %}">{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="login" /></td>
</tr>
</table>
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
</form>
{% include "login_form.html" %}
<p>
<br>
<br>

20
frontend/templates/registration/login_form.html Normal file
View File

@ -0,0 +1,20 @@
<!-- login_form.html -->
<form method="post" action="{% url django.contrib.auth.views.login %}">{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="login" /></td>
</tr>
</table>
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
</form>

2
frontend/templates/registration/registration_closed.html Normal file
View File

@ -0,0 +1,2 @@
<!-- template needed only to pass tests -->

2
frontend/templates/registration/test_template_name.html Normal file
View File

@ -0,0 +1,2 @@
<!-- template needed only to pass tests -->

2
urls.py
View File

@ -1,6 +1,8 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('',
url(r'^accounts/activate/complete/$','django.contrib.auth.views.login',
{'template_name': 'registration/activation_complete.html'}),
(r'^accounts/', include('registration.backends.default.urls')),
(r'^socialauth/', include('social_auth.urls')),
(r'^api/', include('regluit.api.urls')),