Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / skins / default / templates / users / edit.html

diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index b3a7e74b68d14bb45710dfa6ccd17c58c9516de3..3240fd25f91efa91566249f26c0a30ca8d063371 100644 (file)
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -30,19 +30,19 @@
 {% endblock %}\r
 {% block content %}\r
 <div id="main-bar" class="headNormal">\r
-    {{ request.user.username }} - {% trans "edit profile" %}\r
+    {{ user.username }} - {% trans "edit profile" %}\r
 </div>\r
 <div id="main-body" style="width:100%;padding-top:10px">\r
-    <form name="" action="{% url edit_user request.user.id %}" method="post">\r
+    <form name="" action="{% url edit_user user.id %}" method="post">\r
         <div id="left" style="float:left;width:180px">\r
-            {% if request.user.email %}\r
-            {% gravatar request.user 128 %}\r
+            {% if user.email %}\r
+            {% gravatar user 128 %}\r
             {% else %}\r
             <img src="{% media  "/media/images/nophoto.png" %}">\r
             {% endif %}\r
             <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">\r
                 <a href="http://www.gravatar.com/" target="_blank" \r
-                                       title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>\r
+                                       title="gravatar {% trans "image associated with your email address" %}">{% trans "gravatar" %}</a>\r
             </div>\r
         </div>\r
         \r
@@ -55,7 +55,13 @@
                 </tr>\r
                 <tr style="height:35px">\r
                        <td>{% trans "Screen Name" %}:</td>\r
-                       <td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>\r
+                       <td>\r
+                       {% if form.username %}\r
+                           {{ form.username }} <span class="form-error"></span> {{ form.username.errors }}\r
+                       {% else %}\r
+                           {{ user.username }}\r
+                       {% endif %}\r
+                       </td>\r
                    </tr>\r
                 \r
                    <tr style="height:35px">\r