Merge branch 'szzh' into develop

app/assets/javascripts/subfield_subdomain_dirs.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/subfield_subdomain_dirs.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the subfield_subdomain_dirs controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/at_controller.rb

@@ -53,6 +53,7 @@ class AtController < ApplicationController
   end
 
   def find_project(id)
+    return [] if id<0
     at_persons = Project.find(id).users
     at_persons.delete_if { |u| u.id == User.current.id }
   end

app/controllers/files_controller.rb

@@ -172,6 +172,7 @@ class FilesController < ApplicationController
         #  #render 'stores'
         #  redirect_to search_course_files_url
       end
+      @page = params[:page] || 1
     end
 
   def find_course_attache keywords,course,sort = ""
@@ -380,6 +381,7 @@ class FilesController < ApplicationController
       @organization = Organization.find(@containers.first.organization_id)
       show_attachments @containers
       @tag_list = attachment_tag_list @all_attachments
+      @page = params[:page] || 1
       render :layout => 'base_org'
       # @subfield = params[:org_subfield_id]
     end

app/controllers/org_document_comments_controller.rb

@@ -20,7 +20,12 @@ class OrgDocumentCommentsController < ApplicationController
       flash.keep[:notice] = l(:notice_successful_create)
       EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
       if params[:field_id]
-        redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+        @org_subfield = OrgSubfield.find(params[:field_id])
+        if @org_subfield.subfield_subdomain_dir.nil?
+          redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+        else
+          redirect_to show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => @org_subfield.subfield_subdomain_dir.name)
+          end
       else
         redirect_to organization_org_document_comments_path(@organization)
       end

app/controllers/org_subfields_controller.rb

@@ -1,22 +1,90 @@
 class OrgSubfieldsController < ApplicationController
+  helper :attachments
+  layout 'base_org'
   def create
-    @subfield = OrgSubfield.create(:name => params[:name])
-    @organization = Organization.find(params[:organization_id])
-    @organization.org_subfields << @subfield
-    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+    if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0
+      @res = true
+      @subfield = OrgSubfield.create(:name => params[:name])
+      @organization = Organization.find(params[:organization_id])
+      @organization.org_subfields << @subfield
+      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])
+        end
+      end
+      @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
+    else
+      @res = false
+    end
   end
 
   def show
-    @org_subfield = OrgSubfield.find(params[:id])
-    @organization = @org_subfield.organization.id
-    @messages = []
-    @messages << @org_subfield.org_document_comments
-    @messages << @org_subfield.messages
-    @messages.sort{|a, b| b.updated_at <=> a.updated_at}
-    respond_to do |format|
-      format.html{render :layout => 'base_org'}
+    @flag = params[:flag] || false
+    sort = ""
+    @sort = ""
+    @order = ""
+    @is_remote = false
+    @organization = Organization.find(params[:id])
+    @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
+        "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+
+        " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first
+    if @org_subfield.field_type == 'Post'
+        @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+        @org_activities = 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').page(params[:page] || 1).per(10)
+        #redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id)
+    else
+      if params[:sort]
+        params[:sort].split(",").each do |sort_type|
+          order_by = sort_type.split(":")
+          case order_by[0]
+            when "filename"
+              attribute = "filename"
+            when "size"
+              attribute = "filesize"
+            when "attach_type"
+              attribute = "attachtype"
+            when "content_type"
+              attribute = "created_on"
+            when "field_file_dense"
+              attribute = "is_public"
+            when "downloads"
+              attribute = "downloads"
+            when "created_on"
+              attribute = "created_on"
+            when "quotes"
+              attribute = "quotes"
+            else
+              attribute = "created_on"
+          end
+          @sort = order_by[0]
+          @order = order_by[1]
+          if order_by.count == 1 && attribute
+            sort += "#{Attachment.table_name}.#{attribute} asc "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          elsif order_by.count == 2 && order_by[1]
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          end
+        end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
+      end
+      @container_type = 2
+      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+      @organization = Organization.find(@containers.first.organization_id)
+      show_attachments @containers
+      @tag_list = attachment_tag_list @all_attachments
     end
+    @page = params[:page] || 1
+    #render :layout => 'base_org'
   end
