From 6635ded1e8c6dee024e33843f9294441c77f8420 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 3 May 2016 14:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87base=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 1 + .../_org_left_subfield_list.html.erb | 20 ++++--------------- .../organizations/_org_subdomain.html.erb | 11 ++++++++++ .../organizations/_subfield_list.html.erb | 2 +- app/views/sub_domains/_new.html.erb | 20 +++++++++++++++++++ 5 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 app/views/organizations/_org_subdomain.html.erb diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index b2cfa9877..2a33a8acd 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -134,6 +134,7 @@
<%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %> +
访问计数 <%= @organization.visits.to_i %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index d4b7dd945..17515c86f 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -96,31 +96,19 @@ <%#= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %> <% end %> <% else %> - <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %> + <%= field.name %> + <%#= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %> <% end %> <% if User.current.logged? and User.current.admin_of_org?(organization) %> <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %> <% end %> -
+
    - <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.where("status=1").reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%> + <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('created_at').uniq.limit(5), :org_subfield_id => field.id} %>
- - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %> - <% else %> - <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %> - <% end %> - <% else %> - <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %> - <% end %> - <% if User.current.member_of_org?organization %> - <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%> - <% end %> <% else %> <% if !field.subfield_subdomain_dir.nil? %> <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %> diff --git a/app/views/organizations/_org_subdomain.html.erb b/app/views/organizations/_org_subdomain.html.erb new file mode 100644 index 000000000..ad5a9db57 --- /dev/null +++ b/app/views/organizations/_org_subdomain.html.erb @@ -0,0 +1,11 @@ +<% subdomains.each do |subdomain|%> +
  • + <%= link_to subdomain.name, org_subfield_sub_domain_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/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 4ab563477..f12c6155b 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -98,7 +98,7 @@ 编辑 | - 添加二级目录 + 添加二级目录
    diff --git a/app/views/sub_domains/_new.html.erb b/app/views/sub_domains/_new.html.erb index e69de29bb..c6e08e510 100644 --- a/app/views/sub_domains/_new.html.erb +++ b/app/views/sub_domains/_new.html.erb @@ -0,0 +1,20 @@ +
    +
    添加二级目录
    + 二级栏目名称 + +
      +
    • 栏目类型
      • +
    • + + +
      • +
    • + + +
      • +
    • +
    +
    确定
    +
    取消
    +
    +
    \ No newline at end of file