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/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb
This commit is contained in:
huang 2016-05-04 09:46:26 +08:00
parent 557e731343 765d52a2ce
commit fd543828ac
9 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
app/controllers/sub_domains_controller.rb
View File

@ -1,48 +1,48 @@
class SubDomainsController < ApplicationController
layout 'base_org'
before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :new]
def new
@subdomain = SubDomain.new
end
def create
if SubDomain.where("org_subfield_id=#{params[:org_subfield_id]} and name=?",params[:name]).count == 0
@res = true
# @organization = Organization.find(params[:organization_id])
@subfield = OrgSubfield.find(params[:org_subfield_id])
# @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id],:priority => @organization.org_subfields.order("priority").last.priority + 1)
@subdomain = SubDomain.create(:name => params[:name], :org_subfield_id => params[:org_subfield_id],:priority => @subfield.sub_domains.blank? ? 1.1 : @subfield.sub_domains.order("priority").last.priority + 0.1)
# if !params[:sub_dir].blank?
# sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
# "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
# if SubfieldSubdomainDir.find_by_sql(sql).count == 0
# SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
# end
# end
@subdomain.update_column(:field_type, params[:field_type])
else
@res = false
end
end
def show
@subfield_content = @organization.org_subfields.order("priority")
render layout: @organization.switch_type ? 'base_sub_domain' : 'base_org'
end
def index
end
private
def find_org_subfield_and_subdomain
@subfield = OrgSubfield.find(params[:org_subfield_id])
@subdomain = SubDomain.find(params[:id])
@organization = @subfield.organization
rescue ActiveRecord::RecordNotFound
# source_subdomain not found
render_404
end
end
class SubDomainsController < ApplicationController
layout 'base_org'
before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :new]
def new
@subdomain = SubDomain.new
end
def create
if SubDomain.where("org_subfield_id=#{params[:org_subfield_id]} and name=?",params[:name]).count == 0
@res = true
# @organization = Organization.find(params[:organization_id])
@subfield = OrgSubfield.find(params[:org_subfield_id])
# @subfield = OrgSubfield.create(:name => params[:name], :organization_id => params[:organization_id],:priority => @organization.org_subfields.order("priority").last.priority + 1)
@subdomain = SubDomain.create(:name => params[:name], :org_subfield_id => params[:org_subfield_id],:priority => @subfield.sub_domains.blank? ? 1.1 : @subfield.sub_domains.order("priority").last.priority + 0.1)
# if !params[:sub_dir].blank?
# sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
# "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
# if SubfieldSubdomainDir.find_by_sql(sql).count == 0
# SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
# end
# end
@subdomain.update_column(:field_type, params[:field_type])
else
@res = false
end
end
def show
@subfield_content = @organization.org_subfields.order("priority")
render layout: @organization.switch_type ? 'base_sub_domain' : 'base_org'
end
def index
end
private
def find_org_subfield_and_subdomain
@subfield = OrgSubfield.find(params[:org_subfield_id])
@subdomain = SubDomain.find(params[:id])
@organization = @subfield.organization
rescue ActiveRecord::RecordNotFound
# source_subdomain not found
render_404
end
end

28
app/views/org_document_comments/index.html.erb
View File

@ -1,15 +1,15 @@
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
<% end %>
<%= render :partial => 'new' %>
<% unless @documents.nil? %>
<% @documents.each do |document| %>
<script>
$(function() {
sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
});
</script>
<%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
<% end %>
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
<% end %>
<%= render :partial => 'new' %>
<% unless @documents.nil? %>
<% @documents.each do |document| %>
<script>
$(function() {
sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
});
</script>
<%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
<% end %>
<% end %>

20
app/views/organizations/_org_subdomain.html.erb
View File

@ -1,11 +1,11 @@
<% subdomains.each do |subdomain|%>
<li class="homepageLeftMenuCoursesLine" style="position:relative;">
<%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
</li>
<% end %>
<% if subdomains.size == 5 %>
<li class="homepageLeftMenuMore" id="show_more_org_project">
<input type="hidden" value="<%= page %>" id="org_project_page_num">
<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%= more_org_projects_organization_path(org_id) %>');"></a>
</li>
<% subdomains.each do |subdomain|%>
<li class="homepageLeftMenuCoursesLine" style="position:relative;">
<%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
</li>
<% end %>
<% if subdomains.size == 5 %>
<li class="homepageLeftMenuMore" id="show_more_org_project">
<input type="hidden" value="<%= page %>" id="org_project_page_num">
<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%= more_org_projects_organization_path(org_id) %>');"></a>
</li>
<% end%>

8
app/views/sub_document_comments/_show_newstyle.html.erb
View File