+
   def destroy
     @subfield = OrgSubfield.find(params[:id])
     @organization = Organization.find(@subfield.organization_id)
@@ -29,4 +97,43 @@ class OrgSubfieldsController < ApplicationController
     @subfield.update_attributes(:name => params[:name])
   end
 
+  def update_sub_dir
+    @org_subfield = OrgSubfield.find(params[:id])
+    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=#{@org_subfield.organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'"
+    if SubfieldSubdomainDir.find_by_sql(sql).count == 0
+      if @org_subfield.subfield_subdomain_dir
+        @sub_dir = @org_subfield.subfield_subdomain_dir
+        @sub_dir.update_attribute(:name, params[:sub_dir_name])
+      else
+        @sub_dir = SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir_name])
+      end
+      @exist = false
+    else
+      @exist = true
+    end
+  end
+
+  def show_attachments obj
+    @attachments = []
+    obj.each do |container|
+      @attachments += container.attachments
+    end
+    @all_attachments = User.current.admin? ? @attachments : visable_attachemnts(@attachments)
+    @limit = 10
+    @feedback_count = @all_attachments.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
+  end
+
+  #获取指定资源列表的TAG的集合以及每个TAG的数量，降序排序
+  def attachment_tag_list attachments
+    tag_list = Hash.new
+    attachments.each do |attachment|
+      attachment.tag_list.map{|tag| tag_list.has_key?(tag) ? tag_list[tag] = tag_list[tag] + 1 : tag_list[tag] = 1}
+    end
+    tag_list.sort {|a,b| b[1]<=>a[1]}
+  end
 end

app/controllers/organizations_controller.rb

@@ -114,7 +114,7 @@ class OrganizationsController < ApplicationController
     @organization = Organization.find(params[:id])
     @organization.name = params[:organization][:name]
     @organization.description = params[:organization][:description]
-    @organization.domain = params[:organization][:domain]
+    # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     #@organization.name = params[:organization][:name]
     @organization.save

app/controllers/projects_controller.rb

@@ -519,6 +519,14 @@ class ProjectsController < ApplicationController
   def edit
   end
 
+  def set_public_or_private
+    @project = Project.find(params[:id])
+    if @project.is_public?
+      @project.update_attribute(:is_public, 0)
+    else
+      @project.update_attribute(:is_public, 1)
+    end
+  end
   # by young
   # include CoursesHelper
   def member

app/controllers/subfield_subdomain_dirs_controller.rb

@@ -0,0 +1,10 @@
+class SubfieldSubdomainDirsController < ApplicationController
+  def update
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    if @org_subfield.subfield_subdomain_dir
+      @org_subfield.subfield_subdomain_dir.update_attribute(:name, :params[:sub_dir_name])
+    else
+      SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir_name])
+    end
+  end
+end

app/helpers/subfield_subdomain_dirs_helper.rb

@@ -0,0 +1,2 @@
+module SubfieldSubdomainDirsHelper
+end

app/models/org_subfield.rb

@@ -1,5 +1,6 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
+  has_one :subfield_subdomain_dir,:dependent => :destroy
   has_many :org_document_comments, :dependent => :destroy
   has_many :files
   has_many :org_subfield_messages, :dependent => :destroy

app/models/subfield_subdomain_dir.rb

@@ -0,0 +1,4 @@
+class SubfieldSubdomainDir < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :org_subfield
+end

app/views/account/login.html.erb

@@ -205,7 +205,7 @@
   <div class="loginContent">
     <div class="loginLeft">
       <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。<br/><br/>&nbsp;&nbsp;Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
+      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie创新实践社区！在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。<br/><br/>&nbsp;&nbsp;Trustie社区的理想是：让创新过程变的更美好！</div>
     </div>
     <div class="loginRight">
       <div id="loginInBox">

app/views/blogs/_article.html.erb

@@ -26,12 +26,21 @@
                         ) if User.current && User.current.id == activity.author.id %>
                   </li>
                   <li>
