From 76d125154625d4a70c615bb071296dedee2b6656 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 17 May 2016 09:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E7=BB=84=E7=BB=87=E9=97=A8=E6=88=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=8F=E6=8C=AA=E5=88=B0=E4=B8=8Elogo?=
 =?UTF-8?q?=E5=90=8C=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb          |  4 +-
 .../_org_logined_header.html.erb              | 52 ++++++++-----------
 public/stylesheets/org2.css                   |  2 +-
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 9b481fac5..4cae284f5 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -60,11 +60,10 @@
 <!--内容开始-->
 <header>
   <div class="sn-header">
-    <%= render :partial => 'organizations/org_logined_header' %>
     <div class="sn-row sn-bg-white">
       <div class="sn-logo">
         <% if @org_logo_attchment.blank? %>
-            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
         <% else %>
             <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
         <% end %>
@@ -74,6 +73,7 @@
         <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
 
         <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
+        <%= render :partial => 'organizations/org_logined_header' %>
       </div>
     </div>
     <!--导航-->
diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb
index 22cf920e9..74e313f6a 100644
--- a/app/views/organizations/_org_logined_header.html.erb
+++ b/app/views/organizations/_org_logined_header.html.erb
@@ -1,37 +1,31 @@
 <% if User.current.logged? %>
-    <div class="sn-row sn-bg-grey">
-      <div class="sn-login2">
-        <div class="navHomepageProfile sn-mt4" id="navHomepageProfile">
-          <ul>
-            <li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
-              <%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
-              <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
-              <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
-                <li>
-                  <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
-                </li>
-                <li>
-                  <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
-                </li>
-                <li>
-                  <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
-                </li>
-                <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
-                <li>
-                  <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
-                </li>
-              </ul>
+    <div class="navHomepageProfile" id="navHomepageProfile">
+      <ul>
+        <li class="homepageProfileMenuIcon fr sn-mt23" id="homepageProfileMenuIcon">
+          <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+          <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
+          <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
+            <li>
+              <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
+            </li>
+            <li>
+              <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
+            </li>
+            <li>
+              <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
+            </li>
+            <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+            <li>
+              <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
             </li>
           </ul>
-        </div>
-      </div>
+        </li>
+      </ul>
     </div>
 <% else %>
-    <div class="sn-row sn-bg-grey">
-      <div class="sn-login">
-        <a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;
-        <a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
-      </div>
+    <div class="sn-fr">
+      <a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
     </div>
 <% end %>
 
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index c2cf0a478..3d46a9296 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -47,6 +47,7 @@ a.sn-link-select {color:#809df9;}
 .sn-mt10 {margin-top:10px;}
 .sn-mt13 {margin-top:13px;}
 .sn-mt15 {margin-top:15px;}
+.sn-mt23 {margin-top:23px;}
 .sn-mt28 {margin-top:28px;}
 .sn-mb20 {margin-bottom:20px;}
 .sn-mb40 {margin-bottom:40px;}
@@ -65,7 +66,6 @@ a.sn-link-select {color:#809df9;}
 .sn-bg-white {background-color:#fff;}
 .sn-bg-blue {background-color:#24366e;}
 .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
-.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
 .sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}