From 9233213127d6e00e01fafe8855372df50e23ab49 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 3 Mar 2015 17:35:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E8=BF=9B=E5=85=A5=E6=8C=87=E5=AE=9A=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8D=B4=E6=98=AF=E5=9B=BD=E9=98=B2=E7=A7=91=E5=A4=A7=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 2 +-
 app/views/welcome/course.html.erb     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 3ae5538e9..db2f287eb 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -84,7 +84,7 @@ class WelcomeController < ApplicationController
   
   def course
     @course_page = FirstPage.find_by_page_type('course')
-    @school_id = params[:school_id] || User.current.user_extensions.school.try(:id)
+    @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
     @logoLink ||= logolink()
 
     ##3-8月份为查找春季课程，9-2月份为查找秋季课程
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 1d8a56060..95837cb6d 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -108,12 +108,13 @@
       </span>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
-          <% if User.current.logged? %>
+          <%# if User.current.logged? %>
               <li>
                 <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
               </li>
-          <% end %>
-          <% User.current.logged? ? course_count = 9 : course_count = 10 %>
+          <%# end %>
+          <%# User.current.logged? ? course_count = 9 : course_count = 10 %>
+          <% course_count = 9 %>
           <% all_new_hot_course = find_all_new_hot_course(course_count, @school_id, year_now, course_term)%>
           <% while all_new_hot_course.count < course_count%>
               <% if course_term == "春季学期"

From 2c4e86408058c3634234aabfd21c6a2bf601fa23 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 3 Mar 2015 17:53:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?#1949=20=E5=AD=A6=E7=94=9F=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87url=E8=AE=BF=E9=97=AE=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E5=B9=B6=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=B9=B6=E8=BF=9B=E8=A1=8C=E4=BD=9C=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 1b2794034..b897d039a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -23,6 +23,10 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
+    if @poll.polls_status != 2 && !User.current.allowed_to?(:as_teacher,@course)
+      render_403
+      return
+    end
     #已提交问卷的用户不能再访问该界面
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
       render_403

From 5bba54432d47b9d89cf968800255e75615630365 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 4 Mar 2015 09:52:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?#1930=20=E9=A1=B9=E7=9B=AE=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=98=BE=E7=A4=BA=E4=B8=AA=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b8cc2ddc9..d33a33a14 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -134,7 +134,7 @@
                                             </td>
                                             <!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数  !-->
 											<td class="font_index">
-                                              <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %>
+                                              <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}/#{@project.issues.count}", project_issues_path(@project) %>
                                             </td>
 										</tr>
 										<tr class="font_aram">

From 33e9a3e326def600d594c81ee0824a2bd20d4ef7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 4 Mar 2015 10:02:40 +0800
Subject: [PATCH 4/4] =?UTF-8?q?#1958=20=E5=85=B3=E6=B3=A8=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B70=E4=B8=AA=E5=90=8E=E8=BE=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=86=92=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_watchlist.html.erb | 100 ++++++++++++++----------
 config/locales/zh.yml                   |  12 +--
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index e58e35d27..b6e889b91 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -1,47 +1,63 @@
 <h3><%= l(:label_user_watcher)%></h3>
 <div class="inf_user_image">
 	<% for user in User.watched_by(@user.id) %>
-	<ul class="list_watch"><li>
-<table width="660px" border="0" align="center">
-  <tr>
- <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
-     <td><table width="580px" border="0">
-      <tr>  <!-- modified by bai 增加了关注人的名字全称-->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
-        </td>
-        </tr>
-      <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
-        <td colspan="2" width="580px" ><p class="font_description">
-			<%# unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<%# end %>
-			</p>
-			<p class="font_description">
-			<%# unless user.memberships.empty? %>
-              <% user_courses = user_courses_list(user) %>
-              <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
-              <% for course in user_courses %>
-                  <%# if course.name != nil %>
-                  <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
-                  <%# end %>
-              <% end %>
-			<%# end %>
-			</p>
-		</td>
-        </tr>
-        <!-- end -->
-        
-      <tr>        
-        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
-        </td>
-      </tr>
-    </table></td>
-  </tr>
-</table></li></ul>
+	<ul class="list_watch">
+      <li>
+        <table width="660px" border="0" align="center">
+          <tr>
+             <td colspan="2" valign="top" width="50" >
+               <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %>
+             </td>
+             <td>
+               <table width="580px" border="0">
+                <tr>  <!-- modified by bai 增加了关注人的名字全称-->
+                    <td colspan="2" valign="top">
+                      <strong>
+                        <%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
+                      </strong>
+                    </td>
+                </tr>
+                <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
+                    <td colspan="2" width="580px" >
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                        <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
+                        <% memberships = user.memberships.all(:conditions => cond) %>
+                        <%= l(:label_x_contribute_to, :count => memberships.count) %>
+                        <%= "：" unless memberships.empty? %>
+                        <% for member in memberships %>
+                            <%= link_to_project(member.project) %>
+                            <%= (user.memberships.last == member) ? '' : '，' %>
+                        <% end %>
+                        <%# end %>
+                      </p>
+                      <p class="font_description">
+                        <%# unless user.memberships.empty? %>
+                          <% user_courses = user_courses_list(user) %>
+                          <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                          <%= "：" unless user_courses.empty? %>
+                          <% for course in user_courses %>
+                              <%# if course.name != nil %>
+                              <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
+                              <%# end %>
+                          <% end %>
+                        <%# end %>
+                      </p>
+                    </td>
+                </tr>
+                <!-- end -->
+
+                <tr>
+                    <td width="200" align="right" class="font_lighter">
+                      <%= l(:label_user_joinin) %>
+                      <%= format_date(user.created_on) %>
+                    </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+    </li>
+    </ul>
 <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9ef20756f..aa153cda6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1420,9 +1420,9 @@ zh:
   label_contribute_to: 参与了 %{project_count} 个项目：
   #modify by men
   label_x_contribute_to:
-    zero: 参与了 %{count} 个项目：
-    one: 参与了 %{count} 个项目：
-    other: 参与了 %{count} 个项目：
+    zero: 参与了 %{count} 个项目
+    one: 参与了 %{count} 个项目
+    other: 参与了 %{count} 个项目
   #end
   label_total_commit: 共%{total_commit}次提交
   label_question_number: 第%{question_number}题：
@@ -1809,9 +1809,9 @@ zh:
 
   label_course_contribute_to: 参与了 %{project_count} 个项目：
   label_x_course_contribute_to:
-    zero: "参与了 %{count} 个课程："
-    one: "参与了 %{count} 个课程："
-    other: "参与了 %{count} 个课程："
+    zero: "参与了 %{count} 个课程"
+    one: "参与了 %{count} 个课程"
+    other: "参与了 %{count} 个课程"
 
   label_join_contest: 加入竞赛
   label_exit_contest: 退出竞赛