-                    <%= link_to(
-                                l(:button_set_homepage),
-                                {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
-                                :method => :post,
-                                :class => 'postOptionLink'
-                        ) if User.current && User.current.id == activity.blog.author_id %>
+                    <% if activity.id == activity.blog.homepage_id %>
+                        <%= link_to(
+                                    l(:button_cancel_homepage),
+                                    {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
+                                    :method => :post,
+                                    :class => 'postOptionLink'
+                            ) if User.current && User.current.id == activity.blog.author_id %>
+                    <% else %>
+                        <%= link_to(
+                                    l(:button_set_homepage),
+                                    {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
+                                    :method => :post,
+                                    :class => 'postOptionLink'
+                            ) if User.current && User.current.id == activity.blog.author_id %>
+                    <% end %>
                   </li>
                 </ul>
               </li>

app/views/blogs/_article_list.html.erb

@@ -43,11 +43,6 @@
     </div>
   </div>
 
-  <% if blog.homepage_id and BlogComment.where("id=?", blog.homepage_id).count > 0 %>
-      <% homepage = BlogComment.find(blog.homepage_id) %>
-    <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
-  <% end %>
-
   <% if User.current.logged? && User.current.id == @user.id %>
       <%= labelled_form_for @article, :url =>{:controller=>'blog_comments',:action => 'create',:user_id=>user.id , :blog_id => blog.id},
                             :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>

app/views/blogs/_homepage.html.erb

@@ -36,7 +36,7 @@
           </div>
       <%end%>
       <div class="cl"></div>
-      <div class="homepagePostTitle hidden m_w530 fl">
+      <div class="homepagePostTitle hidden m_w530">
         <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id,
                    :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey", :style => 'text-align:center;' %>
       </div>

app/views/boards/_course_show_detail.html.erb

@@ -40,7 +40,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
             });
         </script>
         <% if topic %>

app/views/courses/private_or_public.js.erb

@@ -1,8 +1,16 @@
-$("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>');
-if(document.getElementById("course_is_public")) {
-    <% if @course.is_public == 0%>
-        $("#course_is_public").attr("checked",false);
-    <% elsif @course.is_public == 1 %>
-        $("#course_is_public").attr("checked",true);
+<% if params[:user_page].nil? %>
+    $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>');
+    if(document.getElementById("course_is_public")) {
+        <% if @course.is_public == 0%>
+            $("#course_is_public").attr("checked",false);
+        <% elsif @course.is_public == 1 %>
+            $("#course_is_public").attr("checked",true);
+        <% end %>
+    }
+<% else %>
+    <% if @course.is_public? %>
+        $("#set_course_public_<%= @course.id %>").text("设为私有");
+    <% else %>
+        $("#set_course_public_<%= @course.id %>").text("设为公开");
     <% end %>
-}
+<% end %>

app/views/files/_org_subfield_list.html.erb

@@ -1,59 +1,77 @@
 <% delete_allowed = User.current.admin? %>
-<div class="re_con_top">
-  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
-  <p class="f_r" style="color: #808080">
-    <% if order == "asc" %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
-    <% else %>
-        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
-        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
-    <% end %>
-  </p>
-</div>
-<div class="cl"></div>
-<div class="files_tag" id="files_tag">
-  <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
-</div>
-<div class="cl"></div>
 
-<div class="for_img_thumbnails">
-  <% org_subfield_attachments.each do |file| %>
-      <% if 1 %>
-          <div class="re_con_box" id="container_files_<%= file.id %>">
-            <div class="">
-              <%= link_to truncate(file.filename,length: 35, omission: '...'),
-                          download_named_attachment_path(file.id, file.filename),
-                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+<% org_subfield_attachments.each do |file| %>
+  <div class="resources mt10" id="container_files_<%= file.id %>">
+    <div class="homepagePostBrief">
+      <div class="homepagePostPortrait">
+        <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
+      </div>
+      <div class="homepagePostDes">
+        <div class="homepagePostTitle break_word mt-4">
+          <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                      download_named_attachment_path(file.id, file.filename),
+                      :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+          <%= file_preview_eye(file, class: 'preview') %>
+          <span id="image_private_<%= file.id%>">
+            <% if file.is_public? == false%>
+               <span class="img_private ml5">私有</span>
+            <%end %>
+          </span>
+        </div>
+        <div class="mt5">
+          <span class="fontGrey2 mr15 fl">上传时间：<%= format_date(file.created_on)%></span>
+          <% if file.tag_list.length > 0%>
+              <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
+          <% end %>
+          <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
+          <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+        </div>
+        <div class="cl"></div>
+        <div class="tag_h">
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+          <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+        </div>
+        <div class="homepagePostSetting">
+          <ul>
+            <li class="homepagePostSettingIcon">
               <% if User.current.logged? %>
-                  <% if !@org_subfield.attachments.all.include?file %>
-                    <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
-                  <% elsif @org_subfield.organization.org_subfields.where("field_type='Resource'").count > 1 %>
-                    <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
+                 <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')")  %></li>
+                        <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                        <li>
+                          <span id="is_public_<%= file.id %>">
+                            <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                          </span>
+                        </li>
+                        <li>
+                          <%= link_to( '删除资源', attachment_path(file),
+                                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %>
+                        </li>
+                    </ul>
+                  <%else%>
+                      <ul class="resourceSendO">
+                        <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')")  %></li>
+                      </ul>
                   <% end %>
-                  <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>
               <% end %>
-            </div>
-            <div class="cl"></div>
-            <div class="mt5">
-              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
-              <%= link_to( l(:button_delete), attachment_path(file),
-                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%>
-              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
-            </div>
-            <div class="cl"></div>
-            <div class="tag_h">
-              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
-              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
-            </div>
-            <div class="cl"></div>
-          </div><!---re_con_box end-->
-      <% end %>
-  <% end %>
-</div>
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-</ul>
-<div class="cl"></div>
+            </li>
+          </ul>
+
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div><!---re_con_box end-->
+<% end %>
+
+<% if org_subfield_attachments.count == 10 %>
+    <% if params[:action] == 'search_files_in_subfield' %>
+        <%=link_to "点击展开更多",  search_files_in_subfield_org_subfield_files_path(:org_subfield_id => org_subfield.id,:page => @page.to_i + 1, :name => params[:name],:insite => params[:insite]),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+    <% else %>
+        <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
+        <%=link_to "点击展开更多",  org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page.nil? ? 2 :(@page + 1)), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+    <%end%>
+<% end%>
+

app/views/files/_subfield_files.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'courses' %>
+<%= stylesheet_link_tag 'courses'%>
 <script>
     function searchone4reload(fileid){
         var url = "<%= searchone4reload_org_subfield_files_path(@org_subfield)%>";
@@ -11,87 +11,75 @@
             }
         });
     }
