From c745f69e95d83f457bd3c1b57d8deff51124c638 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 1 Dec 2016 15:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8Cfork=E5=88=97=E8=A1=A8=EF=BC=8C=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=82=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=B0=8F=E9=93=83=E9=93=9B?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E7=8F=AD=E7=BA=A7=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb               | 8 ++++----
 app/views/issues/_statistics.html.erb                | 2 +-
 app/views/projects/member_forked.html.erb            | 5 ++++-
 app/views/projects/project_watcherlist.html.erb      | 4 ++++
 app/views/users/_join_course_course_message.html.erb | 6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b9d61e61e..dcd337df2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -543,12 +543,12 @@ class ProjectsController < ApplicationController
         @users -= watched.watcher_users if  @watched
       end
       @watchers = @project.watcher_users
-      @limit = 20
+      @limit = 32
       @is_remote = true
       @watchers_count = @watchers.count
       @watcher_pages = Paginator.new @watchers_count, @limit, params['page'] || 1
       @offset ||= @watcher_pages.offset
-      @watchers = paginateHelper @watchers, 20
+      @watchers = paginateHelper @watchers, @limit
     end
   end
 
@@ -611,14 +611,14 @@ class ProjectsController < ApplicationController
         @applied_members = appied_project_members(@project, @members)
       end
     end
-    @members = paginateHelper @members
+    @members = paginateHelper @members, 32
 
   end
 
   def member_forked
     @forked_projects = Project.where(:forked_from_project_id => @project.id)
 
-    @limit = 20
+    @limit = 32
     @is_remote = true
     @forked_count = @forked_projects.count
     @forked_pages = Paginator.new @forked_count, @limit, params['page'] || 1
diff --git a/app/views/issues/_statistics.html.erb b/app/views/issues/_statistics.html.erb
index 8b1fc6f22..d284aabb4 100644
--- a/app/views/issues/_statistics.html.erb
+++ b/app/views/issues/_statistics.html.erb
@@ -4,7 +4,7 @@
 </div>
 <div class="clear">
   <div>
-    <ul class="new_roadmap_nav fl"  >
+    <ul class="new_roadmap_nav fl" style="margin-left: 0px">
       <li class="new_roadmap_nav_hover" id="new_roadmap_nav_1" onclick="HoverLi(1);">
         <%= link_to "所有<span class='new_roadmap_nav_taghover ml5' id='new_roadmap_num_1'>#{@issues_filter.count}</span>".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_1" %>
       </li>
diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb
index 668feef98..b3cfad1d4 100644
--- a/app/views/projects/member_forked.html.erb
+++ b/app/views/projects/member_forked.html.erb
@@ -1,3 +1,4 @@
+<% if @forked_count > 0 %>
 <div class="pro_new_info mb10">
   <h2 class="clear">成员<span class="fr pro_new_font mr15" >本页面展示Fork了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户</span></h2>
   <ul class="clear pro_new_users_box">
@@ -24,4 +25,6 @@
   </div>
   <div class="cl"></div>
 </div>
-
+<% else %>
+    <%= render :partial => "projects/no_data" %>
+<% end %>
diff --git a/app/views/projects/project_watcherlist.html.erb b/app/views/projects/project_watcherlist.html.erb
index 440975e68..c421f4f81 100644
--- a/app/views/projects/project_watcherlist.html.erb
+++ b/app/views/projects/project_watcherlist.html.erb
@@ -1,3 +1,4 @@
+<% if @watchers.count > 0 %>
 <div class="pro_new_info mb10">
   <h2 class="clear">成员<span class="fr pro_new_font mr15" > 本页面展示关注了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户</span></h2>
   <ul class="clear pro_new_users_box">
@@ -24,6 +25,9 @@
   </div>
   <div class="cl"></div>
 </div>
+<% else %>
+    <%= render :partial => "projects/no_data" %>
+<% end %>
 
 
 
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index c69d66ad0..eacbfac8c 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -1,11 +1,11 @@
 <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
 <li class="homepageNewsPubType fl">
   <span class="newsBlue homepageNewsPublisher">系统提示</span>
-  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
+  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的班级成员申请：</span>
 </li>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <a href="javascript:void(0);" class="newsGrey">
-    <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}" %>
+    <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %>
     <%= link_to content, user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
                 :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
@@ -14,7 +14,7 @@
 </li>
 <div style="display: none" class="message_title_red system_message_style">
   <p>
-    <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的课程成员申请，信息如下：
+    <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
   </p>
   <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
   <p>申请课程：<%= Course.find(ma.course_id).name%></p>