From 49dd0229d43c1359162ca2f82dbb74d1a2aa3c30 Mon Sep 17 00:00:00 2001
From: xiez <xiez1989@gmail.com>
Date: Wed, 30 May 2012 13:51:25 +0800
Subject: [PATCH] Remove avatar change page

---
 avatar/templates/avatar/add.html        | 2 +-
 avatar/urls.py                          | 4 ++--
 profile/templates/profile/user_ids.html | 2 +-
 templates/base.html                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/avatar/templates/avatar/add.html b/avatar/templates/avatar/add.html
index b349c46947..0260f83fb5 100644
--- a/avatar/templates/avatar/add.html
+++ b/avatar/templates/avatar/add.html
@@ -3,7 +3,7 @@
 
 {% block main_panel %}
 <div id="avatar-op">
-     <h2>修改头像</h2>
+    <h2>上传头像</h2>
     <h3>{% trans "Your current avatar: " %}</h3>
     {% avatar user %}
 
diff --git a/avatar/urls.py b/avatar/urls.py
index 344fd23ffc..ec4afd0aa1 100644
--- a/avatar/urls.py
+++ b/avatar/urls.py
@@ -2,7 +2,7 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('avatar.views',
     url('^add/$', 'add', name='avatar_add'),
-    url('^change/$', 'change', name='avatar_change'),
+#    url('^change/$', 'change', name='avatar_change'),
 #    url('^delete/$', 'delete', name='avatar_delete'),
-    url('^render_primary/(?P<user>[\+\w]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),    
+    url('^render_primary/(?P<user>[^/]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),    
 )
diff --git a/profile/templates/profile/user_ids.html b/profile/templates/profile/user_ids.html
index 06d8dc187e..6b6e8d849f 100644
--- a/profile/templates/profile/user_ids.html
+++ b/profile/templates/profile/user_ids.html
@@ -4,7 +4,7 @@
 <h3>操作</h3>
 <ul class="with-bg">
   <li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li>
-  <li><a href="{{ SITE_ROOT }}avatar/change/">修改头像</a></li>
+  <li><a href="{{ SITE_ROOT }}avatar/add/">上传头像</a></li>
 </ul>
 {% endblock %}
 
diff --git a/templates/base.html b/templates/base.html
index f894c98003..8eeb3c9ec6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -27,7 +27,7 @@
 
                 <div class="fright">
                 {% if request.user.is_authenticated %}
-                <span>欢迎,</span> <a href="{% url avatar_change %}" class="avatar-link">{% avatar request.user 16 %}</a> <span>{{ request.user }}</span>
+                <span>欢迎,</span> <a href="{% url avatar_add %}" class="avatar-link">{% avatar request.user 16 %}</a> <span>{{ request.user }}</span>
                 <a href="{{ SITE_ROOT }}profile/">设置</a>
                 <!--
                 {% if request.user.is_staff %}