haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-03 07:55:36 +00:00
Code Issues Releases Wiki Activity

Remove avatar delete url

Browse Source
This commit is contained in:
xiez
2012-05-25 14:14:51 +08:00
parent df4a838005
commit e5f64a4944
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avatar/templates/avatar/change.html
View File

@@ -2,9 +2,11 @@
{% load i18n avatar_tags %} {% load i18n avatar_tags %}
{% block main_panel %} {% block main_panel %}
<h2>添加或修改头像</h2> <h2>修改头像</h2>
<p>{% trans "Your current avatar: " %}</p> <p>{% trans "Your current avatar: " %}</p>
{% avatar user %} {% avatar user %}
{% comment %}
{% if not avatars %} {% if not avatars %}
<p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p> <p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
{% else %} {% else %}
@@ -16,6 +18,8 @@
<p>{% csrf_token %}<input type="submit" value="{% trans "Choose new Default" %}" /></p> <p>{% csrf_token %}<input type="submit" value="{% trans "Choose new Default" %}" /></p>
</form> </form>
{% endif %} {% endif %}
{% endcomment %}
<form enctype="multipart/form-data" method="POST" action="{% url avatar_add %}"> <form enctype="multipart/form-data" method="POST" action="{% url avatar_add %}">
<label for="id_avatar">上传新头像：</label> <label for="id_avatar">上传新头像：</label>
{% for boundfield in upload_avatar_form %} {% for boundfield in upload_avatar_form %}

2
avatar/urls.py
View File

@@ -3,6 +3,6 @@ from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('avatar.views', urlpatterns = patterns('avatar.views',
url('^add/$', 'add', name='avatar_add'), 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('^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>[\+\w]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
) )

1
profile/templates/profile/user_ids.html
View File

@@ -6,7 +6,6 @@
<ul> <ul>
<li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li> <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/change/">修改头像</a></li>
<li><a href="{{ SITE_ROOT }}avatar/delete/">删除不用的头像</a></li>
</ul> </ul>
{% endblock %} {% endblock %}

1
settings.py
View File

@@ -178,6 +178,7 @@ AVATAR_STORAGE_DIR = 'avatars'
AVATAR_GRAVATAR_BACKUP = False AVATAR_GRAVATAR_BACKUP = False
AVATAR_DEFAULT_URL = '/avatars/default.png' AVATAR_DEFAULT_URL = '/avatars/default.png'
AUTO_GENERATE_AVATAR_SIZES = (80, 16) AUTO_GENERATE_AVATAR_SIZES = (80, 16)
AVATAR_MAX_AVATARS_PER_USER = 1
LOGIN_URL = SITE_ROOT + 'accounts/login' LOGIN_URL = SITE_ROOT + 'accounts/login'

2
templates/base.html
View File

@@ -25,7 +25,7 @@
</div> </div>
{% endif %} {% endif %}
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
欢迎, {% avatar request.user 16 %} {{ request.user }} 欢迎, <a href="{% url avatar_change %}">{% avatar request.user 16 %}</a> {{ request.user }}
<a href="{{ SITE_ROOT }}profile/">设置</a> <a href="{{ SITE_ROOT }}profile/">设置</a>
<!-- <!--
{% if request.user.is_staff %} {% if request.user.is_staff %}