From 348a4df8d8a71fd3d773cab87597e98f04848077 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 27 Oct 2015 14:31:46 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 131fdcd88..b388b660c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -325,9 +325,6 @@ class CoursesService
           else
             @state = 1
           end
-          else
-            @state = 1
-          end
         else
           if params[:course_password] == course.password
             if params[:role] == "10"

From e9a0334ab1c4f2fd0a946a315405030ce2d9f114 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 3 Nov 2015 17:41:25 +0800
Subject: [PATCH 02/13] Merge branch 'szzh' into dev_zanle

---
 app/services/courses_service.rb | 56 ++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index e3b81d6d5..e566a8f46 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -326,45 +326,49 @@ class CoursesService
               #如果加入的角色教辅并且当前为教辅
             elsif params[:role] == "7" && roleName == "TeachingAsistant"
               @state = 9
+            elsif roleName == "Manager"
+              @state = 10
+              #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
+            elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
+              #如果已经发送过消息了，那么就要给个提示
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0 ").count != 0
+                @state = 7
+              else
+                Mailer.run.join_course_request(course, User.current, params[:role])
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                @state = 6
+              end
               #如果加入角色是学生，但是是当前课程的教师或者教辅
             elsif params[:role] == "10" && roleName != "Student"
               member.role_ids = [params[:role]]
               member.save
               StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
               @state = 0
-            elsif roleName == "Manager"
-              @state = 10
-              #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求
-            elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" )
-              Mailer.run.join_course_request(course, User.current, params[:role])
-              #如果加入角色为教师或者教辅
-              CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
-              @state = 6
             end
           else
             @state = 1
           end
         else
-            if params[:course_password] == course.password
-                if params[:role] == "10" || params[:role] == nil
-                  members = []
-                  members << Member.new(:role_ids => [10], :user_id => current_user.id)
-                  course.members << members
-                  StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
-                  @state = 0
-                else
-                  #如果已经发送过消息了，那么就要给个提示
-                    if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
-                      @state = 7
-                    else
-                      Mailer.run.join_course_request(course, User.current, params[:role])
-                      CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
-                      @state = 6
-                    end
-                end
+          if params[:course_password] == course.password
+            if params[:role] == "10" || params[:role] == nil
+              members = []
+              members << Member.new(:role_ids => [10], :user_id => current_user.id)
+              course.members << members
+              StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
+              @state = 0
             else
-              @state = 1
+              #如果已经发送过消息了，那么就要给个提示
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+                @state = 7
+              else
+                Mailer.run.join_course_request(course, User.current, params[:role])
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                @state = 6
+              end
             end
+          else
+            @state = 1
+          end
         end
       end
     else

From 43d9c5636ab27167e84c8a9f9271b2a34a911790 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 4 Nov 2015 10:13:25 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E5=9C=A8ie11=E4=B8=8B=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index da24e2878..7a93ab3ef 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -282,7 +282,7 @@ function regexTitle()
 function regexDescription()
 {
     var name = news_description_editor.html();
-    if(name.length ==0)
+    if(news_description_editor.isEmpty())
     {
         $("#description_notice_span").text("描述不能为空");
         $("#description_notice_span").css('color','#ff0000');

From 04ba73fb7acd19d6d0c71bb4d96d8af9950fb899 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 4 Nov 2015 10:19:27 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=8F=91=E5=B8=96=20?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 8314c3902..25a4fae46 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -58,15 +58,15 @@
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
             memo_content.sync();
             $("#new_memo").submit();
-        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
             $("#error").html("主题和内容不能为空").show();
         }
-        else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
             $("#error").html("主题不能为空").show();
-        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
             $("#error").html("内容不能为空").show();
         }
     }