-    function show_upload(obj)
-    {
-        switch(obj)
-        {
-//            case 1:
-//                $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
-//                break;
-            case 2:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>');
-                break;
-            case 3:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 3}) %>');
-                break;
-            case 4:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>');
-                break;
-//            case 6:
-//                $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
-//                break;
-            default:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>');
-        }
-        showModal('ajax-modal', '513px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-        $('#ajax-modal').parent().css("top","").css("left","");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
 
     function closeModal()
     {
         hideModal($("#popbox_upload"));
     }
-
-    function presscss(id)
-    {
-        if(id == "inorg_subfield")
-        {
-            $('#inorg_subfield').attr("class", "re_schbtn b_dblue");
-            $('#insite').attr("class", "re_schbtn b_lblue");
-        }
-        else
-        {
-            $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
-            $('#insite').attr("class", "re_schbtn b_dblue");
-        }
-    }
-    function buttoncss()
-    {
-        $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
-        $('#insite').attr("class", "re_schbtn b_lblue");
-    }
 </script>
 
-<div class="container">
-  <div class="resources"><!--资源库内容开始--->
-    <div class="re_top" style="width:710px;">
-      <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
-          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+<div class="homepageRight mt0 ml0">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName"><%= org_subfield.name %></div>
+    <ul class="resourcesSelect">
+      <ul class="resourcesSelect">
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+          <ul class="resourcesType">
+            <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','','<%= @q%>','<%= org_subfield.id%>');" class="resourcesTypeAll resourcesGrey">全部</a></li>
+            <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','软件','<%= @q%>','<%= org_subfield.id%>');" class="softwareIcon postTypeGrey">软件</a></li>
+            <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','媒体','<%= @q%>','<%= org_subfield.id%>');" class="mediaIcon resourcesGrey">媒体</a></li>
+            <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','代码','<%= @q%>','<%= org_subfield.id%>');" class="codeIcon resourcesGrey">代码</a></li>
+            <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield,:other=>true)%>','其他','<%= @q%>','<%= org_subfield.id%>');" class="othersIcon resourcesGrey">其它</a></li>
+          </ul>
+        </li>
+      </ul>
+    </ul>
+  </div>
+  <div class="resources mt10" style="padding-bottom:5px;">
+    <div class="reTop mb5">
+      <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %>
+          <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
+          <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+          <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
+          <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %>
       <% end %>
