From 7c9e20c9bf2489af08b48b16ed4e247d37caeade Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Mar 2016 16:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 0a2c2efdf..2d0f8b0d1 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -111,8 +111,17 @@
 <div class="header">
   <div class="header-con">
     <a href="index.html" class="fl"><%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %><img src="/images/org_new_style/logo.jpg" alt=""/></a>
-    <a href="register.html" class="register fr"></a>
-    <a href="login.html" class="login fr"></a>
+    <% if User.current.logged? %>
+        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
+          <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), user_url_in_org(User.current.id),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
+          <%= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
+          <%= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+        </li>
+        <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
+    <% else %>
+        <li class="navOrgMenu fr"><a href="<%= signin_url_without_domain %>" class="login fr"></a></li>
+        <li class="navOrgMenu fr"><a href="<%= register_url_without_domain %>" class="register fr"></a></li>
+    <% end %>
   </div>
   <div class="cl"></div>
 </div><!--header end-->