X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0cfa31f684a8d64a65b8a16f18bb79be49f13701..dcacc3b4c2ba2f550806a2d22b183f6fac4f63ff:/forum/skins/default/templates/users/edit.html?ds=sidebyside

diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index faede05..c789216 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -1,101 +1,108 @@
-{% extends "base_content.html" %}
-<!-- user_edit.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <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 type="text/javascript">
-            $().ready(function(){
-                $("#id_birthday").datepicker({
-                    changeMonth: true,
-                    changeYear: true,
-                    dateFormat: 'yy-mm-dd',
-                    minDate: null,
-                    maxDate: '0M 0D',
-                    yearRange: '1920:2010'
-                });
-
-                $("#nav_profile").attr('className',"on");
-                $("#cancel").bind('click', function(){history.go(-1);})
-            });     
-        </script>
-        {% block userjs %}
-        {% endblock %}
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {{ request.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">
-        <div id="left" style="float:left;width:180px">
-            {% if request.user.email %}
-            {% gravatar request.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>
-            </div>
-        </div>
-
-        <div id="askform" style="float:right;width:750px;text-align:left;">
-            <h2>{% trans "Registered user" %}</h2>
-            <table class="user-details">
-                <tr>
-                    <th width="100px"></th>
-                    <th></th>
-                </tr>
-                <tr style="height:35px">
-	            	<td>{% trans "Screen Name" %}:</td>
-	            	<td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
-	            </tr>
-                
-	            <tr style="height:35px">
-	            	<td>{{ form.email.label_tag }}:</td>
-	            	<td>{{ form.email }} <span class="form-error"></span> {{ form.email.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td></td>
-	            	<td class="title-desc">{{ form.email.help_text }}</td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.realname.label_tag }}:</td>
-	            	<td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.website.label_tag }}:</td>
-	            	<td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.city.label_tag }}:</td>
-	            	<td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.birthday.label_tag }}:</td>
-	            	<td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td>
-	            </tr>
-                <tr>
-	            	<td style="vertical-align:top">{{ form.about.label_tag }}:</td>
-	            	<td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td>
-	            </tr>
-	            
-            </table>
-            <div style="margin:30px 0 60px 0">
-                <input type="submit" value="{% trans "Update" %}" class="submit" >
-                <input id="cancel" type="button" value="{% trans "Cancel" %}" class="submit" >
-          
-            </div>
-        </div>
-    </form>
-    
-</div>
-{% endblock %}
-<!-- end user_edit.html -->
+{% extends "base_content.html" %}
+<!-- user_edit.html -->
+{% load extra_tags %}
+{% load humanize %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+        <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 type="text/javascript">
+            $().ready(function(){
+                $("#id_birthday").datepicker({
+                    changeMonth: true,
+                    changeYear: true,
+                    dateFormat: 'yy-mm-dd',
+                    minDate: null,
+                    maxDate: '0M 0D',
+                    yearRange: '1920:2010'
+                });
+
+                $("#nav_profile").attr('className',"on");
+                $("#cancel").bind('click', function(){history.go(-1);})
+            });
+        </script>
+        {% block userjs %}
+        {% endblock %}
+{% endblock %}
+{% block content %}
+<div id="main-bar" class="headNormal">
+    {{ user.username }} - {% trans "edit profile" %}
+</div>
+<div id="main-body" style="width:100%;padding-top:10px">
+    <form name="" action="{% url "edit_user" user.id user.username|slugify %}" method="post">
+        {% csrf_token %}
+        <div id="left" style="float:left;width:180px">
+            {% 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" %}">{% 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">
+                <tr>
+                    <th width="100px"></th>
+                    <th></th>
+                </tr>
+                <tr style="height:35px">
+	            	<td>{% trans "Screen Name" %}:</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">
+	            	<td>{{ form.email.label_tag }}:</td>
+	            	<td>{{ form.email }} <span class="form-error"></span> {{ form.email.errors }} </td>
+	            </tr>
+                <tr style="height:35px">
+	            	<td></td>
+	            	<td class="title-desc">{{ form.email.help_text }}</td>
+	            </tr>
+                <tr style="height:35px">
+	            	<td>{{ form.realname.label_tag }}:</td>
+	            	<td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td>
+	            </tr>
+                <tr style="height:35px">
+	            	<td>{{ form.website.label_tag }}:</td>
+	            	<td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td>
+	            </tr>
+                <tr style="height:35px">
+	            	<td>{{ form.city.label_tag }}:</td>
+	            	<td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td>
+	            </tr>
+                <tr style="height:35px">
+	            	<td>{{ form.birthday.label_tag }}:</td>
+	            	<td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td>
+	            </tr>
+                <tr>
+	            	<td style="vertical-align:top">{{ form.about.label_tag }}:</td>
+	            	<td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td>
+	            </tr>
+	
+            </table>
+            <div style="margin:30px 0 60px 0">
+                <input type="submit" value="{% trans "Update" %}" class="submit" >
+                <input id="cancel" type="button" value="{% trans "Cancel" %}" class="submit" >
+
+            </div>
+        </div>
+    </form>
+
+</div>
+{% endblock %}
+<!-- end user_edit.html -->