-      <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %>  <!-- show_window('light','fade','20%','35%')-->
-          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
-          <p class="c_grey fr mt10 mr5">
-            上传：
-            <!--<a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;-->
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
-            <!--<a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;-->
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
-          </p>
-      <%# end %>
     </div><!---re_top end-->
     <div class="cl"></div>
 
-    <div class="reCon" id="org_subfield_list">
-      <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
-    </div><!---re_con end-->
-
+    <div>
+      <div class="re_con_top">
+        <div class="files_tag" id="files_tag">
+          <%#= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
+        </div>
+        <div class="cl"></div>
+        <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= @all_attachments.count %></span>&nbsp;个资源</p>
+        <p class="f_r" style="color: #808080">
+          <% if @order == "asc" %>
+              按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+              <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
+              <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+          <% else %>
+              按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+              <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp; /&nbsp;
+              <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+          <% end %>
+        </p>
+      </div>
+      <div class="cl"></div>
+    </div>
   </div>
+  <div id="org_subfield_list">
+    <%= render :partial => 'files/org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
+  </div><!---re_con end-->
+
 </div>
-<% html_title(l(:label_attachment_plural)) -%>
+<% html_title(l(:label_attachment_plural)) -%>
+<script>
+  function org_upload_files(org_subfield_id){
+      $.ajax({
+          url :"/org_subfields/" + org_subfield_id + "/files/subfield_upload_file",
+          type :'post'
+      });
+  }
+</script>

app/views/files/_upload_subfield_file.html.erb

@@ -7,16 +7,12 @@
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <% if params[:in_org] %>
-              <div class="c_dark">
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
-                <input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>
-              </div>
-          <% else %>
-              <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type %>">
-          <% end %>
+          <div class="c_dark">
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+            <input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>
+          </div>
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_subfield_upload_attachment_list', :locals => {:container => org_subfield}%>
           <div class="cl"></div>

app/views/files/index.js.erb

@@ -2,4 +2,6 @@
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
 <% elsif @project %>
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list', :locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments})%>");
+<% elsif @org_subfield %>
+    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list', :locals => {org_subfield:@org_subfield, all_attachments:@all_attachments, sort:@sort, order:@order, org_subfield_attachments:@obj_attachments})%>");
 <%end %>

app/views/files/search_files_in_subfield.js.erb

@@ -1,2 +1,8 @@
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
-    :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
+<% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %>
+    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list',
+    :locals => {org_subfield: @org_subfield,all_attachments:  @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach}   )%>");
+<% else %>
+    $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
+        :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
+    $("#attachment_count").html("<%= @result.count %>");
+<% end %>

app/views/layouts/_org_courses.html.erb

