Commits

Dimitris Glezos  committed a4f2962

Overhaul of userprofile forms.

  • Participants
  • Parent commits 69ad699

Comments (0)

Files changed (23)

File transifex/templates/userprofile/account/email_validation.html

 {% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% if user.email %}{% trans "E-mail change" %}{% else %}{% trans "Add e-mail" %}{% endif %}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans "Add a new e-mail address" %}</h2>
+    <p>{% trans "Insert the new e-mail address. An e-mail will be send to it for testing and confirmation." %}</p>
+
+    <div class="generic_form">
 	<form action="" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% if user.email %}{% trans "E-mail change" %}{% else %}{% trans "Add e-mail" %}{% endif %}</legend>
-		<label for="id_email">{% trans 'New e-mail address' %}</label>
-		<p>{{ form.email }}
-		{% if form.email.errors %}
-			<span class="quiet red"><br />* {{ form.email.errors|join:"; " }}</span>
-		{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Send confirmation' %}" /></p>
+    <table><tbody>
+	  {% form_as_table_rows form %}
+	</tbody></table>
+
+	<p class="submit"><input type="submit" class="i16 submit" value="{% trans "Change" %}" /></p>
 	</form>
-{% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans "Add e-mail" %}</h3>
-		<p>{% trans "Insert the new e-mail address. An e-mail will be send to it for testing and confirmation" %}.</p>
 	</div>
 {% endblock %}

File transifex/templates/userprofile/account/email_validation_done.html

 {% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans "E-mail validation process" %}</h2>
+    <p>{% url profile_overview as profile_overview %}{% blocktrans %}You can manage the e-mail validation process from the <a href="{{ profile_overview }}"overview page</a>. %}</p>
+
 	<div class="{% if successful %}success{% else %}error{% endif %}">
 	{% if successful %}
-  <p>{% trans "E-mail address validated successfully" %}.</p>
+    <p>{% trans "E-mail address validated successfully." %}</p>
 	{% else %}
-	<p>{% trans "The key you received via e-mail is no longer valid. Please try the e-mail validation process again" %}.</p>
+	<p>{% trans "The key you received via e-mail is no longer valid. Please try the e-mail validation process again." %}</p>
 	{% endif %}
 	</div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "E-mail validation process" %}</h3>
-    <p>{% trans "You can manage the e-mail validation process from the" %} <a href="{% url profile_overview %}">{% trans "overview page" %}.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/account/email_validation_processed.html

 {% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans "Add e-mail" %}</h2>
+    <p>{% trans "Insert the new e-mail address. An e-mail will be send to it for testing and confirmation." %}</p>
+
 	<div class="notice">
 		<h3>{% trans 'E-mail change processed' %}</h3>
-		<p>{% trans "An e-mail has been sent to the new e-mail address to verify and activate it. Please access to your e-mail and complete this process following the instructions specified in the e-mail body" %}.</p>
+		<p>{% trans "An e-mail has been sent to the new e-mail address to verify and activate it. Please access to your e-mail and complete this process following the instructions specified in the e-mail body." %}</p>
 	</div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "Add e-mail" %}</h3>
-    <p>{% trans "Insert the new e-mail address. An e-mail will be send to it for testing and confirmation" %}.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/account/email_validation_reset.html

 {% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% trans "Resend e-mail validation" %}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
-	<form action="" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% trans "Resend e-mail validation" %}</legend>
-		<label for="id_email">{% trans 'Insert your e-mail address' %}</label>
-		<p>{{ form.email }}
-		{% if form.email.errors %}
-			<span class="quiet red"><br />* {{ form.email.errors|join:"; " }}</span>
-		{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Resend confirmation' %}" /></p>
-	</form>
+  <h2>{% trans "Resend e-mail validation" %}</h2>
+  <p>{% trans "If you haven't validated your e-mail address yet you will not be able to login. Insert your registered e-mail address to receive the validation e-mail again." %}</p>
+
+  <div class="generic_form">
+    <form action="" method="post" accept-charset="utf-8">
+    <table><tbody>
+      {% form_as_table_rows form %}
+    </tbody></table>
+    <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Resend confirmation" %}" /></p>
+    </form>
+  </div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans "Resend e-mail validation" %}</h3>
-		<p>{% trans "If you haven't validated your e-mail address yet you will not be able to login. Insert your registered e-mail address to receive the validation e-mail again" %}.</p>
-	</div>
-{% endblock %}

