From be75bcef473dbb99d59829019bc31719dd98bd94 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 13 Mar 2015 11:51:53 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/projects/en.yml | 24 ++++++++++++------------
 config/locales/projects/zh.yml |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 1fda000ff..fdc426ca5 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -131,23 +131,23 @@ en:
   #
   #  项目得分
   #     
-  label_projects_score: 项目综合得分
+  label_projects_score: Project Total Score
   
-  label_issue_score: issue得分
-  label_issue_number: issue的数量
-  label_issue_journal_number: issue的留言数量 
+  label_issue_score: Issue Score
+  label_issue_number: issues 
+  label_issue_journal_number: messages of issue
   
-  label_news_score: 新闻得分
-  label_new_number: 新闻的数量
+  label_news_score: News Score
+  label_new_number: news
   
-  label_file_score: 文档得分
-  label_file_number: 文档的数量
+  label_file_score: Document Scores
+  label_file_number: documents
   
-  label_code_submit_score: 代码提交得分
-  label_code_submit_number: 代码提交数量
+  label_code_submit_score: Code Commit Score
+  label_code_submit_number: commit code frequency
   
-  label_topic_score: 讨论区得分
-  label_topic_number: 讨论区帖子数量
+  label_topic_score: Forum Score
+  label_topic_number: posts
 
 
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 29cf540f8..b0a122dd1 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -146,7 +146,7 @@ zh:
   label_file_number: 文档的数量
   
   label_code_submit_score: 代码提交得分
-  label_code_submit_number: 代码提交数量
+  label_code_submit_number: 代码提交频率
   
   label_topic_score: 讨论区得分
   label_topic_number: 讨论区帖子数量

From ed674d960c2a0fa934a5b9d6e43a627495e91eaf Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 13 Mar 2015 11:55:57 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index c9ea1ca80..2cfbc550b 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -381,7 +381,7 @@ class CoursesService
       end
       latest_bid_message = messages.first
       unless latest_bid_message.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => '最近更新了作业'}#l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
       end
       #每个作业中学生最后提交的作业
       homeworks = []
@@ -396,7 +396,7 @@ class CoursesService
       end
       latest_homework_attach = homeworks.first
       unless latest_homework_attach.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => '最近更新了作业'}#l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)}
       end
       latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]}
       latest_course_dynamic = latest_course_dynamics.first

From e165dd6572774f243c60a1cdff6da1750ebb33c9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 13 Mar 2015 13:41:26 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 2cfbc550b..1ec8a0ef0 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -1,3 +1,4 @@
+#coding=utf-8
 class CoursesService
   include ApplicationHelper
   include CoursesHelper

From a010c800d6b610892c085005a80fb6f2301e73ea Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 Mar 2015 15:37:54 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=BA=93=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5=E4=B8=8B403?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F=20=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=9B=BD=E9=99=85=E5=8C=96=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb |  12 +++++-------
 config/locales/zh.yml                    |   2 +-
 public/images/jiantou1.jpg               | Bin 0 -> 1308 bytes
 public/stylesheets/application.css       |   4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 public/images/jiantou1.jpg

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 23f0be5e6..8a731668c 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -101,8 +101,8 @@
 									</div>
 									<!-- 项目得分 -->
 									<div class="cl"></div>
-									<div class="pr_info_name">
-                                      <%= link_to @project.name, project_path(@project) %>
+									<div class="pr_info_name f1">
+                                      <%= link_to @project.name, project_path(@project), :style => "color:#3E4040"%>
 									    <% if !@project.is_public? %>
 									        <span class="img_private"><%= l(:label_private)%></span>
                                          <% end %>
@@ -177,12 +177,10 @@
 										    <% end %>
                                         </div>
                                       	<% end%>
-                                      	<% unless @project.enabled_modules.where("name = 'repository'").empty? %>
+                                      	<% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
 										<div class="subNav">
-											<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
-											<% unless @project.repositories.count == 0 %>
-												<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
-											<% end %>
+											<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>											
+												<span  class="subnav_num">(<%= @project.repositories.count %>)</span>										
                                             <%# if User.current.member_of?(@project) %>
 											    <%#= link_to "+"+l(:project_module_create_repository),  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
                                             <%# end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8858b0a38..d4a09b30b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2082,6 +2082,6 @@ zh:
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
   label_end_time: 截止时间
-  label_send_email: 免费发送
+  label_send_email: 确定发送
   label_input_email: 请输入邮箱地址
 