From ea6c4b09fe7542afb25c54e63e617f731464c208 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 4 Nov 2015 10:24:07 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B8=96=20=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 7ab460555..d26ebdbf8 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -2,7 +2,7 @@
 <script>
 
   function check_and_submit(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+      if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
           if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
@@ -13,11 +13,11 @@
 //          }
           memo_content.sync();
           $("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
           $("#error").html("内容不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
           $("#error").html("主题和内容不能为空").show();
       }
   }

From de0ca8d3d80b5a3861ca6b4fcba242c4d2118944 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 4 Nov 2015 11:03:45 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84ke=20=E5=86=85=E5=AE=B9=E6=8F=90=E4=BA=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 7a93ab3ef..90d085ea3 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -176,7 +176,7 @@ function regexTopicSubject() {
 function regexTopicDescription()
 {
     var name = message_content_editor.html();
-    if(name.length ==0)
+    if(message_content_editor.isEmpty())
     {
         $("#message_content_span").text("描述不能为空");
         $("#message_content_span").css('color','#ff0000');
@@ -327,7 +327,7 @@ function submitComment()
 
 function newsReplyVerify() {
     var content = comment_editor.html();
-    if(content.length == 0) {
+    if(comment_editor.isEmpty()) {
         $("#add_reply_news").text("评论不能为空");
         $("#add_reply_news").css('color', '#ff0000');
         return false;
@@ -356,7 +356,7 @@ function course_board_canel_message_replay()
 
 function MessageReplayVevify() {
     var content = message_content_editor.html();//$.trim($("#message_content").val());
-    if (content.length == 0) {
+    if (message_content_editor.isEmpty()) {
         $("#message_content_span").text("回复不能为空");
         $("#message_content_span").css('color', '#ff0000');
         return  false;

From a996e658a9d8b074bd6f3c4bf4d2f1699a069157 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 Nov 2015 14:50:39 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...e_rep_if_fault.rake => gitlab_to_git.rake} |  0
 lib/tasks/sync_sigle_rep.rake                 | 24 +++++++++++++++++++
 lib/trustie/gitlab/sync.rb                    |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 rename lib/tasks/{update_rep_if_fault.rake => gitlab_to_git.rake} (100%)
 create mode 100644 lib/tasks/sync_sigle_rep.rake

diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/gitlab_to_git.rake
similarity index 100%
rename from lib/tasks/update_rep_if_fault.rake
rename to lib/tasks/gitlab_to_git.rake
diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake
new file mode 100644
index 000000000..6b7be700f
--- /dev/null
+++ b/lib/tasks/sync_sigle_rep.rake
@@ -0,0 +1,24 @@
+#coding=utf-8
+
+namespace :sync_rep do
+  desc "sync some projects which just have sigle repository"
+  task :sigle => :environment do
+    projects = Project.where("id =?",24)
+    projects.each do |project|
+      # 针对类型为Git并且只有一个版本库的项目
+      if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git"
+        rep = project.repositories.first
+        s = Trustie::Gitlab::Sync.new
+        s.sync_project(project, path: rep.identifier, import_url: rep.url)
+        rep.type = 'Repository::Gitlab'
+        rep.save
+        puts "*************************************"
+        puts project.id
+        puts rep.id
+        puts rep.identifier
+        puts rep.url
+        puts project.user_id
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index 3a8e8380c..de4bec70b 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -66,7 +66,7 @@ module Trustie
             if opt[:password]
                 import_url.sub('@', ":#{opt[:password]}@")
             end
-            
+
             # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git
             # can use password
             gproject = self.g.create_project(path, 

From 1133b35169b67a138f8b049467c0824e996f0e45 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 4 Nov 2015 15:24:24 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BD=9C=E4=B8=9Atag=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb     | 14 +++++++++----
 .../users/_user_homework_detail.html.erb      | 20 ++++++++++++-------
 public/stylesheets/courses.css                |  2 +-
 public/stylesheets/new_user.css               |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 77f7d97dd..be7945cc0 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -13,25 +13,31 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w480 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
       <% if activity.homework_detail_manual%>
           <% if activity.homework_detail_manual.comment_status == 1%>
               <% if activity.anonymous_comment == 0%>
                   <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
               <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif activity.homework_detail_manual.comment_status == 2%>
               <% if activity.anonymous_comment == 0%>
                   <span class="green_btn_cir ml5">匿评中</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif activity.homework_detail_manual.comment_status == 3%>
               <% if activity.anonymous_comment == 0%>
                   <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
@@ -52,7 +58,7 @@
             </div>
         <% end %>
 
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 3d841b087..f9743d7c3 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -10,7 +10,7 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w480 fl">
+          <span class="homepagePostTitle hidden m_w505 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
@@ -19,19 +19,25 @@
               <span class="grey_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
               <% if homework_common.anonymous_comment == 0%>
-                    <span class="grey_btn_cir ml5">未开启匿评</span>
+                <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
               <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 2%>
               <% if homework_common.anonymous_comment == 0%>
-                  <span class="green_btn_cir ml5">匿评中</span>
+                <span class="green_btn_cir ml5">匿评中</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 3%>
               <% if homework_common.anonymous_comment == 0%>
-                  <span class="grey_btn_cir ml5">匿评已结束</span>
+                <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
 
@@ -56,7 +62,7 @@
             </div>
         <% end %>
         <div class="homepagePostDeadline">
-          <%= l(:label_end_time)%>：<%= homework_common.end_time%>
+          <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
         </div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 317a21d02..22560f0aa 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -966,7 +966,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
-.m_w480{max-width: 480px;}
+.m_w505{max-width: 505px;}
 .m_w500{max-width: 500px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6a296b941..061ad0561 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1073,7 +1073,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
-.m_w480{max-width: 480px;}
+.m_w505{max-width: 505px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}

From 58b7250d39ea64dc76789c3e77a0df4ad64912db Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 Nov 2015 16:19:25 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E5=8F=82=E6=95=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/sync_sigle_rep.rake | 4 +---
 lib/trustie/gitlab/sync.rb    | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake
index 6b7be700f..b99221c83 100644
--- a/lib/tasks/sync_sigle_rep.rake
+++ b/lib/tasks/sync_sigle_rep.rake
@@ -3,7 +3,7 @@
 namespace :sync_rep do
   desc "sync some projects which just have sigle repository"
   task :sigle => :environment do
-    projects = Project.where("id =?",24)
+    projects = Project.all
     projects.each do |project|
       # 针对类型为Git并且只有一个版本库的项目
       if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git"
@@ -16,8 +16,6 @@ namespace :sync_rep do
         puts project.id
         puts rep.id
         puts rep.identifier
-        puts rep.url
-        puts project.user_id
       end
     end
   end
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index de4bec70b..8c84984ee 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -76,6 +76,7 @@ module Trustie
                             wall_enabled: false,
                             issues_enabled: false,
                             snippets_enabled: false,
+                            merge_requests_enabled: true,
                             public: false,
                             user_id: gid,
                             import_url: import_url

From 496aeb4456095dc03af7785a164c6f82885226bf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 Nov 2015 16:23:08 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index e51683295..ec8562885 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -49,7 +49,7 @@
     <% end %>
     <a class="subnav_num">(<%= @project.repositories.count %>)</a>
     <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
-        <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
+        <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
     <% end %>
   </div>
 <% end %>

From 35c60c325339bc1e2416a2123beb794a6ae0169e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 5 Nov 2015 09:37:56 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb         | 27 +++++++++++++++----
 app/views/users/_course_homework.html.erb     | 18 ++++++-------
 .../users/_user_homework_detail.html.erb      | 20 +++++++-------
 public/stylesheets/courses.css                |  5 +++-
 public/stylesheets/new_user.css               |  7 +++--
 5 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 78f11737b..8f1f0033e 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -120,14 +120,31 @@
 
     <div class="homeworkInfo" id="homeworkInformation">
       <div class="">
-        <div class="homepagePostTitle fl hidden m_w500" title="<%= @homework.name %>"><%= @homework.name %></div>
+        <div class="homepagePostTitle fl hidden m_w460" title="<%= @homework.name %>"><%= @homework.name %></div>
         <% if @homework.homework_detail_manual%>
-            <% if @homework.homework_detail_manual.comment_status == 1%>
-                <span class="grey_btn_cir ml10">未开启匿评</span>
+            <% if @homework.homework_detail_manual.comment_status == 0 %>
+                <span class="grey_homework_btn_cir ml5">未发布</span>
+            <% elsif @homework.homework_detail_manual.comment_status == 1%>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="grey_homework_btn_cir ml5">未开启匿评</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5">作品提交中</span>
             <% elsif @homework.homework_detail_manual.comment_status == 2%>
-                <span class="green_btn_cir ml10">匿评中</span>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="green_homework_btn_cir ml5">匿评中</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
             <% elsif @homework.homework_detail_manual.comment_status == 3%>
-                <span class="grey_btn_cir ml10">匿评已结束</span>
+                <% if @homework.anonymous_comment == 0%>
+                    <span class="grey_homework_btn_cir ml5">匿评已结束</span>
+                <% else %>
+                    <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
+                <% end %>
+                <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
             <% end%>
         <% end%>
         <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏作业信息 ]</a> </span>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index be7945cc0..f442e34e4 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -19,25 +19,25 @@
       <% if activity.homework_detail_manual%>
           <% if activity.homework_detail_manual.comment_status == 1%>
               <% if activity.anonymous_comment == 0%>
-                  <span class="grey_btn_cir ml5">未开启匿评</span>
+                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
               <% else %>
-                  <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">作品提交中</span>
+              <span class="green_homework_btn_cir ml5">作品提交中</span>
           <% elsif activity.homework_detail_manual.comment_status == 2%>
               <% if activity.anonymous_comment == 0%>
-                  <span class="green_btn_cir ml5">匿评中</span>
+                  <span class="green_homework_btn_cir ml5">匿评中</span>
               <% else %>
-                  <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif activity.homework_detail_manual.comment_status == 3%>
               <% if activity.anonymous_comment == 0%>
-                  <span class="grey_btn_cir ml5">匿评已结束</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
               <% else %>
-                  <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index f9743d7c3..1947c8ce8 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -16,28 +16,28 @@
 
       <% if homework_common.homework_detail_manual%>
           <% if homework_common.homework_detail_manual.comment_status == 0 %>
-              <span class="grey_btn_cir ml5">未发布</span>
+              <span class="grey_homework_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
               <% if homework_common.anonymous_comment == 0%>
-                <span class="grey_btn_cir ml5">未开启匿评</span>
+                  <span class="grey_homework_btn_cir ml5">未开启匿评</span>
               <% else %>
-                <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">作品提交中</span>
+              <span class="green_homework_btn_cir ml5">作品提交中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 2%>
               <% if homework_common.anonymous_comment == 0%>
-                <span class="green_btn_cir ml5">匿评中</span>
+                  <span class="green_homework_btn_cir ml5">匿评中</span>
               <% else %>
-                <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 3%>
               <% if homework_common.anonymous_comment == 0%>
-                <span class="grey_btn_cir ml5">匿评已结束</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已结束</span>
               <% else %>
-                <span class="grey_btn_cir ml5">匿评已禁用</span>
+                  <span class="grey_homework_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
+              <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
 
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 22560f0aa..7a3d43469 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -178,7 +178,9 @@ a.f_grey:hover {color:#000000;}
 /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -966,6 +968,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w460{max-width: 460px;}
 .m_w505{max-width: 505px;}
 .m_w500{max-width: 500px;}
 .m_w530{max-width: 530px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 061ad0561..0b45685ee 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -293,8 +293,10 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
 .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -1073,6 +1075,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w460{max-width: 460px;}
 .m_w505{max-width: 505px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}

From 48cef54b9e3ad59315863f41d03be2e1b5a4f01f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 5 Nov 2015 10:40:24 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=97=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=AD=A6=E7=94=9F=E7=9A=84=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_programing_work_show.html.erb            | 32 ++++++++--------
 app/views/student_work/_show.html.erb         | 38 +++++++++----------
 .../student_work/_student_work_list.html.erb  | 10 ++++-
 app/views/student_work/show.js.erb            |  4 +-
 4 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index b5ff8f064..dbf7291cb 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -3,21 +3,21 @@
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
-      <%=format_time @work.created_at %>
+      <%=format_time work.created_at %>
     </li>
 
-    <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
-          <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
         </li>
         <li class="fr" >
           <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
         <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
         </li>
     <% end%>
@@ -26,7 +26,7 @@
     <li >
       <span class="tit_fb ">编程代码：</span>
       <div class="showHworkP break_word">
-        <%= text_format(@work.description) if @work.description%>
+        <%= text_format(work.description) if work.description%>
       </div>
       <div class="cl"></div>
     </li>
@@ -37,10 +37,10 @@
             测试结果：
           </span>
           <div class="show_hwork_p break_word">
-            <% @work.student_work_tests.each_with_index do |test, index| %>
+            <% work.student_work_tests.each_with_index do |test, index| %>
                 <div class="ProResultTop">
                   <p class="c_blue fl">
-                    第<%= @work.student_work_tests.count - index%>次测试
+                    第<%= work.student_work_tests.count - index%>次测试
                   </p>
                   <span class="fr c_grey">
                     <%= test.created_at.to_s(:db) %>
@@ -79,24 +79,24 @@
     <% end%>
 
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
           <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
   </ul>
 
-  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%@student_work_scores.each do |score|%>
-        <div id="work_score_<%= score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
+  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%student_work_scores.each do |student_score|%>
+        <div id="work_score_<%= student_score.id%>">
+          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
         </div>
     <% end%>
   </div>
   <!---ping_box end--->
-  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index cfc4129a8..1f3d44258 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -3,21 +3,21 @@
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
-      <%=format_time @work.created_at %>
+      <%=format_time work.created_at %>
     </li>
 
-    <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
-          <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+          <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
         </li>
         <li class="fr" >
-          <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
+          <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
         <!-- 匿评结束阶段，显示点赞按钮 -->
-        <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
         </li>
     <% end%>
@@ -25,50 +25,50 @@
 
     <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
 
-    <% if @work.project%>
+    <% if work.project%>
         <li >
           <span class="tit_fb"> 关联项目：</span>
-          <%= link_to( @work.project.name, project_path(@work.project.id), :class => "linkBlue" )%>
+          <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
         </li>
     <% end%>
 
     <li >
       <span class="tit_fb ">内容：</span>
       <div class="showHworkP break_word">
-        <%= text_format(@work.description) if @work.description%>
+        <%= text_format(work.description) if work.description%>
       </div>
       <div class="cl"></div>
     </li>
     <li >
       <span class="tit_fb"> 附件：</span>
-      <% if @work.attachments.empty?%>
+      <% if work.attachments.empty?%>
           <span style="color: #999999">尚未提交附件</span>
       <% else%>
           <div class="fl" style="width: 90%;">
-            <%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%>
           <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
-          <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
-            <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+          <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+            <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
           </div>
       <% end%>
       <div class="cl"></div>
     </li>
   </ul>
 
-  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%@student_work_scores.each do |score|%>
-        <div id="work_score_<%= score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
+  <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%student_work_scores.each do |student_score|%>
+        <div id="work_score_<%= student_score.id%>">
+          <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
         </div>
     <% end%>
   </div>
   <!---ping_box end--->
-  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
   <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index e23fcceda..c8248d86a 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -35,6 +35,14 @@
         <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
     <% end%>
     <div class="cl"></div>
-    <div id="about_hwork_<%= student_work.id%>"></div>
+    <div id="about_hwork_<%= student_work.id%>">
+      <% if student_work.user == User.current %>
+        <% if @homework.homework_type == 2%>
+            <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+        <% else %>
+            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+        <% end %>
+      <% end %>
+    </div>
     <div class="cl"></div>
 <% end%>
\ No newline at end of file
diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb
index e6b99c146..d61c4b9a1 100644
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@@ -3,9 +3,9 @@ if($("#about_hwork_<%= @work.id%>").children().length > 0){
 }
 else{
   <% if @homework.homework_type == 2%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>");
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
   <% else%>
-    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
+    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
   <% end%>
   $('#score_<%= @work.id%>').peSlider({range: 'min'});
 }
\ No newline at end of file

From 59e95b08d7b462120c1b9e91b0d9cd3de85245e1 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 5 Nov 2015 13:49:27 +0800
Subject: [PATCH 13/13] feed_back

---
 config/locales/commons/zh.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 3b5e9790e..ee361cc2f 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -354,7 +354,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!"
+  label_feedback_tips: "请在此提问平台问题，或直接加入师姐答疑群，谢谢！"
   label_technical_support: "QQ 在线支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"