Modify messages color and time

avatar/templates/avatar/add.html

@@ -1,18 +1,6 @@
 {% extends "myhome_base.html" %}
 {% load i18n avatar_tags %}
 
-{% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endautoescape %}
-{% endif %}
-{% endblock %}
-
 {% block main_panel %}
 <div class="narrow-panel avatar-op">
     <h2>上传头像</h2>

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 {

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);
 }

organizations/templates/organizations/org_info.html

@@ -5,14 +5,6 @@
 {% block nav_org_class %}class="cur"{% endblock %}
 
 {% block main_panel %}
-{% if messages %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>
-  {% endfor %}
-</ul>
-{% endif %}
-
 <div class="side fright">
 <h3>团体成员</h3>
 {% if org_users %}

organizations/templates/organizations/org_useradmin.html

@@ -11,19 +11,6 @@
 
 
 {% block right_panel %}
-{% if messages %}
-<ul class="messages hide">
-  {% for message in messages %}
-  {% if message.tags == 'info' %}
-  <li class="info">邮件发送成功。</li>  
-  {% endif %}
-  {% if message.tags == 'error' %}
-  <li class="info">邮件发送失败。</li>  
-  {% endif %}
-  {% endfor %}
-</ul>
-{% endif %}
-
 <h3>所有用户</h3>
 <table>
     <tr>

organizations/templates/organizations/personal.html

@@ -14,16 +14,6 @@
 {% endblock %}
 
 {% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endautoescape %}
-{% endif %}
-
 <!-- 我拥有的同步目录 -->
 {% include "snippets/my_owned_repos.html" %}
 

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

profile/templates/profile/set_profile.html

@@ -7,14 +7,6 @@
 {% block right_panel %}
 <div id="user-basic-info">
 <h2>个人基本信息修改</h2>
-{% if messages %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endif %}
-
 <form action="" method="post">
     <label>头像:</label>{% avatar request.user.username 60 %}
     <a href="{{ SITE_ROOT }}avatar/add/">更改</a><br />

share/templates/repo/share_admin.html

@@ -4,16 +4,6 @@
 {% block nav_shareadmin_class %}class="cur"{% endblock %}
 
 {% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endautoescape %}
-{% endif %}
-
 <h3>我共享的同步目录</h3>
 {% if out_repos %}
 <table class="repo-list">

templates/base.html

@@ -92,7 +92,7 @@
             {% autoescape off %}
             <ul class="messages hide">
               {% for message in messages %}
-              <li class="info">{{ message }}</li>
+              <li class="{{ message.tags }}">{{ message }}</li>
               {% endfor %}
             </ul>
             {% endautoescape %}

templates/myhome.html

@@ -46,16 +46,6 @@
 {% endblock %}
 
 {% block right_panel %}
-{% if messages %}
-{% autoescape off %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endautoescape %}
-{% endif %}
-
 <!-- 我拥有的同步目录 -->
 {% include "snippets/my_owned_repos.html" %}
 

templates/public_home.html

@@ -5,14 +5,6 @@
 {% block nav_publichome_class %}class="cur"{% endblock %}
 
 {% block main_panel %}
-{% if messages %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>
-  {% endfor %}
-</ul>
-{% endif %}
-
 <div class="side fright">
 <h3>成员</h3>
 {% if users %}

templates/sys_useradmin.html

@@ -8,16 +8,7 @@
 </ul>
 {% endblock %}
 
-
 {% block right_panel %}
-{% if messages %}
-<ul class="messages hide">
-  {% for message in messages %}
-  <li class="info">{{ message }}</li>  
-  {% endfor %}
-</ul>
-{% endif %}
-
 <h3>所有用户</h3>
 <table>
     <tr>