diff --git a/public/images/jiantou1.jpg b/public/images/jiantou1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..208f4424463bf1128eefe17d60f6c85050c4e01a
GIT binary patch
literal 1308
zcmbVMOKa3n6uz0X^+6HitGbbpy6}~EW+n;7QYTX^I#z0ZAR=aNZf$In8<NzS7F`I{
zjSCl|=+2#gKvZy{i!MY&bmbF7McnvY2qHqf8E2*<MZ^PvbI(2B`OY~x=cZ56S73Fy
z?u`O4IJglk1ap$U2aG)l$EN@VI*8c?Abmwok0nWHieeB8j*F{EfY=x7PAJNPB!Vq{
z_0WOiC}FGUs25n=r(3r<)^jaxf4(AB!V((uwogZB&-AVlI6V#xm+RZgZmFAfKlD-J
zuyubTh|RjiHG-Q&&&(pnHe8Z%i|fx=*#ni`Yzaq*%?o)RO0vcl4MEP!nl5i<6-ib_
zNfl+4mlaboOgYasg(GZ{J8BNw15GY+vbbhZwOUQ6sRE9Uin3uCqNIq5!V?cZo(dAD
z&IfUCD}s$;7<pmh;egE|I#oQGSRBdpR|$Stsk8&n+b!SE>S}n$$uOErV_xrgWGY1B
zFpBYH1QBuXZGlPe{!WxRl5EVO$Rj_+nXoaO^ihxu+7?G{1lM!TyrN6Gq3S%+iZZX}
zHH9}+1M*G*8Bi@kNkLL8&U|=PDeK#8RV{2&2V}Xd>4vTkl*{FQNmdHFVYje@L7X@N
zL@jQQa5u5aU$JH>LQaCC5sW8VQ?PpsCpaF%AzLc3>-T$si)-<Q><|4a*hZ0e9JvD#
z_Sr^@O>Z9h{3z6`1xMngsv`5SpsA$lVv%>D4o5YoswoAHYvSGiZJkJx60<q^ZEjj7
zGK`tp-U4!H?-2^f@<e1y(vM(CWA=f2hioI2J_j>^`gh6A3Eh?^JV#OFmVE7te^t^u
zfLRE-K^ILiAjeQNL#4Ce5J_zAA<4AP#eZ4=SPH0IC*47}Jv(xp6uo?97qe^?Sh23B
zS6#sT5r#ZL&p<a#5h|Jiec*<D?e4LAd%r!JS^M?$TlT@d%d_3Dk9;`Ob^qg{t8dQD
z?6`bb@BI>9S$y&4rs~yGt2gds)*OL7Cuh~ORtjGHxN!bbaQ!9jdARxD<Ifg4_I<;N
NeZjjS;dX!e^e2}bVI%+m

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e0ab6f711..5786c5758 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -55,7 +55,7 @@ a:hover.info_foot_num{  color:#2390b2;}
 /*左侧导航*/
 .subNavBox{width:222px; background:#fff;margin:10px 10px 0 0;}
 .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;}
-.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;}
+.subNav_jiantou{background:url(/images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;}
 .subNav_jiantou:hover{color:#0781b4;  }
 .currentDd{color:#0781b4; }
 .currentDt{background-color:#fff; }
@@ -100,7 +100,7 @@ a:hover.more{ color:#64bdd9;}
 .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*邮件邀请*/
-.box_main{ width:345px; margin:0 auto;padding-left:40px;}
+.box_main{ width:345px; margin:0 auto;padding-left:28px;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;margin-right:40px;}
 .box_p{ color:#404040; margin-bottom:5px;}
 .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}

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 05/13] =?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 da02f3fbb4ee78c28ddc97b171525038d8be0eb2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 Mar 2015 15:45:10 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=BA=E7=A9=BA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index d1b3060f9..225a09aec 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -101,11 +101,6 @@
                     <% end %>
                 </span>
             </div>
-        <% end %>
-    <% else %>
-        <span style="color:#8c8a8a">
-            &nbsp;&nbsp;&nbsp;
-          <%= l(:label_tags_no) %>
-        </span>
+        <% end %>        
     <% end %>
 <% end %>
\ No newline at end of file

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 07/13] =?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 cc5a22f2c6cb3055c25dbad548d11cad95a583e7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 Mar 2015 16:16:38 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 8a731668c..3098a5cda 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -151,7 +151,7 @@
 												<span  class="subnav_num">(<%= @project.issues.count %>)</span><span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-                                            	<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
+                                            	<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %></span>
                                             <% end %>
 										</div>
 										<% end %>
@@ -162,7 +162,7 @@
 												<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-											    <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
+											    <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
                                       	<% end%>
@@ -173,7 +173,7 @@
 												<span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-                                                <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+                                                <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
                                       	<% end%>

From ff65bf4ba58a762c25b4960039a2b5780fa945a0 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 13 Mar 2015 17:10:22 +0800
Subject: [PATCH 09/13] =?UTF-8?q?app=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/upgrade.rb            | 2 +-
 app/controllers/attachments_controller.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/api/mobile/apis/upgrade.rb b/app/api/mobile/apis/upgrade.rb
index e6a7916d9..9ce1831f3 100644
--- a/app/api/mobile/apis/upgrade.rb
+++ b/app/api/mobile/apis/upgrade.rb
@@ -15,7 +15,7 @@ module Mobile
           if attachment.nil?
             raise '未发现客户端！'
           end
-          url = Setting.host_name + "/attachments/download/" + attachment.id.to_s + "/" + attachment.filename
+          url = "http://" + Setting.host_name + "/attachments/download/" + attachment.id.to_s + "/" + attachment.filename
           {
             version: @current_version.version,
             url: url,
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 72f4bdd92..23b080d94 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -20,9 +20,9 @@ class AttachmentsController < ApplicationController
 
   before_filter :find_project, :only => [:show, :download, :thumbnail, :destroy, :delete_homework]#, :except => [:upload, :autocomplete]
   before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young
-  before_filter :delete_authorize, :only => :destroy
-  before_filter :authorize_global, :only => :upload
-  before_filter :authorize_attachment_download1, :only => :download
+  before_filter :delete_authorize, :only => [:destroy]
+  before_filter :authorize_global, :only => [:upload]
+  before_filter :authorize_attachment_download1, :only => [:download]
   #before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'

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 10/13] =?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 11/13] =?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

From aee987d6346dc91205b0b37fd69b9a1e90211157 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 13 Mar 2015 17:47:58 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E9=82=80=E8=AF=B7Trustie=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/invite_members.html.erb | 6 +++---
 config/locales/projects/en.yml             | 5 ++++-
 config/locales/projects/zh.yml             | 5 ++++-
 config/locales/zh.yml                      | 4 +---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index 4b07b9b3e..55fa2487b 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -1,6 +1,6 @@
 
 <div class="project_r_h">
-  <h2 class="project_h2">邀请加入</h2>
+  <h2 class="project_h2"><%= l(:label_invite_join) %></h2>
 </div>
 <%#= render_flash_messages %>
 <%
@@ -20,12 +20,12 @@
     </div>
     <div class="cl"></div>
     <div class="box_main">
-      <h3 class="box_h3">邀请Trustie注册用户</h3>
+      <h3 class="box_h3"><%= l(:label_invite_trustie_user) %></h3>
       <% if roles.any? %>
           <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
               <div class="invi_search">
                 <input hidden="hidden" value="true" name="flag">
-                <input id="principal_search" class="invi_search_input fl" type="text" placeholder="输入用户名称搜索好友">
+                <input id="principal_search" class="invi_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
                 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
                 <div class="cl"></div>
 
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index fdc426ca5..56177bea3 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -90,8 +90,11 @@ en:
   label_send_email: Send
   label_input_email: Please input email address
 
-  
   label_invite_trustie_user: "Invite Trustie registered users" 
+  label_invite_trustie_user_tips: "Please enter the Trustie user name"
+  label_invite_project: "invites you to join the project"
+  label_invite_success: Successful invitation
+  label_invite_members: Invite
 
 
   #   
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index b0a122dd1..c70392171 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -95,7 +95,10 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  
+  label_invite_trustie_user_tips: "请输入用户名称来搜索好友"
+  label_invite_project: 邀请您加入项目
+  label_invite_success: 邀请成功
+  label_invite_members: 邀请用户  
   #   
   #  项目托管平台
   #
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8fdd3ae67..b040d0da5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1714,9 +1714,7 @@ zh:
 
   label_bids_task_list: 作业列表
   label_join_course: 加入
-  label_invite_project: 邀请您加入项目
-  label_invite_success: 邀请成功
-  label_invite_members: 邀请用户
+
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入

From 3b0a229c434f754895f52656c38647bc8493a784 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 18:01:16 +0800
Subject: [PATCH 13/13] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=A1=86=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=202=E3=80=81FIle--->=E8=B5=84=E6=BA=90=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 2 +-
 config/locales/zh.yml                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 2172af8de..bf6862244 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -89,7 +89,7 @@
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
             	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
-            	cookiesave('minStatue','true','','','');
+            	cookiesave('minStatue','false','','','');
 			});
 			//show???
 			 show_btn.bind("click",function() {
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b040d0da5..45d6a9d20 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2078,5 +2078,6 @@ zh:
   label_end_time: 截止时间
   label_send_email: 确定发送
   label_input_email: 请输入邮箱地址
+  project_module_files: 资源库