X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b80d47e7da6ac90a56b9705089f246a8050ee364..094acc5f44c3a7779f42b3d84c86213ba6a1003c:/forum/skins/default/templates/users/edit.html?ds=inline

diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index 4227fce..3240fd2 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -5,14 +5,10 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type="text/javascript">google.load("jquery", "1.4.2");</script>
+        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
 
         <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
-        
-        <script src="{% media  "/media/js/effects.core.min.js" %}" type="text/javascript"></script>
-        <script src="{% media  "/media/js/ui.core.js" %}" type="text/javascript"></script>
-        <script src="{% media  "/media/js/ui.datepicker.js" %}" type="text/javascript"></script>
 
         <script type="text/javascript">
             $().ready(function(){
@@ -34,22 +30,22 @@
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
-    {{ request.user.username }} - {% trans "edit profile" %}
+    {{ user.username }} - {% trans "edit profile" %}
 </div>
 <div id="main-body" style="width:100%;padding-top:10px">
-    <form name="" action="{% url edit_user request.user.id %}" method="post">
+    <form name="" action="{% url edit_user user.id %}" method="post">
         <div id="left" style="float:left;width:180px">
-            {% if request.user.email %}
-            {% gravatar request.user 128 %}
+            {% if user.email %}
+            {% gravatar user 128 %}
             {% else %}
             <img src="{% media  "/media/images/nophoto.png" %}">
             {% endif %}
             <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
                 <a href="http://www.gravatar.com/" target="_blank" 
-					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
+					title="gravatar {% trans "image associated with your email address" %}">{% trans "gravatar" %}</a>
             </div>
         </div>
-
+        
         <div id="askform" style="float:right;width:750px;text-align:left;">
             <h2>{% trans "Registered user" %}</h2>
             <table class="user-details">
@@ -59,7 +55,13 @@
                 </tr>
                 <tr style="height:35px">
 	            	<td>{% trans "Screen Name" %}:</td>
-	            	<td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
+	            	<td>
+	            	{% if form.username %}
+	            	    {{ form.username }} <span class="form-error"></span> {{ form.username.errors }}
+	            	{% else %}
+	            	    {{ user.username }}
+	            	{% endif %}
+	            	</td>
 	            </tr>
                 
 	            <tr style="height:35px">