jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
cxt 2016-01-21 15:24:40 +08:00
parent 219755e4d4 280bf01912
commit 65563e6503
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/layouts/base_org.html.erb
View File

@ -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} %>

4
app/views/organizations/_show_home_page.html.erb
View File

@ -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>