diff --git a/app/controllers/sub_domains_controller.rb b/app/controllers/sub_domains_controller.rb index 7dd0e526e..318631ccd 100644 --- a/app/controllers/sub_domains_controller.rb +++ b/app/controllers/sub_domains_controller.rb @@ -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 diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb index 0b8264d33..0d254b293 100644 --- a/app/views/org_document_comments/index.html.erb +++ b/app/views/org_document_comments/index.html.erb @@ -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| %> - - <%= 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| %> + + <%= 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 %> \ No newline at end of file diff --git a/app/views/organizations/_org_subdomain.html.erb b/app/views/organizations/_org_subdomain.html.erb index 4ed7c8d29..0ba460d61 100644 --- a/app/views/organizations/_org_subdomain.html.erb +++ b/app/views/organizations/_org_subdomain.html.erb @@ -1,11 +1,11 @@ -<% subdomains.each do |subdomain|%> -
  • - <%= 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 %> -
    • -<% end %> -<% if subdomains.size == 5 %> -
  • - - -
    • +<% subdomains.each do |subdomain|%> +
  • + <%= 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 %> +
    • +<% end %> +<% if subdomains.size == 5 %> +
  • + + +
    • <% end%> \ No newline at end of file diff --git a/app/views/sub_document_comments/_show_newstyle.html.erb b/app/views/sub_document_comments/_show_newstyle.html.erb index 000511a3c..20ecedea7 100644 --- a/app/views/sub_document_comments/_show_newstyle.html.erb +++ b/app/views/sub_document_comments/_show_newstyle.html.erb @@ -1,12 +1,12 @@
    -
    您的位置：<%= link_to "首页", organization_path(@organization) %> > +
    您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> > <%= @org_subfield.name %> > - <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain) %> > - <%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document) %>
    + <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain), :class => "sn-link-grey2" %> > + <%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document), :class => "sn-link-grey2" %>
    -

    <%= @document.title %>

    +

    <%= @document.title %>

    来源：卫星导航仿真与测试开放实验室 发布时间:：2016-04-08 浏览：200次

    <%= @document.content.html_safe %>

    diff --git a/app/views/sub_document_comments/_show_sub_document.html.erb b/app/views/sub_document_comments/_show_sub_document.html.erb index 83d285976..83607f046 100644 --- a/app/views/sub_document_comments/_show_sub_document.html.erb +++ b/app/views/sub_document_comments/_show_sub_document.html.erb @@ -1,158 +1,158 @@ -
    -
    -
    - <%= 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)} %> -
    -
    -
    - <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.sub_domain.name, organization_path(@organization), :class => "newsBlue" %> - | - <%=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" %> - <%# if document.organization.home_id == document.id %> - - <%# end %> -
    -
    <% document.title %>
    -
    - 发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %> -
    -
    - 更新时间：<%= format_time(OrgActivity.where("org_act_type='#{document.class}' and org_act_id =#{document.id}").first.updated_at) %> -
    -
    - <% unless document.content.blank? %> - <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => document.id, :content => document.content} %> - <% end %> -
    - - -
    -
    - <%#= render :partial=>"attachments/activity_attach", :locals=>{:activity => document} %> -
    - - <% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == document.creator_id %> -
    -
      -
    • -
        - - - - - -
      • - <%#= 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" %> -
        • -
      • - <%#= 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' %> -
        • -
      -
      • -
    -
    -
    - <% end %> - - -
    -
    - - <% comments_for_doc = document.children.reorder("created_at desc") %> - <% count = document.children.count() %> - -
    -
    -
    回复 - <%= count>0 ? "（#{count}）" : "" %>▪ - - - - - - - -
    - <% if count > 3 %> -
    - - 展开更多 - -
    - <% end %> -
    -
    -
      - <% reply_id = 0 %> - <% comments_for_doc.each do |comment| %> - <% reply_id += 1 %> -
    • -
      <%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %>
      -
      -
      - <%= 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) %> - - - - - - - -
      - <% unless comment.content.blank? %> -
      <%= comment.content.html_safe %>
      - <% end %> -
      -
      -
      • - <% end %> -
    -
    -
    -
    - <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %> -
    -
    -
    - <%= 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| %> - -
    - - - -
    -

    - <% end %> -
    -
    -
    -
    -
    -
    -
    - - \ No newline at end of file diff --git a/app/views/sub_document_comments/add_reply.js.erb b/app/views/sub_document_comments/add_reply.js.erb index bdc12d930..06919628b 100644 --- a/app/views/sub_document_comments/add_reply.js.erb +++ b/app/views/sub_document_comments/add_reply.js.erb @@ -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%>"); diff --git a/app/views/sub_document_comments/index.html.erb b/app/views/sub_document_comments/index.html.erb index 9c48760fe..7e56b0242 100644 --- a/app/views/sub_document_comments/index.html.erb +++ b/app/views/sub_document_comments/index.html.erb @@ -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| %> - - <%= 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| %> + + <%= 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 %> diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb index 6bf62d006..3c63c073d 100644 --- a/app/views/sub_domains/_new.html.erb +++ b/app/views/sub_domains/_new.html.erb @@ -1,3 +1,3 @@ -
    - test +
    + test
    \ No newline at end of file diff --git a/app/views/sub_domains/new.html.erb b/app/views/sub_domains/new.html.erb index a8c66f639..a497b71cf 100644 --- a/app/views/sub_domains/new.html.erb +++ b/app/views/sub_domains/new.html.erb @@ -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(""); -$('#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(""); +$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9"); $('#ajax-modal').parent().addClass("popbox_polls"); \ No newline at end of file