From 882ceb6a63847d5b78e0dc0050b01b6b8be5930c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 17 Dec 2016 10:12:56 +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/_user_courses.html.erb           |  4 ++--
 app/views/layouts/base_course_community.html.erb   |  2 +-
 app/views/layouts/new_base_user.html.erb           | 12 ++++++------
 app/views/projects/_no_data.html.erb               |  2 +-
 app/views/users/_no_data.html.erb                  |  2 +-
 app/views/users/_unfinished_homework_list.html.erb |  4 ++--
 app/views/users/_unfinished_poll_list.html.erb     |  4 ++--
 app/views/users/_unfinished_test_list.html.erb     |  4 ++--
 app/views/users/_unsolved_issues_list.html.erb     |  8 ++++----
 app/views/users/project_community.html.erb         |  2 +-
 app/views/users/user_issues.html.erb               |  2 ++
 11 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 1b4f38ec5..83f204bb4 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -8,8 +8,8 @@
       <div class="sub-menu-title c_dark">
         <em></em>
         <font></font>
-        <div>课程：<%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank' %></div>
-        <div>班级：<%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank' %></div>
+        <div>课程：<%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank', :style => "background-color:#fff; height:auto; line-height:1; font-size:12px; color:#aaa;" %></div>
+        <div>班级：<%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :style => "background-color:#fff; height:auto; line-height:1; font-size:12px; color:#aaa;" %></div>
       </div>
       <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                   :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
diff --git a/app/views/layouts/base_course_community.html.erb b/app/views/layouts/base_course_community.html.erb
index c6bcc8925..9a4a509a3 100644
--- a/app/views/layouts/base_course_community.html.erb
+++ b/app/views/layouts/base_course_community.html.erb
@@ -52,7 +52,7 @@
                 <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
                 <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
                 <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
-                  <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
+                  <%= render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
                 </div>
               </li>
               <% if is_current_user %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index bbea03ba1..a65bb8436 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -161,7 +161,7 @@
       <% if is_current_user %>
           <div class="home-user-leftnav">
             <h3 >
-          	  <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" %>
+          	  <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" , :target => "_blank"%>
 			</h3>
             <%# if hidden_unproject_infos %>
                 <ul>
@@ -208,7 +208,7 @@
             <ul>
               <li class="home-user-leftnav-li icons-project clear">
                 <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{user_project_count}</span>".html_safe : "项目",
-                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list' %>
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :target => "_blank" %>
                 <!--    <div class="user_navmore_box" >
               <ul>
                 <li class="user_navmore_icons">
@@ -230,11 +230,11 @@
               </li>
               <li class="home-user-leftnav-li icons-issue clear">
                 <%= link_to issues_author_is_self_count > 0 ? "我发布的issue<span class='issues_nav_tag mr10 fr'style='line-height:18px;margin-top: 9px;'>#{issues_author_is_self_count}</span>".html_safe : "我发布的issue",
-                            user_issues_user_path(@user, :type => "author" ) %>
+                            user_issues_user_path(@user, :type => "author" ), :target => "_blank" %>
               </li>
               <li class="home-user-leftnav-li icons-issue clear">
                 <%= link_to issues_assigned_is_self_count > 0 ? "我收到的issue<span class='issues_nav_tag mr10 fr' style='line-height:18px;margin-top: 9px;'>#{issues_assigned_is_self_count}</span>".html_safe : "我收到的issue",
-                            user_issues_user_path(@user, :type => "assigned") %>
+                            user_issues_user_path(@user, :type => "assigned"), :target => "_blank" %>
               </li>
             </ul>
           </div>
@@ -246,11 +246,11 @@
             <ul>
               <li class="home-user-leftnav-li icons-class clear">
                 <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140'>#{user_course_count}</span>".html_safe : "课程",
