Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

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>

app/views/layouts/base_sub_domain.html.erb

@@ -78,7 +78,16 @@
     <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>

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>