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

app/views/layouts/base_org.html.erb

@@ -120,21 +120,19 @@
         <!--</div>-->
 
         <div class="cl"></div>
-        <% if User.current.logged? %>
+        <div class="f12 fontGrey3">
-            <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-              <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <%# if User.current.logged? %>
-              <% 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" %>
-                  <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
-                  )
+          <%# end %>
-              <% end %>
+          <% if User.current.logged? %>
-              &nbsp;|&nbsp;
+            &nbsp;|&nbsp;
-              <%= link_to '成员', members_organization_path(@organization.id) %>&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" %>）
-                  （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+          <% end %>
-              <% end %>
+        </div>
-            </div>
-        <% end %>
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>

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>