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

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

Conflicts:
	app/views/organizations/_org_custom_right2.html.erb
This commit is contained in:
Tim 2016-06-03 09:12:36 +08:00
parent bb9c9ddddf fa03867cc2
commit 57bb2f69a4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/organizations_controller.rb
View File

@ -93,7 +93,7 @@ class OrganizationsController < ApplicationController
end end
# 热门项目 # 热门项目
if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0 if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0
@excellent_projects = Course.where(:is_public => true, :status => true, :hot => true) @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true)
end end
# 最新动态, 来自我关联的项目和课程 # 最新动态, 来自我关联的项目和课程
if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0 if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0

10
app/views/organizations/_org_custom_right2.html.erb
View File

@ -3,18 +3,18 @@
<% if containers.blank? %> <% if containers.blank? %>
<p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p> <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
<% else %> <% else %>
<% container = cotainers.first %> <% container = containers.first %>
<li class="por_project_li"> <li class="por_project_li">
<%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %> <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
<p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p> <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
<div class="cl"></div> <div class="cl"></div>
<%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %> <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
</li> </li>
<% cotainers[1..4].each do |container| %> <% containers[1..4].each do |container| %>
<li> <li>
<%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %> <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %>
<p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p> <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(container.project_score) %></a></p>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<% end %> <% end %>

10
app/views/organizations/_organization_content_extension.html.erb
View File

@ -1,8 +1,8 @@
<p class="<%= cl %>" id="activity_description_<%= user_activity_id %>"> <div class="<%= cl %>" id="activity_description_<%= user_activity_id %>">
<span id="intro_content_<%= user_activity_id%>"> <span id="intro_content_<%= user_activity_id%>">
<%= content.to_s.html_safe%> <%= content.to_s.html_safe%>
</span> </span>
</p> </div>
<script type="text/javascript"> <script type="text/javascript">