Browse files

templates refactored to be more flexible and easier to use

  • Loading branch information...
1 parent 2844baf commit 0ac9004d97d763d9c26f15d10b608d43408fbf74 @barszczmm committed Mar 13, 2012
View
13 userena/templates/userena/activate_fail.html
@@ -1,10 +1,9 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Account activation failed." %}{% endblock %}
-{% block content_title %}<h2>{% trans "Your account could not be activated..." %}</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "Your account could not be activated. This could be because your activation link has aged." %}</p>
-<p>{% trans "Please try signing up again or contact us if you think something went wrong." %}</p>
+{% block userena_title %}{% trans "Account activation failed." %}{% endblock %}
+{% block userena_content_title %}{% trans "Your account could not be activated..." %}{% endblock %}
+{% block userena_content %}
+ <p>{% trans "Your account could not be activated. This could be because your activation link has aged." %}</p>
+ <p>{% trans "Please try signing up again or contact us if you think something went wrong." %}</p>
{% endblock %}
View
5 userena/templates/userena/base.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block title %}{% block userena_title %}{% endblock %}{% endblock %}
+{% block content_title %}{% block userena_content_title %}{% endblock %}{% endblock %}
+{% block content %}{% block userena_content %}{% endblock %}{% endblock %}
View
1 userena/templates/userena/base_userena.html
@@ -1 +0,0 @@
-{% extends "base.html" %}
View
14 userena/templates/userena/disabled.html
@@ -1,9 +1,9 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Disabled account" %}{% endblock %}
-{% block content_title %}<h2>{% trans "Your account has been disabled" %}</h2>{% endblock %}
-{% block content %}
-<p>{% trans "It seems your account has been disabled." %}</p>
-<p>{% trans "If you feel that injustice has been done to you, feel free to contact the administrators to find out why" %}</p>
-{% endblock %}
+{% block userena_title %}{% trans "Disabled account" %}{% endblock %}
+{% block userena_content_title %}{% trans "Your account has been disabled" %}{% endblock %}
+{% block userena_content %}
+ <p>{% trans "It seems your account has been disabled." %}</p>
+ <p>{% trans "If you feel that injustice has been done to you, feel free to contact the administrators to find out why" %}</p>
+{% endblock %}
View
13 userena/templates/userena/email_change_complete.html
@@ -1,10 +1,9 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Email verification" %}{% endblock %}
-{% block content_title %}<h2>{% trans 'Confirm your new email' %}</h2>{% endblock %}
-
-{% block content %}
-<p>{% blocktrans with viewed_user.userena_signup.email_unconfirmed as email %}You have received an email at {{ email }}.{% endblocktrans %}</p>
-<p>{% blocktrans with viewed_user.username as username %}To associate this email address with your account ({{ username }}) click on the link provided in this email.{% endblocktrans %}</p>
+{% block userena_title %}{% trans "Email verification" %}{% endblock %}
+{% block userena_content_title %}{% trans 'Confirm your new email' %}{% endblock %}
+{% block userena_content %}
+ <p>{% blocktrans with viewed_user.userena_signup.email_unconfirmed as email %}You have received an email at {{ email }}.{% endblocktrans %}</p>
+ <p>{% blocktrans with viewed_user.username as username %}To associate this email address with your account ({{ username }}) click on the link provided in this email.{% endblocktrans %}</p>
{% endblock %}
View
11 userena/templates/userena/email_confirm_complete.html
@@ -1,9 +1,8 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Email changed!" %}{% endblock %}
-
-{% block content_title %}<h2>{% trans 'New email' %}</h2>{% endblock %}
-{% block content %}
-<p>{% blocktrans with site.name as site %}Your new email address is saved. You can continue using {{ site }} with this email.{% endblocktrans %}</p>
+{% block userena_title %}{% trans "Email changed!" %}{% endblock %}
+{% block userena_content_title %}{% trans 'New email' %}{% endblock %}
+{% block userena_content %}
+ <p>{% blocktrans with site.name as site %}Your new email address is saved. You can continue using {{ site }} with this email.{% endblocktrans %}</p>
{% endblock %}
View
13 userena/templates/userena/email_confirm_fail.html
@@ -1,10 +1,9 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Email verification failed." %}{% endblock %}
-{% block content_title %}<h2>{% trans "Your email could not be verified..." %}</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "Your email could not be verified..." %}</p>
-<p>{% trans "You could try changing it again in your account settings." %}</p>
+{% block userena_title %}{% trans "Email verification failed." %}{% endblock %}
+{% block userena_content_title %}{% trans "Your email could not be verified..." %}{% endblock %}
+{% block userena_content %}
+ <p>{% trans "Your email could not be verified..." %}</p>
+ <p>{% trans "You could try changing it again in your account settings." %}</p>
{% endblock %}
View
28 userena/templates/userena/email_form.html
@@ -1,21 +1,13 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block content_title %}<h2>{% blocktrans with user.username as username %}Account &raquo; {{ username }}{% endblocktrans %}</h2>{% endblock %}
-
-{% block content %}
-<form action="" method="post">
- <ul id="box-nav">
- <li class="first"><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
- <li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
- <li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
- <li class="last selected"><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
- </ul>
- {% csrf_token %}
- <fieldset>
- <legend>{% trans "Change email address" %}</legend>
- {{ form.as_p }}
- </fieldset>
- <input type="submit" value="{% trans "Change email" %}" />
-</form>
+{% block userena_title %}{% trans "Change email address" %}{% endblock %}
+{% block userena_content_title %}{% trans "Change email address" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="email_change_form">{% csrf_token %}
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <input type="submit" value="{% trans "Change email" %}" />
+ </form>
{% endblock %}
View
11 userena/templates/userena/password_complete.html
@@ -1,9 +1,8 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Password changed" %}{% endblock %}
-{% block content_title %}<h2>{% trans "Your password has been changed" %}.</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "From now on you can use your new password to signin" %}.</p>
+{% block userena_title %}{% trans "Password changed" %}{% endblock %}
+{% block userena_content_title %}{% trans "Your password has been changed" %}.{% endblock %}
+{% block userena_content %}
+ <p>{% trans "From now on you can use your new password to signin" %}.</p>
{% endblock %}
View
30 userena/templates/userena/password_form.html
@@ -1,23 +1,13 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Change password" %}{% endblock %}
-
-{% block content_title %}<h2>{% blocktrans with user.username as username %}Account &raquo; {{ username }}{% endblocktrans %}</h2>{% endblock %}
-
-{% block content %}
-<form action="" method="post" id="password_change_form">
- <ul id="box-nav">
- <li class="first"><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
- <li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
- <li class="selected"><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
- <li class="last"><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
- </ul>
- <fieldset>
- <legend>{% trans "Change Password" %}</legend>
- {% csrf_token %}
- {{ form.as_p }}
- </fieldset>
- <input type="submit" value="{% trans "Change password" %}" />
-</form>
+{% block userena_title %}{% trans "Change password" %}{% endblock %}
+{% block userena_content_title %}{% trans "Change password" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="password_change_form">{% csrf_token %}
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <input type="submit" value="{% trans "Change password" %}" />
+ </form>
{% endblock %}
View
11 userena/templates/userena/password_reset_complete.html
@@ -1,8 +1,9 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Password reset" %}{% endblock %}
-{% block content_title %}<h2>{% trans "Your password has been reset" %}</h2>{% endblock %}
-{% block content %}
-{% blocktrans %}You can now <a href="{{ signin_url }}">signin</a> with your new password.{% endblocktrans %}
+{% block userena_title %}{% trans "Password reset" %}{% endblock %}
+{% block userena_content_title %}{% trans "Your password has been reset" %}{% endblock %}
+{% block userena_content %}
+ {% url userena_signin as signin_url %}
+ {% blocktrans %}You can now <a href="{{ signin_url }}">signin</a> with your new password.{% endblocktrans %}
{% endblock %}
View
22 userena/templates/userena/password_reset_confirm_form.html
@@ -1,15 +1,13 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Reset password" %}{% endblock %}
-
-{% block content %}
-<form action="" method="post">
- <fieldset>
- <legend>{% trans "Reset Password" %}</legend>
- {% csrf_token %}
- {{ form.as_p }}
- </fieldset>
- <input type="submit" value="{% trans "Reset password" %}" />
-</form>
+{% block userena_title %}{% trans "Reset password" %}{% endblock %}
+{% block userena_content_title %}{% trans "Reset password" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="password_reset_confirm_form">{% csrf_token %}
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <input type="submit" value="{% trans "Reset password" %}" />
+ </form>
{% endblock %}
View
11 userena/templates/userena/password_reset_done.html
@@ -1,9 +1,8 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Password reset email sent" %}{% endblock %}
-{% block content_title %}<h2>{% trans "Password reset email sent" %}</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "An e-mail has been sent to you which explains how to reset your password." %}</p>
+{% block userena_title %}{% trans "Password reset email sent" %}{% endblock %}
+{% block userena_content_title %}{% trans "Password reset email sent" %}{% endblock %}
+{% block userena_content %}
+ <p>{% trans "An e-mail has been sent to you which explains how to reset your password." %}</p>
{% endblock %}
View
22 userena/templates/userena/password_reset_form.html
@@ -1,15 +1,13 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Reset password" %}{% endblock %}
-
-{% block content %}
-<form action="" method="post">
- <fieldset>
- <legend>{% trans "Reset Password" %}</legend>
- {% csrf_token %}
- {{ form.as_p }}
- </fieldset>
- <input type="submit" value="{% trans "Send password" %}" />
-</form>
+{% block userena_title %}{% trans "Reset password" %}{% endblock %}
+{% block userena_content_title %}{% trans "Reset password" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="password_reset_form">{% csrf_token %}
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <input type="submit" value="{% trans "Reset password" %}" />
+ </form>
{% endblock %}
View
52 userena/templates/userena/profile_detail.html
@@ -1,42 +1,16 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% blocktrans with profile.user.username as username %}{{ username }}'s profile.{% endblocktrans %}{% endblock %}
-{% block content_title %}<h2>{{ profile.user.username }} {% if profile.user.get_full_name %}({{ profile.user.get_full_name }}){% endif %}</h2>{% endblock %}
-
-{% block content %}
-<div class="white-box">
-
- {% comment %}Dirty hack. Will use django-guardian in the future.{% endcomment %}
- {% if user.username == profile.user.username %}
- <ul id="box-nav">
- <li><a href="{% url userena_profile_detail user.username %}">{% trans "View profile" %} &raquo;</a></li>
- <li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit details" %} &raquo;</a></li>
- <li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %} &raquo;</a></li>
- <li><a href="{% url userena_email_change user.username %}">{% trans "Change email" %} &raquo;</a></li>
- </ul>
- {% endif %}
-
- <div id="details">
- <img src="{{ profile.get_mugshot_url }}" alt="{% trans "Your mugshot" %}" />
- {% if profile.user.get_full_name %}
- <p><strong>{% trans "Name" %}</strong><br /> {{ profile.user.get_full_name }}</p>
- {% endif %}
- {% if profile.user.email %}
- <p><strong>{% trans "Email" %}</strong><br />{{ profile.user.email }}</p>
- {% endif %}
- {% if profile.age %}
- <p><strong>{% trans "Age" %}</strong><br /> {{ profile.age }}</p>
- {% endif %}
- {% if profile.website %}
- <p><strong>{% trans "Website" %}</strong><br /> <a href="{{ profile.website }}">{{ profile.website }}</a></p>
- {% endif %}
- {% if profile.location %}
- <p><strong>{% trans "Location" %}</strong><br />{{ profile.location }}</p>
- {% endif %}
- {% if profile.about_me %}
- <p><strong>{% trans "About me" %}</strong><br />{{ profile.about_me }}</p>
- {% endif %}
- </div>
-</div>
+{% block userena_title %}{% blocktrans with profile.user.username as username %}{{ username }}'s profile{% endblocktrans %}{% endblock %}
+{% block userena_content_title %}{{ profile.user.username }} {% if profile.user.get_full_name %}({{ profile.user.get_full_name }}){% endif %}{% endblock %}
+{% block userena_content %}
+ <div id="profile_detail">
+ <img src="{{ profile.get_mugshot_url }}" alt="{{ profile.user.username }}" />
+ {% if profile.user.get_full_name %}
+ <p><strong>{% trans "Name" %}</strong><br /> {{ profile.user.get_full_name }}</p>
+ {% endif %}
+ {% if profile.user.email %}
+ <p><strong>{% trans "Email" %}</strong><br />{{ profile.user.email }}</p>
+ {% endif %}
+ </div>
{% endblock %}
View
31 userena/templates/userena/profile_form.html
@@ -1,24 +1,13 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Account setup" %}{% endblock %}
-
-{% block content_title %}<h2>{% blocktrans with profile.user.username as username %}Account &raquo; {{ username }}{% endblocktrans %}</h2>{% endblock %}
-
-{% block content %}
-
-<form action="" enctype="multipart/form-data" method="post">
- <ul id="box-nav">
- <li class="first"><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
- <li class="selected"><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
- <li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
- <li class="last"><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
- </ul>
- {% csrf_token %}
- <fieldset>
- <legend>{% trans "Edit Profile" %}</legend>
- {{ form.as_p }}
- </fieldset>
- <input type="submit" value="{% trans "Save changes" %}" />
-</form>
+{% block userena_title %}{% trans "Edit profile" %}{% endblock %}
+{% block userena_content_title %}{% trans "Edit profile" %}{% endblock %}
+{% block userena_content %}
+ <form action="" enctype="multipart/form-data" method="post" id="profile_form">{% csrf_token %}
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <input type="submit" value="{% trans "Save changes" %}" />
+ </form>
{% endblock %}
View
57 userena/templates/userena/profile_list.html
@@ -1,36 +1,33 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block content_title %}<h2>{% trans 'Profiles' %}</h2>{% endblock %}
+{% block userena_title %}{% trans 'Profiles' %}{% endblock %}
+{% block userena_content_title %}{% trans 'Profiles' %}{% endblock %}
+{% block userena_content %}
+ <ul id="profile_list">
+ {% for profile in profile_list %}
+ <li>
+ <a href="{% url userena_profile_detail profile.user.username %}"><img src="{{ profile.get_mugshot_url }}" /></a>
+ <a href="{% url userena_profile_detail profile.user.username %}">{{ profile.user.username }}</a>
+ </li>
+ {% endfor %}
+ </ul>
-{% block content %}
-<ul id="profile_list">
- {% for profile in profile_list %}
- <li>
- <a href="{% url userena_profile_detail profile.user.username %}"><img src="{{ profile.get_mugshot_url }}" /></a>
- <a href="{% url userena_profile_detail profile.user.username %}">{{ profile.user.username }}</a>
- </li>
- {% endfor %}
+ {% if is_paginated %}
+ <div class="pagination">
+ <span class="step-links">
+ {% if page_obj.has_previous %}
+ <a href="{% url userena_profile_list_paginated page_obj.previous_page_number %}">{% trans 'previous' %}</a>
+ {% endif %}
-</ul>
+ <span class="current">
+ {% blocktrans with page_obj.number as page and page_obj.paginator.num_pages as num_pages %}Page {{ page }} of {{ num_pages }}{% endblocktrans %}
+ </span>
-{% if is_paginated %}
-<div class="pagination">
- <span class="step-links">
- {% if page_obj.has_previous %}
- <a href="{% url userena_profile_list_paginated page_obj.previous_page_number %}">{% trans 'previous' %}</a>
- {% endif %}
-
- <span class="current">
- {% blocktrans with page_obj.number as page and page_obj.paginator.num_pages as num_pages %}
- Page {{ page }} of {{ num_pages }}
- {% endblocktrans %}
- </span>
-
- {% if page_obj.has_next %}
- <a href="{% url userena_profile_list_paginated page_obj.next_page_number %}">{% trans 'next' %}</a>
- {% endif %}
- </span>
-</div>
-{% endif %}
+ {% if page_obj.has_next %}
+ <a href="{% url userena_profile_list_paginated page_obj.next_page_number %}">{% trans 'next' %}</a>
+ {% endif %}
+ </span>
+ </div>
+ {% endif %}
{% endblock %}
View
54 userena/templates/userena/signin_form.html
@@ -1,31 +1,29 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Signin" %}{% endblock %}
-
-{% block content %}
-<form action="" method="post">
- {% csrf_token %}
- <fieldset>
- <legend>{% trans "Signin" %}</legend>
- {{ form.non_field_errors }}
- {% for field in form %}
- {{ field.errors }}
- {% comment %} Displaying checkboxes differently {% endcomment %}
- {% if field.name == 'remember_me' %}
- <p class="checkbox">
- <label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
- </p>
- {% else %}
- <p>
- {{ field.label_tag }}
- {{ field }}
- </p>
- {% endif %}
- {% endfor %}
- </fieldset>
- <input type="submit" value="{% trans "Signin" %}" />
- <p class="forgot-password"><a href="{% url userena_password_reset %}" title="{% trans "Forgot your password?" %}">{% trans "Forgot your password?" %}</a></p>
- {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
-</form>
+{% block userena_title %}{% trans "Signin" %}{% endblock %}
+{% block userena_content_title %}{% trans "Signin" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="signin_form">{% csrf_token %}
+ <fieldset>
+ {{ form.non_field_errors }}
+ {% for field in form %}
+ {{ field.errors }}
+ {% comment %} Displaying checkboxes differently {% endcomment %}
+ {% if field.name == 'remember_me' %}
+ <p class="checkbox">
+ <label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
+ </p>
+ {% else %}
+ <p>
+ {{ field.label_tag }}
+ {{ field }}
+ </p>
+ {% endif %}
+ {% endfor %}
+ </fieldset>
+ <input type="submit" value="{% trans "Signin" %}" />
+ <p class="forgot-password"><a href="{% url userena_password_reset %}" title="{% trans "Forgot your password?" %}">{% trans "Forgot your password?" %}</a></p>
+ {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+ </form>
{% endblock %}
View
11 userena/templates/userena/signout.html
@@ -1,9 +1,8 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Signed out" %}{% endblock %}
-{% block content_title %}<h2>{% trans "You have been signed out" %}.</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "You have been signed out. Till we meet again." %}</p>
+{% block userena_title %}{% trans "Signed out" %}{% endblock %}
+{% block userena_content_title %}{% trans "You have been signed out" %}.{% endblock %}
+{% block userena_content %}
+ <p>{% trans "You have been signed out. Till we meet again." %}</p>
{% endblock %}
View
25 userena/templates/userena/signup_complete.html
@@ -1,17 +1,14 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Signup almost done!" %}{% endblock %}
-
-{% block content_title %}<h2>{% trans "Signup" %}</h2>{% endblock %}
-
-{% block content %}
-<p>{% trans "Thank you for signing up with us!" %}</p>
-
-{% if userena_activation_required %}
-<p>{% blocktrans %}You have been sent an e-mail with an activation link to the supplied email.{% endblocktrans %}</p>
-<p>{% blocktrans %}We will store your signup information for {{ userena_activation_days }} days on our server. {% endblocktrans %}</p>
-{% else %}
-<p>{% blocktrans %}You can now use the supplied credentials to signin.{% endblocktrans %}</p>
-{% endif %}
+{% block userena_title %}{% trans "Signup almost done!" %}{% endblock %}
+{% block userena_content_title %}{% trans "Signup" %}{% endblock %}
+{% block userena_content %}
+ <p>{% trans "Thank you for signing up with us!" %}</p>
+ {% if userena_activation_required %}
+ <p>{% blocktrans %}You have been sent an e-mail with an activation link to the supplied email.{% endblocktrans %}</p>
+ <p>{% blocktrans %}We will store your signup information for {{ userena_activation_days }} days on our server. {% endblocktrans %}</p>
+ {% else %}
+ <p>{% blocktrans %}You can now use the supplied credentials to signin.{% endblocktrans %}</p>
+ {% endif %}
{% endblock %}
View
48 userena/templates/userena/signup_form.html
@@ -1,28 +1,26 @@
-{% extends 'userena/base_userena.html' %}
+{% extends 'userena/base.html' %}
{% load i18n %}
-{% block title %}{% trans "Signup" %}{% endblock %}
-
-{% block content %}
-<form action="" method="post">
- {% csrf_token %}
- <fieldset>
- <legend>{% trans "Signup" %}</legend>
- {% for field in form %}
- {{ field.errors }}
- {% comment %} Displaying checkboxes differently {% endcomment %}
- {% if field.name == 'tos' %}
- <p class="checkbox">
- <label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
- </p>
- {% else %}
- <p>
- {{ field.label_tag }}
- {{ field }}
- </p>
- {% endif %}
- {% endfor %}
- </fieldset>
- <input type="submit" value="{% trans "Signup"%}" />
-</form>
+{% block userena_title %}{% trans "Signup" %}{% endblock %}
+{% block userena_content_title %}{% trans "Signup" %}{% endblock %}
+{% block userena_content %}
+ <form action="" method="post" id="signup_form">{% csrf_token %}
+ <fieldset>
+ {% for field in form %}
+ {{ field.errors }}
+ {% comment %} Displaying checkboxes differently {% endcomment %}
+ {% if field.name == 'tos' %}
+ <p class="checkbox">
+ <label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
+ </p>
+ {% else %}
+ <p>
+ {{ field.label_tag }}
+ {{ field }}
+ </p>
+ {% endif %}
+ {% endfor %}
+ </fieldset>
+ <input type="submit" value="{% trans "Signup"%}" />
+ </form>
{% endblock %}

0 comments on commit 0ac9004

Please sign in to comment.