File transifex/templates/userprofile/account/email_validation_reset_response.html

 {% endblock %}
 
 {% block userprofile_content %}
+
+  <h2>{% trans "E-mail validation process" %}</h2>
+    <p>{% trans "You can manage the e-mail validation process from the" %} <a href="{% url profile_overview %}">{% trans "overview page" %}</a>.>
 	<p class="{% ifequal params.action "done" %}success{% else %}notice{% endifequal %} large">
 	{% ifequal params.action "done" %}
-		{% trans "We've e-mailed you the e-mail validation link" %}.
+		{% trans "We've e-mailed you the e-mail validation link." %}
 	{% else %}
 		{% trans 'Your e-mail was already validated' %}. 
 	{% endifequal %}
 	</p>
 {% endblock %}
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "E-mail validation process" %}</h3>
-    <p>{% trans "You can manage the e-mail validation process from the" %} <a href="{% url profile_overview %}">{% trans "overview page" %}</a>.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/account/includes/registration_form.html

 {% load i18n %}
-	<form action="{% url signup %}" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% trans "User registration" %}</legend>
-		<label for="id_username">{% trans "Username" %}</label>
-		<p>{{ form.username }}
-			{% if form.username.errors %}
-				<span class="quiet red"><br />* {{ form.username.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_email">{% trans "E-mail" %}{% if not form.email.field.required %} ({% trans "optional" %}){% endif %}</label>
-		<p>{{ form.email }}
-			{% if form.email.errors %}
-				<span class="quiet red"><br />* {{ form.email.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_password1">{% trans "Password" %}</label>
-		<p>{{ form.password1 }}
-			{% if form.password1.errors %}
-				<span class="quiet red"><br />* {{ form.password1.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_password2">{% trans "Password (again)" %}</label>
-		<p>{{ form.password2 }}
-			{% if form.password2.errors %}
-				<span class="quiet red"><br />* {{ form.password2.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Register' %}" /></p>
-	</form>
-
+{% load txcommontags %}
+  <div class="generic_form">
+    <form action="{% url signup %}" method="post" accept-charset="utf-8">
+    <table>
+        <tbody>
+        {% form_as_table_rows form %}
+        </tbody>
+    </table>
+    <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Register" %}" /></p>
+    </form>
+  </div>

File transifex/templates/userprofile/account/login.html

-{% extends "userprofile/base_2col.html" %}
+w{% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% trans "User login" %}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
-	<form action="{% if next %}?next={{ next }}{% endif %}" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% trans "User login" %}</legend>
-		<label for="id_username">{% trans "Username" %}</label>
-		<p>{{ form.username }}
-			{% if form.username.errors %}
-				<span class="quiet red">{{ form.username.html_error_list }}</span>
-			{% endif %}
-		</p>
-		<label for="id_password">{% trans "Password" %}</label>
-		<p>{{ form.password }}
-			{% if form.password.errors %}
-				<span class="quiet red">{{ form.password.html_error_list }}</span>
-			{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Login' %}" /></p>
-	</form>
+  <h2>{% trans "Login" %}</h2>
+  <p>{% trans "Enter your username and password to login." %}</p>
+    
+  <div class="generic_form">
+    <form action="{% if next %}?next={{ next }}{% endif %}" method="post" accept-charset="utf-8">
+    <fieldset>
+    <table><tbody>
+      {% form_as_table_rows form %}
+    </tbody></table>
+    <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Login" %}" /></p>
+    </fieldset>
+    </form>
+  </div>
+
 {% endblock %}
 
 {% block userprofile_content_related %}

File transifex/templates/userprofile/account/logout.html

 {% block userprofile_content %}
 <div class="notice">
 	<h3>{% trans "Logged out" %}</h3>
-	<p class="large">{% trans "You've been logged out" %}. (<a href="{% url profile_overview %}">{% trans 'Log in again' %}</a>)</p>
+	<p class="large">{% trans "You've been logged out." %} (<a href="{% url profile_overview %}">{% trans 'Log in again' %}</a>)</p>
 </div>
 {% endblock %}

File transifex/templates/userprofile/account/password_change.html

 {% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% trans 'Password change for' %} {{ user }}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
-	<form action="" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% trans 'Password change for' %} {{ user }}</legend>
-		<label for="id_old_password">{% trans "Old password" %}</label>
-		<p>{{ form.old_password }}
-			{% if form.old_password.errors %}
-				<span class="quiet red"><br />* {{ form.old_password.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_new_password1">{% trans "New password" %}</label>
-		<p>{{ form.new_password1 }}
-			{% if form.new_password1.errors %}
-				<span class="quiet red"><br />* {{ form.new_password1.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_new_password2">{% trans "Confirm password" %}</label>
-		<p>{{ form.new_password2 }}
-			{% if form.new_password2.errors %}
-				<span class="quiet red"><br />* {{ form.new_password2.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Change' %}" /></p>
+<h2>{% trans 'Password change' %}</h2>
+<p>{% trans "You can change your password from here. Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+<div class="generic_form">
+  <form class="personal" action="{{ request.path_info }}" method="post" enctype="multipart/form-data">
+    <table><tbody>
+      {% form_as_table_rows form %}
+  </tbody></table>
+  <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Change" %}" /></p>
+</form>
+
 	</form>
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans 'Password change' %}</h3>
-		<p>{% trans "Password change utility page. Please enter your new password twice so we can verify you typed it in correctly" %}.</p>
-	</div>
-{% endblock %}

File transifex/templates/userprofile/account/password_change_done.html

 {% endblock %}
 
 {% block userprofile_content %}
+<h2>{% trans 'Password change' %}</h2>
 	<p class="success large">
-		{% trans "The password has been changed successfully" %}.
+		{% trans "The password has been changed successfully." %}
 	</p>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans 'Password change' %}</h3>
-    <p>{% trans "Password change utility page. Please enter your new password twice so we can verify you typed it in correctly" %}.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/account/password_expired.html

 
 {% block userprofile_content %}
 	<div id="notice" class="prepend-4 append-4">
-		<h4>{% trans "The password key you're trying to use is expired. Please, request a new one" %}.</h4>
+		<h4>{% trans "The password key you're trying to use is expired. Please, request a new one." %}</h4>
 	</div>
 {% endblock %}

File transifex/templates/userprofile/account/password_reset.html

 {% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% trans "Password reset" %}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
-	<form action="" method="post" accept-charset="utf-8">
-	<fieldset>
-		<legend>{% trans "Password reset" %}</legend>
-		<label for="id_email">{% trans 'E-mail address' %}</label>
-		<p>{{ form.email }}
-			{% if form.email.errors %}
-				<span class="quiet red"><br />* {{ form.email.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Reset my password' %}" /></p>
-	</form>
+  <h2>{% trans "Password reset form" %}</h2>
+  <p>{% trans "Forgotten your password? Enter your e-mail address, and we'll reset your password and e-mail the new one to you." %}</p>
+    
+  <div class="generic_form">
+    <form action="" method="post" accept-charset="utf-8">
+    <table><tbody>
+      {% form_as_table_rows form %}
+    </tbody></table>
+    <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Reset my password" %}" /></p>
+    </form>
+  </div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans "Password reset form" %}</h3>
-		<p>{% trans "Forgotten your password? Enter your e-mail address, and we'll reset your password and e-mail the new one to you" %}.</p>
-	</div>
-{% endblock %}

File transifex/templates/userprofile/account/password_reset_complete.html

 {% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans 'Password reset' %}</h2>
 	<p class="success large">
 		{% trans "Your password has been set.  You may go ahead and log in now." %}
 	</p>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans 'Password reset' %}</h3>
-    <p>{% trans "Password reset utility page. Please enter your new password twice so we can verify you typed it in correctly" %}.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/account/password_reset_confirm.html

 
 {% block userprofile_content %}
 
+<h2>{% trans 'Password reset' %}</h2>
+
 {% if validlink %}
 
-	<form action="" method="post" accept-charset="utf-8">
-	<fieldset>
-		<label for="id_new_password1">{% trans "New password" %}</label>
-		<p>{{ form.new_password1 }}
-			{% if form.new_password1.errors %}
-				<span class="quiet red"><br />* {{ form.new_password1.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		<label for="id_new_password2">{% trans "Confirm password" %}</label>
-		<p>{{ form.new_password2 }}
-			{% if form.new_password2.errors %}
-				<span class="quiet red"><br />* {{ form.new_password2.errors|join:"; " }}</span>
-			{% endif %}
-		</p>
-		{% if form.non_field_errors %}
-			<ul class="quiet red">{{ form.non_field_errors.as_ul }}</ul>
-		{% endif %}
-	</fieldset>
-	<p><input type="submit" value="{% trans 'Change' %}" /></p>
-	</form>
+  <div class="generic_form">
+    <form action="" method="post" accept-charset="utf-8">
+    <table><tbody>
+      {% form_as_table_rows form %}
+    </tbody></table>
+    <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Change password" %}" /></p>
+    </form>
+  </div>
 
 {% else %}
   <div class="error">
   </div>
 {% endif %}
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans 'Password reset' %}</h3>
-		<p>{% trans "Password reset utility page. Please enter your new password twice so we can verify you typed it in correctly" %}.</p>
-	</div>
-{% endblock %}
-

File transifex/templates/userprofile/account/password_reset_done.html

 {% block userprofile_content %}
 	<div class="success">
 		<h3>{% trans "Password reset successful" %}</h3>
-		<p>{% trans "We've e-mailed you the instructions to obtain a new password. You should be receiving it shortly" %}.</p>
+		<p>{% trans "We've e-mailed you the instructions to obtain a new password. You should be receiving it shortly." %}</p>
 	</div>
 {% endblock %}
 
 {% block userprofile_content_related %}
   <div class="box">
     <h3>{% trans "Password reset form" %}</h3>
-    <p>{% trans "Forgotten your password? Enter your e-mail address, and we'll reset your password and e-mail the new one to you" %}.</p>
+    <p>{% trans "Forgotten your password? Enter your e-mail address, and we'll reset your password and e-mail the new one to you." %}</p>
   </div>
 {% endblock %}

File transifex/templates/userprofile/account/registration.html

 {% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans "Register for a Transifex account" %}</h2>
+    <p>{% trans "Joining the Transifex is quick and easy. Just fill in the following form." %}</p>
 	{% include "userprofile/account/includes/registration_form.html" %}
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans "Register a new account" %}</h3>
-		<p>{% trans "Joining this community is quick and easy. You only need to fill the form to get access to all the private content" %}.</p>
-	</div>
-{% endblock %}

File transifex/templates/userprofile/account/registration_done.html

 {% block robots %}noindex,nofollow{% endblock %}
 
 {% block userprofile_content %}
+    <h2>{% trans "Register a new account" %}</h2>
+
 	<div class="success">
 		{% if email_validation_required %}
 		<p>{% blocktrans %}You have successfully registered a new account, and an account activation url has been sent to your e-mail address. You must access this message on your e-mail account to finish the registration process.{% endblocktrans %}</p>
 		{% endif %}
 	</div>
 {% endblock %}
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "Register a new account" %}</h3>
-    <p>{% trans "Joining this community is quick and easy. You only need to fill the form to get access to all the private content" %}.</p>
-  </div>
-{% endblock %}

File transifex/templates/userprofile/avatar/choose.html

 {% endblock %}
 
 {% block userprofile_content %}
+  <h2>{% trans "Avatar selection page" %}</h2>
+  <p>{% trans "You have several options to select the image you want as avatar on your profile." %}</p>
+
+  {% load avatars %}
+  <div class="center">
+        <img class="border" alt="{{ request.user }}" id="avatarimg" src="{% avatar 96 %}" />
+    {% if user.get_profile.has_avatar %}<p id="avatardelete" style="text-align: center;"><a href="{{ request.path_info }}delete/" class="delavatar">{% trans "Delete" %}</a></p>{% endif %}
+    </div>
+    <div class="generic_form">
 	<form action="{% url profile_edit_avatar %}" method="post" accept-charset="utf-8" enctype="multipart/form-data">
 		<fieldset>
 			<legend>{% trans "Choose the location of your avatar" %}</legend>
 			{% endif %}
 		</fieldset>
 </form>
+</div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "Avatar selection page" %}</h3>
-		<p>{% trans "You have several options to select the image you want as avatar on your profile" %}.</p>
-  </div>
-
-	{% load avatars %}
-  <div class="center">
-		<img class="border" alt="{{ request.user }}" id="avatarimg" src="{% avatar 96 %}" />
-    {% if user.get_profile.has_avatar %}<p id="avatardelete" style="text-align: center;"><a href="{{ request.path_info }}delete/" class="delavatar">{% trans "Delete" %}</a></p>{% endif %}
-	</div>
-{% endblock %}

File transifex/templates/userprofile/avatar/crop.html

 {% block userprofile_content_related %}
   <div class="box">
     <h3>{% trans "Avatar selection page" %}</h3>
-    <p>{% trans "You have several options to select the image you want as avatar on your profile" %}.</p>
+    <p>{% trans "You have several options to select the image you want as avatar on your profile." %}</p>
   </div>
 
   {% load avatars %}

File transifex/templates/userprofile/profile/delete.html

 {% endblock %}
 
 {% block userprofile_content %}
+   <h2>{% trans "Remove profile" %}</h2>
+   <p>{% trans "Erase all your private data except your username. You can refill the information later if you want to." %}</p>
+
+  <div class="generic_form">
 	<form action="" method="post" enctype="multipart/form-data">
-		<fieldset>
-			<legend>{% trans "Delete your personal information" %}</legend>
-			<p><label for="remove">{% trans "Are you sure?" %}</label> <input id="remove" type="submit" value="{% trans "Yes" %}" /></p>
-		</fieldset>
+		<h3>{% trans "Are you sure?" %}</label></h3>
+        <p><input id="remove" class="i16 delete" type="submit" value="{% trans "Delete my data" %}" /></p>
 	</form>
+  </div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-	<div class="box">
-		<h3>{% trans "Remove profile" %}</h3>
-		<p>{% trans "It erases all your private data except your username. You can refill the information later if you want to" %}.</p>
-	</div>
-{% endblock %}
-

File transifex/templates/userprofile/profile/location.html

 {% block userprofile_content_related %}
 <div class="box">
   <h3>{% trans "Location information" %}</h3>
-    <p>{% trans "Define your location information" %}.</p>
+    <p>{% trans "Define your location information." %}</p>
 </div>
 {% endblock %}

File transifex/templates/userprofile/profile/overview.html

 
 {% block userprofile_content %}
 	{% load avatars %}
-	<form action="" method="post">
-	<fieldset>
-		<legend>{% trans "Overview of your profile" %}</legend>
+		<h2>{% trans "Overview of your profile" %}</h2>
 		<div id="avatar" class="{{ css_classes.overview_avatar }} center">
 			<a href="{% url profile_edit_avatar %}">
 				<img class="border" src="{% avatar 96 %}" />
 			<div id="location" style="width: 480px; height: 240px;"></div>
 		</div>
 		{% endif %}
-	</fieldset>
-	</form>
 {% endblock %}
 
 {% block userprofile_content_related %}

File transifex/templates/userprofile/profile/personal.html

 {% extends "userprofile/base_2col.html" %}
 {% load i18n %}
+{% load txcommontags %}
 
 {% block title %}{% trans "Edit your personal information" %}{% endblock %}
 {% block robots %}noindex,nofollow{% endblock %}
 {% endblock %}
 
 {% block userprofile_content %}
-	<form class="personal" action="{{ request.path_info }}" method="post" enctype="multipart/form-data">
-	<fieldset>
-		<legend>{% trans "Edit your personal information" %}</legend>
-		{{ form.as_p }}
-	</fieldset>
-  <input type="submit" value="{% trans 'Save' %}" />
-	</form>
+
+<h2>{% trans "Edit your personal information" %}</h2>
+
+<p>{% trans "Insert some information about you." %}</p>
+
+<div class="generic_form">
+  <form class="personal" action="{{ request.path_info }}" method="post" enctype="multipart/form-data">
+  <table>
+      {% form_as_table_rows form %}
+  </table>
+  <p class="submit"><input type="submit" class="i16 submit" value="{% trans "Save" %}" /></p>
+  </form>
+</div>
 {% endblock %}
-
-{% block userprofile_content_related %}
-  <div class="box">
-    <h3>{% trans "Personal information" %}</h3>
-    <p>{% trans "Insert some information about you" %}.</p>
-  </div>
-{% endblock %}
-