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

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

This commit is contained in:
huang 2016-06-12 13:36:53 +08:00
parent 78b445a7ae 7504b353c9
commit d18094cc92
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/issues/_list.html.erb
View File

@ -1,22 +1,5 @@
<% issue_list(issues) do |issue, level| -%> <% issue_list(issues) do |issue, level| -%>
<script> <script>
function expand_reply(container, btnid) {
var target = $(container);
var btn = $(btnid);
if (btn.data('init') == '0') {
btn.data('init', 1);
btn.html('收起回复');
target.show();
} else {
btn.data('init', 0);
btn.html('展开更多');
target.hide();
target.eq(0).show();
target.eq(1).show();
target.eq(2).show();
}
}
$(function () { $(function () {
sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>"); sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>");
}); });

2
app/views/organizations/_org_activities.html.erb
View File

@ -57,7 +57,7 @@
<% when 'Message' %> <% when 'Message' %>
<%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id, :is_course=>0, :is_board=>0} %> <%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id, :is_course=>0, :is_board=>0} %>
<% when 'Project'%> <% when 'Project'%>
<%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %> <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
<% end %> <% end %>
<% end %> <% end %>
<% if act.container_type == 'Course' %> <% if act.container_type == 'Course' %>

4
app/views/users/_all_replies.html.erb
View File

@ -18,9 +18,9 @@
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
</span> </span>
</div> </div>
<% unless comment.content_detail.blank? %> <% if !comment.content_detail.blank? || comment.class == Journal %>
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>"> <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
<% if comment.class == 'Journal' %> <% if comment.class == Journal %>
<% if comment.details.any? %> <% if comment.details.any? %>
<% details_to_strings(comment.details).each do |string| %> <% details_to_strings(comment.details).each do |string| %>
<p><%= string %></p> <p><%= string %></p>