Merge branch 'evgenyfadeev/master'

Conflicts:
	.gitignore
	INSTALL
	TODO
	cnprog.wsgi
	django_authopenid/urls.py
	django_authopenid/views.py
	drop-all-tables.sh
	forum/auth.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_tags.py
	forum/views.py
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	settings.py
	settings_local.py.dist
	sql_scripts/update_2009_01_25_001.sql
	sql_scripts/update_2009_02_26_001.sql
	sql_scripts/update_2009_04_10_001.sql
	templates/authopenid/confirm_email.txt
	templates/authopenid/sendpw_email.txt
	templates/content/js/compress.bat
	templates/content/js/flot-build.bat
	templates/content/style/style.css
	templates/footer.html
	templates/question.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html
	templates/users_questions.html
	urls.py

1 files changed, 10 insertions, 20 deletions

diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 37091261..6241c811 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -2,35 +2,25 @@
 <!-- sendpw.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-
 {% block content %}
-<div id="main-bar" class="">
-    <h3>{% trans "Send new password" %}</h3>
-
-</div>
-<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br/>
-{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
+<div class="headNormal">
+    {% trans "Send new password" %}
 </div>
-{% if form.errors %}
-<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-	{% if form.username.errors %} 
-		<span class="error">{{ form.username.errors|join:", " }}</span>
-	{% endif %}
+<p class="message">
+{% trans "password recovery information" %}
 </p>
-{% endif %}
 {% if msg %}
-    <div class="paragraph error">{{ msg }}</div>
+    <p class="action-status"><span>{{msg}}</span><p>
 {% endif %}
 
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
-
-        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
-
+        <ul id="emailpw-form" class="form-horizontal-rows">
+            {{form.as_ul}}
+        </ul>
+        <p style="padding-top:10px"><input type="submit" class="submit" value="{% trans "Reset password" %}" /> 
+        <a href="{% url user_signin %}"><span class="strong">{% trans "return to login" %}</span></a></p>
 	</form>
-    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
 <!-- end sendpw.html -->