">
- <%= link_to org.name,home_path(:organization => org.id) %>
+ <%#= link_to org.name,home_path(:organization => org.id) %>
+ <%= link_to org.name, organization_path(org) %>
diff --git a/app/views/files/_org_upload_attachment_list.html.erb b/app/views/files/_org_upload_attachment_list.html.erb
new file mode 100644
index 000000000..973aeddd6
--- /dev/null
+++ b/app/views/files/_org_upload_attachment_list.html.erb
@@ -0,0 +1,34 @@
+
+ <%= l(:label_browse_org) %>
+ <%= file_field_tag 'attachments[dummy][file]',
+ :id => "_file#{container.id}",
+ :class => ie8? ? '':'file_selector',
+ :multiple => true,
+ :onchange => "addInputFiles_board(this, '#{container.id}','"+"submit_resource"+"');",
+ :style => ie8? ? '': 'display:none',
+ :data => {
+ :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+ :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+ :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+ :upload_path => uploads_path(:format => 'js'),
+ :description_placeholder => l(:label_optional_description),
+ :field_is_public => l(:field_is_public),
+ :are_you_sure => l(:text_are_you_sure),
+ :file_count => l(:label_file_count),
+ :delete_all_files => l(:text_are_you_sure_all),
+ :lebel_file_uploding => l(:lebel_file_uploding),
+ :containerid => "#{container.id}"
+ } %>
+
+
+
+
+ <%= l(:label_no_file_uploaded)%>
+
+(<%= l(:label_max_size) %>:<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+建议上传高度不超过52px的图片
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/files/_upload_org_new_files.html.erb b/app/views/files/_upload_org_new_files.html.erb
new file mode 100644
index 000000000..cd460e328
--- /dev/null
+++ b/app/views/files/_upload_org_new_files.html.erb
@@ -0,0 +1,25 @@
+
+
+
更换Logo
+
+ <%= error_messages_for 'attachment' %>
+
<%= l(:label_file_upload_error_messages)%>
+ <%= form_tag(organization_files_path(org, :in_org => params[:in_org], :logo => true), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+
+ <%= render :partial => 'files/org_upload_attachment_list', :locals => {:container => org}%>
+
+
<%= l(:button_cancel)%>
+
<%= l(:button_confirm)%>
+ <% end %>
+
+
+
+
+
文件上传成功！
');
- $("#course_list").prepend(div);
- setTimeout( function(){div.remove();},3000)
- <% end %>
- <% end %>
- <%elsif @course%>
- hideModal();
- <%if @in_course_toolbar %>
- window.location.href='<%= course_files_path(@course)%>'
- <%else%>
- $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>');
- $("#courses_files_count_info").html("<%= @all_attachments.count%>");
- $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
- // 添加文件上传成功提示,
- <% unless params[:attachments].nil? %>
- var div = $('文件上传成功！
');
- $("#course_list").prepend(div);
- setTimeout( function(){div.remove();},3000)
- <% end %>
- <%end%>
- <% elsif @org_subfield %>
- <% if params[:in_org] %>
- window.location.href = '<%= org_subfield_files_path @org_subfield %>';
- <%else %>
- hideModal();
- $("#resource_list").html('<%= j(render partial: "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
- // 添加文件上传成功提示,
- <% unless params[:attachments].nil? %>
+$("#resource_list").html('<%= j(render partial:"project_file", locals: {project: @project}) %>');
+$("#project_files_count_info").html("<%= @all_attachments.count %>");
+$("#project_files_count_nav").html("(<%= @all_attachments.count %>)")
+// 添加文件上传成功提示
+<% unless params[:attachments].nil? %>
+var div = $('文件上传成功！
');
+$("#course_list").prepend(div);
+setTimeout( function(){div.remove();},3000)
+<% end %>
+<% end %>
+<%elsif @course%>
+hideModal();
+<%if @in_course_toolbar %>
+window.location.href='<%= course_files_path(@course)%>'
+<%else%>
+$("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>');
+$("#courses_files_count_info").html("<%= @all_attachments.count%>");
+$("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
+// 添加文件上传成功提示,
+<% unless params[:attachments].nil? %>
+var div = $('文件上传成功！
');
+$("#course_list").prepend(div);
+setTimeout( function(){div.remove();},3000)
+<% end %>
+<%end%>
+<% elsif @org_subfield %>
+<% if params[:in_org] %>
+window.location.href = '<%= org_subfield_files_path @org_subfield %>';
+<%else %>
+hideModal();
+$("#resource_list").html('<%= j(render partial: "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+// 添加文件上传成功提示,
+<% unless params[:attachments].nil? %>
// var div = $('文件上传成功！
');
// $("#org_subfield_list").prepend(div);
// setTimeout( function(){div.remove();},3000);
- <% end %>
- <% end %>
- <% end %>
+<% end %>
+<% end %>
+<% elsif @organization %> //组织单独处理
+hideModal();
+window.location.href = '<%= organization_path @organization %>';
+
+<% end %>
<% end %>
$(document).ready(img_thumbnails);
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
new file mode 100644
index 000000000..f646c437f
--- /dev/null
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -0,0 +1,401 @@
+
+
+
+ <%= h html_title %>
+
+
+
+
+
+
+ <% @subfield_content.each do |field| %>
+ <% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'activity' %>
+ <%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
+ <% when 'course' %>
+
课程动态
+ <% when 'project' %>
+
项目动态
+ <% end %>
+ <% else %>
+ <% if field.field_type == "Post" && field.hide == 0 %>
+
<%= field.name %>
+ <% elsif field.field_type == "Resource" && field.hide == 0 %>
+
<%= field.name %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% if User.current.admin_of_org?(@organization) %>
+
配置
+ <% end %>
+
+
+
+
+
<%= @organization.name %>
+
+
+
+
+
+ <% @subfield_content.each do |field| %>
+ <% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'course' %>
+
+ <% if field.status == 0 %>
+
+
课程动态
+ <% if @course_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+
+ <% unless @course_acts.nil? %>
+ <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %>
+ <% end %>
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+
+
+ <% end %>
+
+ <% else %>
+
+
课程动态
+ <% if @course_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+ <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
+
+
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% when 'project' %>
+
+ <% if field.status == 0 %>
+
+
+ <% if @project_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+
+ <% unless @project_acts.nil? %>
+ <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %>
+ <% end %>
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+
+
+ <% end %>
+
+
+ <% else %>
+
+
+ <% if @project_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+ <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
+
+
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% end %>
+
+
+ <% end %>
+
+ <% end %>
+ <% else %>
+ <% if field.field_type == "Post" %> <%# 讨论类型 %>
+ <% org_subfield = OrgSubfield.find(field.id) %>
+ <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %>
+ <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %>
+ <%# message_ats = get_message_org(@organization.id, field.id) %>
+ <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %>
+
+ <% if field.status == 0 %>
+
+
<%= field.name %>
+ <% if org_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+
+ <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+
+
+ <% org_acts.first(3).each do |act| %>
+ <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
+ <% end %>
+
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+ <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+
+ <% end %>
+
+
+ <% else %>
+
+
<%= field.name %>
+ <% if org_acts.blank? %>
+
暂无内容，敬请期待！
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+
+ <% else %>
+
+ <% org_acts.each do |act| %>
+ <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
+ <% end %>
+
+
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+ <% end %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+ <% elsif field.field_type == "Resource" %>
+ <% org_attachs = get_attach_org2(field) %>
+
+
+
<%= field.name %>
+ <% if org_attachs.blank? %>
+
暂无内容，敬请期待！
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+ <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% else %>
+
+ <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
+
+
+
+
+ <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% else %>
+ <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+ <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+
+ <% end %>
+
+
+
+
+
+
+ Top
+
+
+
+
+
+
+
+
+ <%= l(:label_loading) %>
+
+ <%#= call_hook :view_layouts_base_body_bottom %>
+
+
+
diff --git a/app/views/org_subfields/update_status.js.erb b/app/views/org_subfields/update_status.js.erb
new file mode 100644
index 000000000..06982ccfc
--- /dev/null
+++ b/app/views/org_subfields/update_status.js.erb
@@ -0,0 +1,3 @@
+$("#subfield_show_<%= @subfield.id %>").html("<%= @subfield.name %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 7e49d1780..ebab8354c 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -84,8 +84,8 @@
<% end %>
<% else %>
新增
+
+ <% if field.field_type == "Resource" %>
+ 列表
+ <% else %>
+ <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
+ <%=field.status== 1 ? "列表" : "图片" %>
+
+
<%= field.field_type == "Post" ? "帖子" : "资源" %>
<% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
@@ -58,7 +89,7 @@
<%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
- <%= field.hide==0?"设为隐藏":"设为可见" %>
+ <%= field.hide==0?"隐藏":"可见" %>
<%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
编辑
@@ -68,6 +99,34 @@
<% end %>
+ <% else %>
+ 
+ <% else %>
+ 
+ <% end %>
+ <%=link_to activity.content.html_safe, organization_path(organization, :org_subfield_id => field.id), :class => "con-left-txt fl", :target => "_blank" %>
+