@ -1,12 +1,12 @@
<div class="sn-innner-content">
<div class="sn-row sn-bg-white">
<div class="sn-content-position"> 您的位置：<%= link_to "首页", organization_path(@organization) %> &gt;
<div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
<%= @org_subfield.name %> &gt;
<%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain) %> &gt;
<%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document) %> </div>
<%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain), :class => "sn-link-grey2" %> &gt;
<%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document), :class => "sn-link-grey2" %> </div>
</div>
<div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2"><%= @document.title %></h2>
<h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
<div class="sn-inner-newscon">
<p class=" sn-inner-psmall">来源：卫星导航仿真与测试开放实验室 发布时间:：2016-04-08 浏览：200次</p>
<p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>

314
app/views/sub_document_comments/_show_sub_document.html.erb
View File

@ -1,158 +1,158 @@
<div class="resources mt10" id="organization_document_<%= document.id %>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
<%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
</div>
<div class="homepagePostDes">
<div class="homepagePostTo">
<%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
TO&nbsp;&nbsp;<%= link_to document.sub_domain.name, organization_path(@organization), :class => "newsBlue" %>
|
<span style="color:#269ac9;"><%=link_to document.sub_domain.name, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id), :class => "newsBlue" %></span>
<%# if document.organization.home_id == document.id %>
<!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
<%# end %>
</div>
<div class="homepagePostTitle postGrey"><a><% document.title %></a></div>
<div class="homepagePostDate fl">
发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
</div>
<div class="homepagePostDate fl ml15" id="sub_document_update_time_<%= document.id %>">
更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %>
</div>
<div class="cl"></div>
<% unless document.content.blank? %>
<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => document.id, :content => document.content} %>
<% end %>
<div class="cl"></div>
<div id="intro_content_show_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
<div id="intro_content_hide_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
<div class="cl"></div>
<div class="mt10" style="font-weight:normal;">
<%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
</div>
<!-- <%# if defined?(home_id) %>
<div style="float:right;">最后编辑：<%#= User.find() %></div>
<%# end %>-->
<% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == document.creator_id %>
<div class="homepagePostSetting">
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<!--<li>-->
<!--<%#= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>-->
<!--<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>-->
<!--<%# end %>-->
<!--</li>-->
<li>
<%#= link_to "编辑文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'edit', :class => "postOptionLink" %>
</li>
<li>
<%#= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'delete',
:data => {:confirm => l(:text_are_you_sure)},
:remote => true, :class => 'postOptionLink' %>
</li>
</ul>
</li>
</ul>
</div>
<div class="cl"></div>
<% end %>
<!--over-->
</div>
</div>
<!--回复暂时不提供-->
<% comments_for_doc = document.children.reorder("created_at desc") %>
<% count = document.children.count() %>
<div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="sub_document_comment_reply_<%= document.id %>">
<div class="homepagePostReplyBanner">
<div class="homepagePostReplyBannerCount">回复
<sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
<!--<span id="praise_count_<%#=document.id %>">-->
<!--<%# if document.creator_id.to_i == User.current.id.to_i %>-->
<!--<span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>-->
<!--<%# else %>-->
<!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>-->
<!--<%# end %>-->
<!--</span>-->
</div>
<% if count > 3 %>
<div class="homepagePostReplyBannerMore">
<a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
展开更多
</a>
</div>
<% end %>
</div>
<div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
<ul>
<% reply_id = 0 %>
<% comments_for_doc.each do |comment| %>
<% reply_id += 1 %>
<li style="display:<%= reply_id > 3 ? 'none' : '' %>">
<div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
<div class="homepagePostReplyDes">
<div class="homepagePostReplyPublisher">
<%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
<%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
<!--<span id="reply_praise_count_<%#=comment.id %>">-->
<!--<%# if comment.creator_id.to_i == User.current.id.to_i %>-->
<!--<span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>-->
<!--<%# else %>-->
<!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>-->
<!--<%# end %>-->
<!--</span>-->
</div>
<% unless comment.content.blank? %>
<div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
<% end %>
</div>
<div class="cl"></div>
</li>
<% end %>
</ul>
</div>
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
</div>
<div class="homepagePostReplyInputContainer">
<div nhname='new_message_<%= act.id %>' style="display:none;">
<%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
<input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
<div nhname='toolbar_container_<%= act.id %>'></div>
<textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
<a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
<div class="cl"></div>
<p nhname='contentmsg_<%= act.id %>'></p>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
<div class="cl"></div>
</div>
</div>
<script type="text/javascript">
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();
}
}
<div class="resources mt10" id="organization_document_<%= document.id %>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
<%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
</div>
<div class="homepagePostDes">
<div class="homepagePostTo">
<%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
TO&nbsp;&nbsp;<%= link_to document.sub_domain.name, organization_path(@organization), :class => "newsBlue" %>
|
<span style="color:#269ac9;"><%=link_to document.sub_domain.name, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id), :class => "newsBlue" %></span>
<%# if document.organization.home_id == document.id %>
<!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
<%# end %>
</div>
<div class="homepagePostTitle postGrey"><a><% document.title %></a></div>
<div class="homepagePostDate fl">
发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
</div>
<div class="homepagePostDate fl ml15" id="sub_document_update_time_<%= document.id %>">
更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %>
</div>
<div class="cl"></div>
<% unless document.content.blank? %>
<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => document.id, :content => document.content} %>
<% end %>
<div class="cl"></div>
<div id="intro_content_show_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
<div id="intro_content_hide_<%= document.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
<div class="cl"></div>
<div class="mt10" style="font-weight:normal;">
<%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %>
</div>
<!-- <%# if defined?(home_id) %>
<div style="float:right;">最后编辑：<%#= User.find() %></div>
<%# end %>-->
<% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == document.creator_id %>
<div class="homepagePostSetting">
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<!--<li>-->
<!--<%#= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>-->
<!--<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>-->
<!--<%# end %>-->
<!--</li>-->
<li>
<%#= link_to "编辑文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'edit', :class => "postOptionLink" %>
</li>
<li>
<%#= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'delete',
:data => {:confirm => l(:text_are_you_sure)},
:remote => true, :class => 'postOptionLink' %>
</li>
</ul>
</li>
</ul>
</div>
<div class="cl"></div>
<% end %>
<!--over-->
</div>
</div>
<!--回复暂时不提供-->
<% comments_for_doc = document.children.reorder("created_at desc") %>
<% count = document.children.count() %>
<div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="sub_document_comment_reply_<%= document.id %>">
<div class="homepagePostReplyBanner">
<div class="homepagePostReplyBannerCount">回复
<sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
<!--<span id="praise_count_<%#=document.id %>">-->
<!--<%# if document.creator_id.to_i == User.current.id.to_i %>-->
<!--<span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>-->
<!--<%# else %>-->
<!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>-->
<!--<%# end %>-->
<!--</span>-->
</div>
<% if count > 3 %>
<div class="homepagePostReplyBannerMore">
<a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
展开更多
</a>
</div>
<% end %>
</div>
<div class="homepagePostReplyContainer" id="reply_div_<%= document.id %>" style="display:<%= count == 0 ? 'none' : 'block' %>">
<ul>
<% reply_id = 0 %>
<% comments_for_doc.each do |comment| %>
<% reply_id += 1 %>
<li style="display:<%= reply_id > 3 ? 'none' : '' %>">
<div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
<div class="homepagePostReplyDes">
<div class="homepagePostReplyPublisher">
<%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
<%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
<!--<span id="reply_praise_count_<%#=comment.id %>">-->
<!--<%# if comment.creator_id.to_i == User.current.id.to_i %>-->
<!--<span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>-->
<!--<%# else %>-->
<!--<%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>-->
<!--<%# end %>-->
<!--</span>-->
</div>
<% unless comment.content.blank? %>
<div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>
<% end %>
</div>
<div class="cl"></div>
</li>
<% end %>
</ul>
</div>
<div class="homepagePostReplyContainer borderBottomNone minHeight48">
<div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
</div>
<div class="homepagePostReplyInputContainer">
<div nhname='new_message_<%= act.id %>' style="display:none;">
<%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
<input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
<div nhname='toolbar_container_<%= act.id %>'></div>
<textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
<a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
<div class="cl"></div>
<p nhname='contentmsg_<%= act.id %>'></p>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
<div class="cl"></div>
</div>
</div>
<script type="text/javascript">
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();
}
}
</script>