@@ -2,25 +2,25 @@
     <%# pro = Project.find course.course_id %>
     <li class="homepageLeftMenuCoursesLine" style="position:relative;">
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => course.name%>
-      <div class="homepagePostSetting mt5 mr10">
-        <ul>
-          <li class="menuSetting">
-            <ul class="homepagePostSettiongText boxShadow">
-              <li><%= link_to "发布作业", homework_common_index_path(:course => course.id,:is_new => 1), :class => 'postOptionLink' %></li>
-              <li><%= link_to "发布通知", new_course_news_path(course), :class => 'postOptionLink' %></li>
-              <li><%= link_to "上传资源",upload_files_menu_path(:course_id => course.id), :remote => true, :class => 'postOptionLink' %></li>
-              <li><%= link_to "发布新帖",course_boards_path(  course, :flag => true, :is_new => 1), :class => 'postOptionLink' %></li>
-              <li>
-                <% if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Course' and shield_id=#{course.id}").count == 0 %>
-                    <%= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'post',:class => 'postOptionLink',:remote => true %>
-                <% else %>
-                    <%= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'delete',:class => 'postOptionLink',:remote => true %>
-                <% end %>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </div>
+      <!--<div class="homepagePostSetting mt5 mr10">-->
+        <!--<ul>-->
+          <!--<li class="menuSetting">-->
+            <!--<ul class="homepagePostSettiongText boxShadow">-->
+              <!--<li><%#= link_to "发布作业", homework_common_index_path(:course => course.id,:is_new => 1), :class => 'postOptionLink' %></li>-->
+              <!--<li><%#= link_to "发布通知", new_course_news_path(course), :class => 'postOptionLink' %></li>-->
+              <!--<li><%#= link_to "上传资源",upload_files_menu_path(:course_id => course.id), :remote => true, :class => 'postOptionLink' %></li>-->
+              <!--<li><%#= link_to "发布新帖",course_boards_path(  course, :flag => true, :is_new => 1), :class => 'postOptionLink' %></li>-->
+              <!--<li>-->
+                <!--<%# if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Course' and shield_id=#{course.id}").count == 0 %>-->
+                    <!--<%#= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'post',:class => 'postOptionLink',:remote => true %>-->
+                <!--<%# else %>-->
+                    <!--<#%= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'delete',:class => 'postOptionLink',:remote => true %>-->
+                <!--<%# end %>-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</li>-->
+        <!--</ul>-->
+      <!--</div>-->
     </li>
 <% end %>
 <% if courses.size == 5%>

app/views/layouts/_org_projects.html.erb

@@ -2,24 +2,24 @@
     <%# pro = Project.find project.project_id %>
     <li class="homepageLeftMenuCoursesLine" style="position:relative;">
       <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%>
-      <div class="homepagePostSetting mt5 mr10">
-        <ul>
-          <li class="menuSetting">
-            <ul class="homepagePostSettiongText boxShadow">
-              <li><%=link_to "发布问题", new_project_issue_path(project), :class => 'postOptionLink', :target => '_blank' %></li>
-              <li><%=link_to "发布新帖",project_boards_path(project, :flag => true), :class => 'postOptionLink',:target => '_blank' %></li>
-              <li><%= link_to "上传资源",upload_files_menu_path(:project_id => project.id), :remote => true, :class => 'postOptionLink' %></li>
-              <li>
-                <% if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Project' and shield_id=#{project.id}").count == 0 %>
-                    <%= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :project_id => project.id), :method => 'post',:class => 'postOptionLink',:remote => true %>
-                <% else %>
-                    <%= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :project_id => project.id),:method => 'delete',:class => 'postOptionLink',:remote => true %>
-                <% end %>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </div>
+      <!--<div class="homepagePostSetting mt5 mr10">-->
+        <!--<ul>-->
+          <!--<li class="menuSetting">-->
+            <!--<ul class="homepagePostSettiongText boxShadow">-->
+              <!--<li><%#=link_to "发布问题", new_project_issue_path(project), :class => 'postOptionLink', :target => '_blank' %></li>-->
+              <!--<li><%#=link_to "发布新帖",project_boards_path(project, :flag => true), :class => 'postOptionLink',:target => '_blank' %></li>-->
+              <!--<li><%#= link_to "上传资源",upload_files_menu_path(:project_id => project.id), :remote => true, :class => 'postOptionLink' %></li>-->
+              <!--<li>-->
+                <!--<%# if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Project' and shield_id=#{project.id}").count == 0 %>-->
+                    <!--<#%= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :project_id => project.id), :method => 'post',:class => 'postOptionLink',:remote => true %>-->
+                <!--<%# else %>-->
+                    <!--<%#= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :project_id => project.id),:method => 'delete',:class => 'postOptionLink',:remote => true %>-->
+                <!--<%# end %>-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</li>-->
+        <!--</ul>-->
+      <!--</div>-->
     </li>
 <% end %>
 <% if projects.size == 5%>