Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/projects/invite_members_by_mail.html.erb

@@ -24,16 +24,24 @@
         if(email == "")
         {
             $("#valid_email").text("<%= l(:label_input_email_blank)%>");
+            return false;
         }
-        else if (filter.test(email)) {
+        else if(!filter.test(email))
-            $("#valid_email").html("");
+        {
-            return true;
+            $("#valid_email").text("<%= l(:label_email_format_error)%>");
+            return false;
+        }
+        else if(email.split('@')[0].length >= 20)
+        {
+            $("#valid_email").text("邮箱名过长,最长为20个字符");
+            return false;
         }
         else
         {
-            $("#valid_email").text("<%= l(:label_email_format_error)%>");
+            $("#valid_email").text("");
+            return true;
         }
-        return false;
+
     }
 
     function senderEmail(obj)

public/stylesheets/public.css

@@ -418,6 +418,8 @@ div.flash.notice {
     background-color: #dfffdf;
     border-color: #9fcf9f;
     color: #005f00;
+    word-wrap: break-word;
+    word-break: break-all
 }
 
 div.flash.warning, .conflict {