From f8ba77dc2041b169b59226cf9945a18b21463d74 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 11:32:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?banner=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=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_sub_domain.html.erb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
index bf4d70e32..bab438abd 100644
--- a/app/views/layouts/base_sub_domain.html.erb
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -72,7 +72,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>
+          <% else %>
+          <% 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>

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 2/3] =?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="搜索" />

From efb91abfb083ddfba1e9152a9d9b34d2e2eb61b5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 14:03:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb                          | 2 +-
 .../_show_sub_document_newstyle.html.erb                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index ade8e70a6..3bf0188a8 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -93,7 +93,7 @@
             <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/sub_document_comments/_show_sub_document_newstyle.html.erb b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
index 52fd2148c..15d7c81af 100644
--- a/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
@@ -9,7 +9,7 @@
         <% documents.each do |document| %>
             <li>
               <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
-              <span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void()" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+              <span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void(0)" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
               <div class="cl"></div>
             </li>
         <% end %>
@@ -17,7 +17,7 @@
 
       <div>
         <ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
           <div class="cl"></div>
         </ul>
       </div>