From 18e79ba9b3f127d5ad3f5a7cbd3599104c46e93c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 20 Jan 2016 09:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=99=86=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E5=8F=8A=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=85=A8=E9=83=A8=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb           | 28 +++++++++----------
 .../organizations/_show_home_page.html.erb    |  4 +--
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 2007aec5a..9d3f76cc6 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -120,21 +120,19 @@
         <!--</div>-->
 
         <div class="cl"></div>
-        <% if User.current.logged? %>
-            <div class="f12 fontGrey3">
-              <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-              <% if User.current.logged? %>
-                  (
-                  <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                  )
-              <% end %>
-              &nbsp;|&nbsp;
-              <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-              <% if User.current.logged? %>
-                  （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-              <% end %>
-            </div>
-        <% end %>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <%# if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <%# end %>
+          <% if User.current.logged? %>
+            &nbsp;|&nbsp;
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+           （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+          <% end %>
+        </div>
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 32d3ad10d..f6d5fc9ea 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -2,15 +2,13 @@
   <div class="homepagePostBrief">
 
     <div class="homepagePostDes" style="width:690px;">
-    <% if User.current.logged? %>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-    <% end %>
       <% unless document.content.blank? %>
           <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
             <%= document.content.html_safe %>
           </div>
       <% end %>
-      <% if params[:show_homepage].nil? and User.current.logged? %>
+      <% if params[:show_homepage].nil? %>
           <div class="homepagePostDate" style="float:right;">
             发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
           </div>