From 427f26b0584e2776cc1c0e0f0dfa796fab6a2b7c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 16:37:24 +0800
Subject: [PATCH] =?UTF-8?q?header=E7=9A=84login=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_new_header.html.erb   | 2 +-
 app/views/messages/_course_show.html.erb | 4 ++--
 public/stylesheets/public.css            | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index a430a8e8f..758386f2d 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -18,7 +18,7 @@
         <% if User.current.logged? -%>
 
             <li id="current_user_li">
-              <%= link_to_user_header(User.current,false,:class =>'parent')%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.user_domain}, :class => "uses_name"%>
               <ul id="user_sub_menu">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 50a97d9ba..256c41b99 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -8,8 +8,8 @@
     <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
   </div>
   <div class="talk_txt fl">
-    <p class="problem_tit fl fb" >
-      <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+    <p class="problem_tit fl fb c_blue" >
+      <%= @topic.subject %>
     </p>
     <br/>
     <p>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2f45bbd69..ae5dd3702 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -218,9 +218,10 @@ div#menu a {position: relative;z-index: 10; height: 41px; display: block; float:
 div#menu a:hover, div#menu a:hover span { color: #a1ebff; }
 div#menu li.current a {}
 div#menu  {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;}
-div#menu ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-div#menu ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
-div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
+div#menu ul  a.user_name  {  width:170px; text-align:right; margin:0; }
+.pic_triangle{background: url(../images/item.png) -90px -48px no-repeat; float:right; display:block; width:10px; height:10px; margin-top:12px; margin-left:7px;}
+.pic_triangle:hover{background: url(../images/item.png) -90px -78px no-repeat; }
+div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;width:60px;}
 div#menu ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
 /* menu::level1 */
 div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
@@ -288,6 +289,7 @@ a.close_btn {background-position:-44px 0;}
 a:hover.close_btn {background-position:-66px 0;}
 .show_btn {background-position:-119px 0;}
 .msgserver a {color:#15bccf; }
+.msgserver a:hover { text-decoration:underline; }
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}