From 02a87a1981ec52029eb2cdc60cad10ab7f62e497 Mon Sep 17 00:00:00 2001
From: miss <994230062@qq.com>
Date: Thu, 28 Sep 2017 10:43:16 +0800
Subject: [PATCH] =?UTF-8?q?tip=E7=9A=84=E5=90=84=E7=A7=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_course_base_info.html.erb     |  6 +++---
 app/views/layouts/_group_children_list.html.erb  |  2 +-
 app/views/repositories/_shixun_dir_list.html.erb |  2 +-
 app/views/shixuns/_shixun_top.html.erb           | 10 ++++++----
 public/stylesheets/css/edu-class.css             |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index a275be916..893fb84cf 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -74,11 +74,11 @@
         <% is_TE = get_user_member_roles_course @course, User.current, 9 %>
         <% is_ST = get_user_member_roles_course @course, User.current, 10 %>
         <% if !is_teacher && (is_TE || is_AD) %>
-            <%= link_to '切换为教师', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TE ? 9 : 3)), :class => "white-btn orange-btn font-14 fr", :title => "由学生身份切换至教师身份" %>
+            <div class="fr" data-tip-down = "由学生身份切换至教师身份"><%= link_to '切换为教师', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TE ? 9 : 3)), :class => "white-btn orange-btn font-14 " %></div>
         <% elsif !is_teacher && is_TA %>
-            <%= link_to '切换为助教', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => 7), :class => "white-btn orange-btn font-14 fr", :title => "由学生身份切换至助教身份" %>
+            <div class="fr" data-tip-down = "由学生身份切换至助教身份"><%= link_to '切换为助教', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => 7), :class => "white-btn orange-btn font-14 " %></div>
         <% elsif is_teacher && is_ST %>
-            <%= link_to '切换为学生', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : (is_TE ? 9 : 3)), :tar_role => 10), :class => "white-btn orange-btn font-14 fr", :title => "由教师身份切换至学生身份" %>
+            <div class="fr" data-tip-down = "由教师身份切换至学生身份"><%= link_to '切换为学生', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : (is_TE ? 9 : 3)), :tar_role => 10), :class => "white-btn orange-btn font-14 " %></div>
         <% end %>
 
         <% unless (is_teacher || is_TA || is_TE || is_ST) %>
diff --git a/app/views/layouts/_group_children_list.html.erb b/app/views/layouts/_group_children_list.html.erb
index b285e0121..417226ba8 100644
--- a/app/views/layouts/_group_children_list.html.erb
+++ b/app/views/layouts/_group_children_list.html.erb
@@ -23,7 +23,7 @@
 <script>
     <% unless @course.course_groups.empty? %>
     <% @course.course_groups.each do |group| %>
-    if($("#course_group_<%=group.id %> a").width() == 105){
+    if($("#course_group_<%=group.id %> a").width() == 96){
         $("#course_group_<%=group.id %> a").attr("data-tip-left","<%= group.name %>");
     }
     <% end %>
diff --git a/app/views/repositories/_shixun_dir_list.html.erb b/app/views/repositories/_shixun_dir_list.html.erb
index 037d6afec..ab20701ce 100644
--- a/app/views/repositories/_shixun_dir_list.html.erb
+++ b/app/views/repositories/_shixun_dir_list.html.erb
@@ -1,5 +1,5 @@
 <div class="autoscroll">
-  <table class="list entries mt5 box_bg_shandow" id="browser" style="table-layout: fixed;">
+  <table class="list entries mt5 box_bg_shandow" id="browser" style="table-layout: fixed;margin-bottom:0">
     <% unless @path.blank? %>
         <tbody>
         <tr style="border: 1px solid #DDD; border-bottom:none;">
diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb
index 1c8c75159..ff3415123 100644
--- a/app/views/shixuns/_shixun_top.html.erb
+++ b/app/views/shixuns/_shixun_top.html.erb
@@ -23,12 +23,14 @@
             <% end %>
         <% elsif @shixun.status == 2 %>
             <% if myshixun.blank? %>
-                <%= link_to "开始实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15 ", :id => "shixun_operation", :remote => true %>
+                <div class="fr" data-tip-down  = "开始学习并完成实战任务"><%= link_to "开始实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => " shixun-task-btn task-btn-orange mr15 ", :id => "shixun_operation", :remote => true %></div>
+
                 <%#= link_to_shixun_exec myshixun, @shixun, '开始实战' %>
             <% else %>
-                <%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15 ", :id => "shixun_operation", :remote => true %>
+                <div class="fr" data-tip-down  = "继续完成后续学习和实战任务"><%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => " shixun-task-btn task-btn-orange mr15 ", :id => "shixun_operation", :remote => true, :id => "shixun_operation", :remote => true %></div>
+
             <% end %>
-            <%= link_to '发送至', search_user_courses_shixun_path(@shixun), :remote => true, :class => "fr shixun-task-btn task-btn-green mr15" %>
+            <div class="fr" data-tip-down  = "发送到我的课堂"><%= link_to '发送至', search_user_courses_shixun_path(@shixun), :remote => true, :class => " shixun-task-btn task-btn-green mr15", :remote => true %></div>
         <% elsif @shixun.status == 3 %>
             <% unless myshixun.blank? %>
                 <%= link_to "继续实战", operation_shixun_path(@shixun, :myshixun_id => myshixun.try(:id)), :class => "fr shixun-task-btn task-btn-orange mr15 ", :id => "shixun_operation", :remote => true %>
@@ -37,7 +39,7 @@
         <% end %>
         <% if @shixun.can_copy %>
             <%#= link_to "复制", copy_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-green mr15" %>
-            <a href="javascript:void(0);" onclick="op_confirm_box_loading('<%= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = "fr shixun-task-btn task-btn-green mr15">复制</a>
+            <div class="fr" data-tip-down = "基于这个实训修改形成新的实训"><a href="javascript:void(0);" onclick="op_confirm_box_loading('<%= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = " shixun-task-btn task-btn-green mr15">复制</a></div>
         <% end %>
     <% end %>
     <div class="cl"></div>
diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css
index 2cb9345a0..851953c89 100644
--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@@ -192,7 +192,7 @@ em{font-style:normal;}
 .stud-class-set .news  .container .member .people .left li .p1{position:relative;}
 .stud-class-set .news  .container .member .people .left li .p1 span{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .edu-break-out{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
-.edu-break-outshort{width:96px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
+.edu-break-outshort{max-width:96px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .stud-class-set .news  .container .member .people .left li .p1 em{margin-left:10px;font-size:12px;background:#e9e9e9;border-radius:8px;padding:2px 5px;}
 .stud-class-set .news  .container .member .people .left li .p1 i{color:#ddd;cursor: pointer;position:absolute;right:10px;top:17px;}
 .stud-class-set .news  .container .member .people .left li .p1 i:hover{color:#FF7500;}