From 0c8774416e02df8d61b24072fa4a89fd4e7b4cb0 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 16 Dec 2016 20:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb            | 4 ++--
 app/views/projects/_no_data.html.erb                | 2 +-
 app/views/users/_anonymous_evaluation_list.html.erb | 2 +-
 app/views/users/_no_data.html.erb                   | 2 +-
 app/views/users/_no_data.html.erb.BASE.erb          | 0
 app/views/users/_no_data.html.erb.LOCAL.erb         | 4 ----
 app/views/users/_no_data.html.erb.REMOTE.erb        | 4 ----
 app/views/users/_unfinished_homework_list.html.erb  | 2 +-
 app/views/users/_unfinished_poll_list.html.erb      | 2 +-
 app/views/users/project_community.js.erb.BASE.erb   | 0
 app/views/users/project_community.js.erb.LOCAL.erb  | 6 ------
 app/views/users/project_community.js.erb.REMOTE.erb | 6 ------
 12 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 app/views/users/_no_data.html.erb.BASE.erb
 delete mode 100644 app/views/users/_no_data.html.erb.LOCAL.erb
 delete mode 100644 app/views/users/_no_data.html.erb.REMOTE.erb
 delete mode 100644 app/views/users/project_community.js.erb.BASE.erb
 delete mode 100644 app/views/users/project_community.js.erb.LOCAL.erb
 delete mode 100644 app/views/users/project_community.js.erb.REMOTE.erb

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index c636ea701..bbea03ba1 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -167,7 +167,7 @@
                 <ul>
                   <li class="home-user-leftnav-li icons-class clear">
                     <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_course_count}</span>".html_safe : "课程",
-                                {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                                {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :target => "_blank" %>
                     <!--      <div class="user_navmore_box" >
               <ul>
                 <li class="user_navmore_icons">
@@ -203,7 +203,7 @@
 
           <div class="home-user-leftnav">
             <h3 >
-          	  <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl" %>
+          	  <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl", :target => "_blank" %>
 			</h3>
             <ul>
               <li class="home-user-leftnav-li icons-project clear">
diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb
index bc8b97547..79dfc2530 100644
--- a/app/views/projects/_no_data.html.erb
+++ b/app/views/projects/_no_data.html.erb
@@ -1,4 +1,4 @@
 <div class="pro_new_info">
   <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
-  <p class="sy_tab_con_p ">没有数据可供显示！</p>
+  <p class="sy_tab_con_p ">没有数据可以显示~</p>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_anonymous_evaluation_list.html.erb b/app/views/users/_anonymous_evaluation_list.html.erb
index 67447f50e..e2c4fe83d 100644
--- a/app/views/users/_anonymous_evaluation_list.html.erb
+++ b/app/views/users/_anonymous_evaluation_list.html.erb
@@ -19,7 +19,7 @@
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-               <%= link_to ae.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5"%>
+               <%= link_to ae.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5", :target => "_blank"%>
               <li>
             </th>
             <th>
diff --git a/app/views/users/_no_data.html.erb b/app/views/users/_no_data.html.erb
index e6272870c..9fe7d8277 100644
--- a/app/views/users/_no_data.html.erb
+++ b/app/views/users/_no_data.html.erb
@@ -1,4 +1,4 @@
 <div class="pro_new_info mt50" style="width:748px;height:405px;">
   <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
-  <p class="sy_tab_con_p ">该用户无公开动态~</p>
+  <p class="sy_tab_con_p ">没有数据可以显示~</p>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_no_data.html.erb.BASE.erb b/app/views/users/_no_data.html.erb.BASE.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/users/_no_data.html.erb.LOCAL.erb b/app/views/users/_no_data.html.erb.LOCAL.erb
deleted file mode 100644
index e6272870c..000000000
--- a/app/views/users/_no_data.html.erb.LOCAL.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="pro_new_info mt50" style="width:748px;height:405px;">
-  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
-  <p class="sy_tab_con_p ">该用户无公开动态~</p>
-</div>
\ No newline at end of file
diff --git a/app/views/users/_no_data.html.erb.REMOTE.erb b/app/views/users/_no_data.html.erb.REMOTE.erb
deleted file mode 100644
index e6272870c..000000000
--- a/app/views/users/_no_data.html.erb.REMOTE.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="pro_new_info mt50" style="width:748px;height:405px;">
-  <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
-  <p class="sy_tab_con_p ">该用户无公开动态~</p>
-</div>
\ No newline at end of file
diff --git a/app/views/users/_unfinished_homework_list.html.erb b/app/views/users/_unfinished_homework_list.html.erb
index 50e89da7c..17bad07c7 100644
--- a/app/views/users/_unfinished_homework_list.html.erb
+++ b/app/views/users/_unfinished_homework_list.html.erb
@@ -19,7 +19,7 @@
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-                <%=  link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5"%>
+                <%=  link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :target => "_blank"%>
               <li>
             </th>
             <th>
diff --git a/app/views/users/_unfinished_poll_list.html.erb b/app/views/users/_unfinished_poll_list.html.erb
index d674e32dc..7198f350d 100644
--- a/app/views/users/_unfinished_poll_list.html.erb
+++ b/app/views/users/_unfinished_poll_list.html.erb
@@ -18,7 +18,7 @@
             <th>
               <li class="homepageTabProjectName ml5">
                 <% if up.polls_type == "Course" %>
-                    <%= link_to Course.find(up.polls_group_id).name, course_path(Course.find(up.polls_group_id)) %>
+                    <%= link_to Course.find(up.polls_group_id).name, course_path(Course.find(up.polls_group_id)), :target => "_blank" %>
                 <% end %>
               <li>
             </th>
diff --git a/app/views/users/project_community.js.erb.BASE.erb b/app/views/users/project_community.js.erb.BASE.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/users/project_community.js.erb.LOCAL.erb b/app/views/users/project_community.js.erb.LOCAL.erb
deleted file mode 100644
index aeebef08e..000000000
--- a/app/views/users/project_community.js.erb.LOCAL.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
-                                                                      :locals => {:user_activities => @user_activities,
-                                                                                  :page => @page,
-                                                                                  :type => @type,
-                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
-                                                                                  :action => "project_community"} )%>");
\ No newline at end of file
diff --git a/app/views/users/project_community.js.erb.REMOTE.erb b/app/views/users/project_community.js.erb.REMOTE.erb
deleted file mode 100644
index aeebef08e..000000000
--- a/app/views/users/project_community.js.erb.REMOTE.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',
-                                                                      :locals => {:user_activities => @user_activities,
-                                                                                  :page => @page,
-                                                                                  :type => @type,
-                                                                                  :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id),
-                                                                                  :action => "project_community"} )%>");
\ No newline at end of file