OSQA-829, resolves a unicode problem when answering question, use smart_unicode for...

[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 b86c59db24cfb3247257bb6603d144b1bffa81b6..ce54c773e6633b551b7f7414a34ff0e97e4a4843 100644 (file)
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -5,14 +5,10 @@
 {% load i18n %}\r
 {% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}\r
 {% block forejs %}\r
 {% load i18n %}\r
 {% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}\r
 {% block forejs %}\r

-        <script type="text/javascript">google.load("jquery", "1.4.2");</script>\r
+        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>\r

 \r
         <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />\r
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />\r
 \r
         <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />\r
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />\r

-        \r
-        <script src="{% media  "/media/js/effects.core.min.js" %}" type="text/javascript"></script>\r
-        <script src="{% media  "/media/js/ui.core.js" %}" type="text/javascript"></script>\r
-        <script src="{% media  "/media/js/ui.datepicker.js" %}" type="text/javascript"></script>\r

 \r
         <script type="text/javascript">\r
             $().ready(function(){\r
 \r
         <script type="text/javascript">\r
             $().ready(function(){\r


@@ -34,19 +30,20 @@
 {% endblock %}\r
 {% block content %}\r
 <div id="main-bar" class="headNormal">\r
 {% 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
 </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 user.username|slugify %}" method="post">\r
+        {% csrf_token %}\r

         <div id="left" style="float:left;width:180px">\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
             {% 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
             </div>\r
         </div>\r
         \r


@@ -59,7 +56,13 @@
                 </tr>\r
                 <tr style="height:35px">\r
                        <td>{% trans "Screen Name" %}:</td>\r
                 </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
                    </tr>\r
                 \r
                    <tr style="height:35px">\r