From 368a3ce1fa89ee43f4ee70da266df979f05f2767 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 15:40:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index cd6ac2af2..f38595302 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -43,7 +43,7 @@
                           <tr>
                             <td class="font_lighter" >
                               <%= l :label_create_time %>:
-                              <%= format_time(e.created_at) %>
+                              <%= format_time(e.project.created_on) %>
                         </table>
                       </td>
                     </tr>

From aa8d1741f99c8c751f8b8d7578c941381e19a75d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 15:46:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E7=AE=B1=E6=97=B6=E7=9A=84=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index e8e77be8f..63f69e120 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,14 +1,28 @@
 <script>
     function verifyAddress() {
-        var email = $('#mail').val();
+        var email = $.trim($('#mail').val());
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-        if (email == "" || filter.test(email)) {
+        if(email == "")
+        {
+            $("#valid_email").html("电子邮件不能为空");
+        }
+        else if (filter.test(email)) {
             $("#valid_email").html("");
+            return true;
         }
         else
         {
             $("#valid_email").html("您所填写的电子邮件格式不正确");
         }
+        return false;
+    }
+
+    function senderEmail(obj)
+    {
+        if(verifyAddress())
+        {
+            obj.parent().submit();
+        }
     }
 
 
@@ -40,10 +54,10 @@
 		</div>
 			<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
 				<span id="valid_email" style="color: #FF0000;"></span>
-                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onblur => "verifyAddress();" %>
+                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "verifyAddress();" %>
                 <div class="cl"></div>
                 <div class="cl"></div>
-                <a href="#" class="btn_free" onclick="$(this).parent().submit();">
+                <a href="#" class="btn_free" onclick="senderEmail($(this));">
                     <%= l(:label_send_email)%>
                 </a>
 				<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>

From ca7c970094adb0b57e6b0ad21aaf32e987e1a5c5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 17:27:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index cd1e1f40f..2172af8de 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -7,10 +7,10 @@
     #scrollsidebar a{ text-decoration:none;}
 
     html{ overflow-x:hidden;}
-    .scrollsidebar{ position:absolute;top:1px; right:1px; background:none; }
+    .scrollsidebar{ position:fixed;bottom:1px; right:1px; background:none; }
     .side_content{width:154px; height:auto; overflow:hidden; float:left; }
     .side_content .side_list {width:154px;overflow:hidden;}
-    .show_btn{ width:0; height:112px; overflow:hidden; float:left; cursor:pointer;}
+    .show_btn{ width:0; height:112px; overflow:hidden; float:left;margin-top: 200px; cursor:pointer;}
     .show_btn span { display:none;}
     .close_btn{width:24px;height:24px;cursor:pointer;}
     .side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; }

From e4e56e01b1891fe38027d429081760a3f102bf69 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 17:46:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index d0be72961..ba312c74a 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -99,7 +99,7 @@ class MembersController < ApplicationController
           @project.members << members
           # added by nie
           @project.project_infos << project_info
-          @project.user_grades << user_grades
+          @project.user_grades << user_grades unless user_grades.first.user_id.nil?
           # end
         end
         if members.present? && members.all? { |m| m.valid? }
@@ -108,7 +108,11 @@ class MembersController < ApplicationController
           end
         end
         if params[:flag]
-          flash[:notice] = l(:label_invite_success)
+          unless members.present? && members.all? {|m| m.valid? }
+            flash[:error] = members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
+          else
+            flash[:notice] = l(:label_invite_success)
+          end
           respond_to do |format|
             format.html { redirect_to invite_members_project_url(@project) }
           end