diff --git a/avatar/templates/avatar/add.html b/avatar/templates/avatar/add.html
index bc6211110d..e034e9f6b0 100644
--- a/avatar/templates/avatar/add.html
+++ b/avatar/templates/avatar/add.html
@@ -1,18 +1,6 @@
{% extends "myhome_base.html" %}
{% load i18n avatar_tags %}
-{% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-
上传头像
diff --git a/media/css/seahub.css b/media/css/seahub.css
index c2f46551c9..d78a90fc52 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -377,10 +377,17 @@ ul.with-bg li {
-moz-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
-webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
}
-.messages .info {
+.messages .info,
+.messages .success{
+ padding:5px;
+ background:#C4ECA9;
+ margin:0;
+}
+.messages .error{
padding:5px;
background:#FDF;
margin:0;
+ color:#000;
}
/* narrow-panel: for pages like 'login' */
.narrow-panel {
diff --git a/media/js/utils.js b/media/js/utils.js
index 6c7e101dfe..720b2ea2d1 100644
--- a/media/js/utils.js
+++ b/media/js/utils.js
@@ -275,5 +275,5 @@ function apply_form_error(formid, error_msg) {
if ($('.messages')) {
$('#main').append($('.messages')).css('position','relative');
$('.messages').css({'left':($('#main').width() - $('.messages').width())/2 + 'px', 'top':'-20px'}).removeClass('hide');
- setTimeout(function() { $('.messages').addClass('hide'); }, 3000);
+ setTimeout(function() { $('.messages').addClass('hide'); }, 10000);
}
diff --git a/organizations/templates/organizations/org_info.html b/organizations/templates/organizations/org_info.html
index bb29a27017..caeeff3b8b 100644
--- a/organizations/templates/organizations/org_info.html
+++ b/organizations/templates/organizations/org_info.html
@@ -5,14 +5,6 @@
{% block nav_org_class %}class="cur"{% endblock %}
{% block main_panel %}
-{% if messages %}
-
- {% for message in messages %}
- - {{ message }}
- {% endfor %}
-
-{% endif %}
-
团体成员
{% if org_users %}
diff --git a/organizations/templates/organizations/org_useradmin.html b/organizations/templates/organizations/org_useradmin.html
index c0e851d62f..5598203636 100644
--- a/organizations/templates/organizations/org_useradmin.html
+++ b/organizations/templates/organizations/org_useradmin.html
@@ -11,19 +11,6 @@
{% block right_panel %}
-{% if messages %}
-
- {% for message in messages %}
- {% if message.tags == 'info' %}
- - 邮件发送成功。
- {% endif %}
- {% if message.tags == 'error' %}
- - 邮件发送失败。
- {% endif %}
- {% endfor %}
-
-{% endif %}
-
所有用户
diff --git a/organizations/templates/organizations/personal.html b/organizations/templates/organizations/personal.html
index 19c5855597..272dfb7a70 100644
--- a/organizations/templates/organizations/personal.html
+++ b/organizations/templates/organizations/personal.html
@@ -14,16 +14,6 @@
{% endblock %}
{% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-
- {% for message in messages %}
- - {{ message }}
- {% endfor %}
-
-{% endautoescape %}
-{% endif %}
-
{% include "snippets/my_owned_repos.html" %}
diff --git a/organizations/views.py b/organizations/views.py
index 85dff90164..d4155ae48e 100644
--- a/organizations/views.py
+++ b/organizations/views.py
@@ -233,9 +233,9 @@ def send_org_user_add_mail(request, email, password, org_name):
try:
send_mail(u'SeaCloud注册信息', t.render(Context(c)),
None, [email], fail_silently=False)
- messages.add_message(request, messages.INFO, email)
+ messages.add_message(request, messages.INFO, u'邮件发送成功。')
except:
- messages.add_message(request, messages.ERROR, email)
+ messages.add_message(request, messages.ERROR, u'邮件发送失败。')
@login_required
@org_staff_required
diff --git a/profile/templates/profile/set_profile.html b/profile/templates/profile/set_profile.html
index a075689803..7b08af37bd 100644
--- a/profile/templates/profile/set_profile.html
+++ b/profile/templates/profile/set_profile.html
@@ -7,14 +7,6 @@
{% block right_panel %}
个人基本信息修改
-{% if messages %}
-
- {% for message in messages %}
- - {{ message }}
- {% endfor %}
-
-{% endif %}
-