From c0acaab40469654c955ad456fe3543373e4bb7d5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 13:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5logo=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb       | 12 +++++++++++-
 app/views/layouts/base_sub_domain.html.erb |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 0de2894b0..ade8e70a6 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -83,7 +83,17 @@
   <div class="sn-header">
     <%= render :partial => 'organizations/org_logined_header' %>
     <div class="sn-row sn-bg-white">
-      <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+      <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=""/>
+        <% else %>
+            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+        <% end %>
+        <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+        
         <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
       </div>
     </div>
diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
index bab438abd..3ab589111 100644
--- a/app/views/layouts/base_sub_domain.html.erb
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -80,7 +80,6 @@
           <% end %>
           <% if User.current.admin_of_org?(@organization) %>
                 <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
-          <% else %>
           <% end %>
           <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
           <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />