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

Conflicts:
	app/views/layouts/_point_browser.html.erb

app/views/layouts/_point_browser.html.erb

@@ -9,8 +9,8 @@
       .update{ border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;}
       a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
       a:hover.green_btn{ background:#289c2b;}
-      a.close_buttton{ background:url(images/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px;  float:right; margin:7px 5px 0 0;}
-      a:hover.close_buttton{ background:url(images/img_floatbox.png) -20px -63px no-repeat;}
+      a.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px;  float:right; margin:7px 5px 0 0;}
+      a:hover.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;}
   </style>
   <script type="text/javascript">
       function close_window(){

app/views/projects/invite_members_by_mail.html.erb

@@ -1,4 +1,3 @@
-<script type="text/javascript" src="/javascripts/jquery.min.js"></script>
 <script type="text/javascript" src="/javascripts/jQuery.autoMail.js"></script>
 <script type="text/javascript">
     $(document).ready(function(){
@@ -24,7 +23,7 @@
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
         if(email == "")
         {
-            $("#valid_email").html("邮箱地址不能为空！");
+            $("#valid_email").text("<%= l(:label_input_email_blank)%>");
         }
         else if (filter.test(email)) {
             $("#valid_email").html("");
@@ -32,7 +31,7 @@
         }
         else
         {
-            $("#valid_email").html("您输入的邮箱格式不正确！");
+            $("#valid_email").text("<%= l(:label_email_format_error)%>");
         }
         return false;
     }