From 6c62d7be0b63bfe69fd51a209b9ebd75e4c4af9e Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Fri, 24 Mar 2017 15:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=A0=87=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20=E5=88=A0=E9=99=A4=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_shixun.html.erb | 2 +-
 app/views/shixuns/_shixun_top.html.erb | 4 ++--
 public/stylesheets/css/taskstyle.css   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb
index 10898d17e..83c289a8c 100644
--- a/app/views/layouts/base_shixun.html.erb
+++ b/app/views/layouts/base_shixun.html.erb
@@ -20,7 +20,7 @@
 
   <%= render :partial => 'shixuns/shixun_top' %>
 
-  <%= render_flash_messages %>
+  <%#= render_flash_messages %>
   <div class="task-pm-content">
     <%= yield %>
   </div>
diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb
index db3403cae..703a0a8ef 100644
--- a/app/views/shixuns/_shixun_top.html.erb
+++ b/app/views/shixuns/_shixun_top.html.erb
@@ -2,8 +2,8 @@
 <div class="task-header">
   <div class="task-header-info">
     <h2 class="fl">
-      <a href="<%= user_path(@shixun.owner) %>"><%= @shixun.owner.try(:show_name) %>导师</a>
-      <span class="ml5 mr5">/ </span><a href="<%= shixun_path(@shixun.parent) %>"><%= @shixun.name %></a>
+      <a href="<%= user_path(@shixun.owner) %>" class="task-header-name fl"><%= @shixun.owner.try(:show_name) %>导师</a>
+      <span class="ml5 mr5 fl">/ </span><p class="task-header-title fl" title="<%= @shixun.name %>"><%= @shixun.name %></p>
     </h2>
     <% if allow_shixun_exec(@shixun) %>
         <%= link_to "开始挑战", shixun_monitor_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", :remote => true %>
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index bc0ad0d45..f8ec1cb11 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -138,6 +138,8 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
 .task-header{ width: 100%; background:url("/images/task/task-bg-header.png") 0 0 repeat-x; height: 100px;}
 .task-header-info{ width: 1000px; margin: 0 auto; color:#fff; padding:30px 0;}
 .task-header-info h2 a,.task-header-info h2{ font-weight: normal;color:#fff;}
+a.task-header-name{ max-width:200px;}
+.task-header-title{ display: block; max-width:750px;word-wrap: break-word;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .task-header-nav{ width: 100%; height:50px; background:#282c37;}
 .task-header-navs{ width: 1000px; margin: 0 auto;}
 .task-header-navs li{ float: left;}