-                            {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl" %>
+                            {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl", :target => "_blank" %>
               </li>
               <li class="home-user-leftnav-li icons-project clear">
                 <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag ml140'>#{user_project_count}</span>".html_safe : "项目",
-                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl" %>
+                             {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl", :target => "_blank" %>
               </li>
             </ul>
           </div>
diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb
index 79dfc2530..96a27a999 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/_no_data.html.erb b/app/views/users/_no_data.html.erb
index 9fe7d8277..dbe3d8d8a 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/_unfinished_homework_list.html.erb b/app/views/users/_unfinished_homework_list.html.erb
index 17bad07c7..a802436d2 100644
--- a/app/views/users/_unfinished_homework_list.html.erb
+++ b/app/views/users/_unfinished_homework_list.html.erb
@@ -14,12 +14,12 @@
           <tr>
             <th>
               <li class="homepageTabTitle">
-                <%= link_to uh.name.to_s, student_work_index_path( :homework => uh.id, :tab => 1), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+                <%= link_to uh.name.to_s, student_work_index_path( :homework => uh.id, :tab => 1), :target => "_blank", :class => "homepageTabTitle fl ml5", :title => "#{uh.name.to_s}" %>
               </li>
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-                <%=  link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :target => "_blank"%>
+                <%=  link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :target => "_blank", :title => "#{uh.course.try(:name)}" %>
               <li>
             </th>
             <th>
diff --git a/app/views/users/_unfinished_poll_list.html.erb b/app/views/users/_unfinished_poll_list.html.erb
index 7198f350d..e35b53e71 100644
--- a/app/views/users/_unfinished_poll_list.html.erb
+++ b/app/views/users/_unfinished_poll_list.html.erb
@@ -12,13 +12,13 @@
           <tr>
             <th>
               <li class="homepageTabPollTitle">
-                <%= link_to up.polls_name.to_s, poll_path(up.id), :target => "_blank", :class => "homepageTabPollTitle fl ml5" %>
+                <%= link_to up.polls_name.to_s, poll_path(up.id), :target => "_blank", :class => "homepageTabPollTitle fl ml5", :title => "#{up.polls_name.to_s}" %>
               </li>
             </th>
             <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)), :target => "_blank" %>
+                    <%= link_to Course.find(up.polls_group_id).name, course_path(Course.find(up.polls_group_id)), :target => "_blank", :title => "#{Course.find(up.polls_group_id).name}" %>
                 <% end %>
               <li>
             </th>
diff --git a/app/views/users/_unfinished_test_list.html.erb b/app/views/users/_unfinished_test_list.html.erb
index b13018573..8d95d1a02 100644
--- a/app/views/users/_unfinished_test_list.html.erb
+++ b/app/views/users/_unfinished_test_list.html.erb
@@ -14,12 +14,12 @@
           <tr>
             <th>
               <li class="homepageTabTitle">
-                <%= link_to ut.exercise_name.to_s, exercise_index_path(:course_id => ut.course_id), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+                <%= link_to ut.exercise_name.to_s, exercise_index_path(:course_id => ut.course_id), :target => "_blank", :class => "homepageTabTitle fl ml5", :title => "#{ut.exercise_name.to_s}" %>
               </li>
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-                <%=  link_to ut.course.try(:name), course_path(ut.course_id), :target => "_blank", :class => "homepageTabTitle ml5"%>
+                <%=  link_to ut.course.try(:name), course_path(ut.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :title => "#{ut.course.try(:name)}" %>
               <li>
             </th>
             <th>
diff --git a/app/views/users/_unsolved_issues_list.html.erb b/app/views/users/_unsolved_issues_list.html.erb
index a27e3536b..7eca88f56 100644
--- a/app/views/users/_unsolved_issues_list.html.erb
+++ b/app/views/users/_unsolved_issues_list.html.erb
@@ -15,20 +15,20 @@
           <tr>
             <th>
               <li class="homepageTabTitle">
-                <%= link_to ui.subject.to_s, issue_path(ui), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
+                <%= link_to ui.subject.to_s, issue_path(ui), :target => "_blank", :class => "homepageTabTitle fl ml5", :title => "#{ui.subject.to_s}" %>
               </li>
             </th>
             <th>
               <li class="homepageTabProjectName ml5">
-                <%= link_to ui.project.try(:name), project_path(ui.project_id) %>
+                <%= link_to ui.project.try(:name), project_path(ui.project_id), :target => "_blank", :title => "#{ui.project.try(:name)}"   %>
               <li>
             </th>
             <th>
               <li class="homepageTabAuthor ml5" >
                 <% if ui.author.show_name == ' ' %>
-                    <%= link_to ui.try(:author), user_path(ui.author_id) %>
+                    <%= link_to ui.try(:author), user_path(ui.author_id), :target => "_blank", :title => "#{ui.try(:author)}"  %>
                 <% else %>
-                    <%= link_to ui.author.show_name, user_path(ui.author_id) %>
+                    <%= link_to ui.author.show_name, user_path(ui.author_id), :target => "_blank", :title => "#{ui.author.show_name}" %>
                 <% end %>
               </li>
             </th>
diff --git a/app/views/users/project_community.html.erb b/app/views/users/project_community.html.erb
index ce0129dae..e1c8735a3 100644
--- a/app/views/users/project_community.html.erb
+++ b/app/views/users/project_community.html.erb
@@ -1,7 +1,7 @@
 <script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="homepageRightBanner">
-  <div class="NewsBannerName">消息动态</div>
+  <div class="NewsBannerName">最新动态</div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
       <ul class="homepagePostType" style="margin-left:95px; width:80px" >
diff --git a/app/views/users/user_issues.html.erb b/app/views/users/user_issues.html.erb
index dcfac99aa..c23ff7378 100644
--- a/app/views/users/user_issues.html.erb
+++ b/app/views/users/user_issues.html.erb
@@ -175,8 +175,10 @@
         <% if @type %>
           <% if @type == "assigned" %>
             HoverLi(2);
+            switch_assign_to(<%= User.current.id %>);
           <% else %>
             HoverLi(3);
+            createByMe(<%= User.current.id %>);
           <% end %>
         <% end %>
     });