4
app/views/sub_document_comments/add_reply.js.erb
View File

@ -1,2 +1,2 @@
$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");

40
app/views/sub_document_comments/index.html.erb
View File

@ -1,20 +1,20 @@
<% if @organization.switch_type %>
<% unless @documents.nil? %>
<%= render :partial => 'sub_document_comments/show_sub_document_newstyle', :locals => {:documents => @documents} %>
<% end %>
<% else %>
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
<% end %>
<%= render :partial => 'new' %>
<% unless @documents.nil? %>
<% @documents.each do |document| %>
<script>
$(function() {
sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
});
</script>
<%= render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
<% end %>
<% end %>
<% end %>
<% if @organization.switch_type %>
<% unless @documents.nil? %>
<%= render :partial => 'sub_document_comments/show_sub_document_newstyle', :locals => {:documents => @documents} %>
<% end %>
<% else %>
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
<% end %>
<%= render :partial => 'new' %>
<% unless @documents.nil? %>
<% @documents.each do |document| %>
<script>
$(function() {
sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "OrgActivity");
});
</script>
<%= render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='SubDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
<% end %>
<% end %>
<% end %>

4
app/views/sub_domains/_new.html.erb
View File

@ -1,3 +1,3 @@
<div class="CodeMirror-cursors">
test
<div class="CodeMirror-cursors">
test
</div>

10
app/views/sub_domains/new.html.erb
View File

@ -1,6 +1,6 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:course => @course,:course_attachment_type => 1}) %>');
showModal('ajax-modal', '513px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:course => @course,:course_attachment_type => 1}) %>');
showModal('ajax-modal', '513px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
$('#ajax-modal').parent().addClass("popbox_polls");