diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a40b24fe2..57cadc10b 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -406,10 +406,14 @@ class FilesController < ApplicationController
       @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
-      @page = params[:page] || 1
-      render :layout => 'base_org'
+      if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
+        show_attachments @containers
+        @tag_list = attachment_tag_list @all_attachments
+        @page = params[:page] || 1
+        render :layout => 'base_org'
+      else
+        render_403
+      end
       # @subfield = params[:org_subfield_id]
     end
 
@@ -859,7 +863,15 @@ class FilesController < ApplicationController
     q = "%#{@q.strip}%"
     @result = find_org_subfield_attache q,@org_subfield,sort
     @result = visable_attachemnts @result
-    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    if params[:other]
+      @result = @result.select{|attachment|
+        attachment.tag_list.exclude?('软件') &&
+            attachment.tag_list.exclude?('媒体') &&
+            attachment.tag_list.exclude?('代码')
+      }
+    else
+      @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    end
     @searched_attach = paginateHelper @result,10
     @tag_list = get_org_subfield_tag_list @org_subfield
 
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 00b11323b..ba6c136bb 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -17,9 +17,9 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 2a4bcf9c8..9337c5fd2 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -33,61 +33,65 @@ class OrgSubfieldsController < ApplicationController
       domain = Secdomain.where("subname=?", request.subdomain).first
       @organization = Organization.find(domain.pid)
     end
-    @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'
+    if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
+      @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"
+        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
-      @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
+      @page = params[:page] || 1
+    else
+      render_403
     end
-    @page = params[:page] || 1
     #render :layout => 'base_org'
   end
 
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index a38d83851..0c8bb6c01 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -303,6 +303,7 @@ class StudentWorkController < ApplicationController
             stu_project.save
           end
         end
+        @homework.update_attributes(:updated_at => Time.now)
         update_course_activity(@homework.class,@homework.id)
         update_user_activity(@homework.class,@homework.id)
         update_org_activity(@homework.class,@homework.id)
@@ -500,6 +501,10 @@ class StudentWorkController < ApplicationController
         when 3 #学生评分 学生评分显示平均分
           @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
       end
+      @homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(@homework.class,@homework.id)
+      update_user_activity(@homework.class,@homework.id)
+      update_org_activity(@homework.class,@homework.id)
       if @work.save
         respond_to do |format|
           format.js
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 61f6118ad..ea984aa80 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -58,6 +58,7 @@ class UsersController < ApplicationController
   helper :sort
   helper :attachments
   include SortHelper
+  include ApplicationHelper
   helper :custom_fields
   include CustomFieldsHelper
   include AvatarHelper
@@ -425,9 +426,9 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find params[:homework].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
-      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
     else
-      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id}").select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id}").select { |course|  @user.allowed_to?(:as_teacher,course)}
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
@@ -690,6 +691,11 @@ class UsersController < ApplicationController
       end
 
       student_work.save
+      homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(homework.class,homework.id)
+      update_user_activity(homework.class,homework.id)
+      update_org_activity(homework.class,homework.id)
+
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
     else
@@ -1693,17 +1699,17 @@ class UsersController < ApplicationController
     @flag = true
     if  params[:send_id].present?
       send_id  = params[:send_id]
-      ori = Attachment.find_by_id(send_id)
+      @ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
       if course_ids.nil?
         @flag = false
       end
       unless course_ids.nil?
         course_ids.each do |id|
-          next if ori.blank?
+          next if @ori.blank?
           @exist = false
           Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-            if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+            if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
               att.created_on = Time.now
               att.save
               @exist = true
@@ -1711,21 +1717,21 @@ class UsersController < ApplicationController
             end
           end
           next if @exist
-          attach_copied_obj = ori.copy
-          attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+          attach_copied_obj = @ori.copy
+          attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
           attach_copied_obj.container = Course.find(id)
           attach_copied_obj.created_on = Time.now
           attach_copied_obj.author_id = User.current.id
           attach_copied_obj.is_public = 0
-          attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+          attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
           if attach_copied_obj.attachtype == nil
             attach_copied_obj.attachtype = 4
           end
           if attach_copied_obj.save
             # 更新引用次数
-            quotes = ori.quotes.to_i + 1
-            ori.update_attribute(:quotes, quotes) unless ori.nil?
-            ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+            quotes = @ori.quotes.to_i + 1
+            @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+            @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
           end
           @save_message = attach_copied_obj.errors.full_messages
         end
@@ -1837,6 +1843,7 @@ class UsersController < ApplicationController
                                                                     Project.find(project_id).project_score.attach_num + 1)
           end
         end
+        @ori = ori
       end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
@@ -1941,6 +1948,7 @@ class UsersController < ApplicationController
           end
         end
       end
+      @ori = ori
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
       subfield_id = params[:subfield]
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index d1aa67483..e6d1d9117 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-
+          @homework_common.update_attributes(:updated_at => Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 22890fd9a..bf7a5fdf9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2049,9 +2049,11 @@ module ApplicationHelper
         course = attachment.container
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgSubfield)
-        candown = true
+        org = attachment.container.organization
+        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgDocumentComment)
-        candown = true
+        org = attachment.container.organization
+        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 6b748649b..238999a71 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -126,7 +126,7 @@ module FilesHelper
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
-          attachment.container_type == "OrgSubfield"
+          (attachment.container_type == "OrgSubfield" and User.current.member_of_org?(attachment.container.organization))
         result << attachment
       end
     end
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index f26c5fd41..f697383ca 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -6,7 +6,7 @@
 
           <li class="mt15"> <%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>
             <div class="fl">
-              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %></p>
+              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
               <p class="f12">
                 <% if e_course.attachments.count > 0 %>
                     <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
@@ -14,6 +14,7 @@
                 <% if e_course.homework_commons.count > 0 %>
                     <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
                 <% end %>
+                <div class="cl"></div>
               </p>
             </div>
             <div class="cl"></div>
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 38ff40ed3..90ae3516d 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -1,70 +1,72 @@
 <% delete_allowed = User.current.admin? %>
 
 <% 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 => "linkGrey3 f_14 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>
-          <br/>
-        </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 (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}','#{User.current.id}','file')")  %></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}','#{User.current.id}','file')")  %></li>
-                      </ul>
-                  <% end %>
+  <% if file.is_public == 1 or User.current.member_of_org?(file.container.organization) %>
+    <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 file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, 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 => "linkGrey3 f_14 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>
+              <br/>
+            </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 %>
-            </li>
-          </ul>
+              <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<span id="reference_number_<%= file.id %>"><%= file.quotes.nil? ? 0:file.quotes  %></span></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 (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}','#{User.current.id}','file')")  %></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}','#{User.current.id}','file')")  %></li>
+                          </ul>
+                      <% end %>
+                  <% end %>
+                </li>
+              </ul>
 
+            </div>
+          </div>
+          <div class="cl"></div>
         </div>
-      </div>
-      <div class="cl"></div>
-    </div>
 
   </div><!---re_con_box end-->
+  <% end %>
 <% end %>
 
 <% if org_subfield_attachments.count == 10 %>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 6531aa96b..7fb9e2e0a 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -54,7 +54,7 @@
           <%= 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_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= User.current.member_of_org?(@org_subfield.organization) ? @all_attachments.count : @all_attachments.select{|attach| attach.is_public == 1 }.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;
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 2a44f2980..59ed3ad39 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -143,18 +143,19 @@
       <% unless contributor_course_scor(@course.id).count == 0 %>
         <ul class="rankList">
         <h4>课程活跃度
-          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a>
+          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
         </h4>
-          <div  style="display: none;padding: 5px;" class="numIntro color_888">
-            <div class="contributor_course_innor">积分规则</div>
-            资源发布：资源数 x 5 </br>
-            问答发布：发帖数 x 2 </br>
-            通知发布：通知数 x 1 </br>
-            问答回复：回复数 x 1 </br>
-            作业留言：留言数 x 1 </br>
-            通知留言：留言数 x 1 </br>
-            课程留言：留言数 x 1  </br>
-            总得分为以上得分之和
+          <div  class="numIntro undis" style="cursor:pointer;">
+            <div class="active-degree-rule">
+            积分规则<br/>
+            资源发布：资源数 x 5 <br/>
+            问答发布：发帖数 x 2 <br/>
+            通知发布：通知数 x 1 <br/>
+            问答回复：回复数 x 1 <br/>
+            作业留言：留言数 x 1 <br/>
+            通知留言：留言数 x 1 <br/>
+            课程留言：留言数 x 1  <br/>
+            总得分为以上得分之和</div>
          </div>
 
         <% contributor_course_scor(@course.id).each do |contributor_score| %>
@@ -168,8 +169,8 @@
               <p><span class="c_green" style="cursor:pointer">
                 <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
                   <%=total_score %></a></span></p>
-              <div  style="display: none" class="numIntro color_888">
-                <div class="contributor_course_calculate">积分计算</div>
+              <div  style="display: none" class="numIntro">
+                <div class="contributor-course-calculate">积分计算</div>
                 <%# unless  contributor_score.resource_num.to_i == 0 %>
                 <div style="padding-left: 2px;padding-bottom: 2px;padding-right: 2px">
                   资源发布数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br>
@@ -208,10 +209,11 @@
       <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
         <ul class="rankList">
           <h4><span>课程英雄榜</span>
-            <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a></h4>
-          <div  style="display: none" class="numIntro color_888">
-            <div class="hero_course_innor">积分规则</div>
+            <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
+          <div  style="cursor:pointer;" class="numIntro undis">
+            <div class="hero-degree-rule">积分规则<br/>
             英雄榜的得分是每个同学作业的得分总和
+            </div>
           </div>
           <% hero_homework_scores.each do |student_score| %>
               <% if student_score.score.to_i != 0 %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 0e056c972..2cf1810ad 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -154,8 +154,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index d42dc152d..9dd5eaa7a 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -153,8 +153,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb
index b72ec880b..1e691c3b7 100644
--- a/app/views/users/_upload_resource.html.erb
+++ b/app/views/users/_upload_resource.html.erb
@@ -37,8 +37,8 @@
 
         </div>
         <div class="uploadResourceIntr">
-          <div class="uploadResourceName"><span id="upload_file_count">(未选择文件)</span></div>
-          <div class="uploadResourceIntr2"><!--您可以上传小于<span class="c_red">50MB</span>的文件--></div>
+          <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
+          <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
         </div>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 0c2856c89..9f3847735 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -157,8 +157,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
diff --git a/app/views/users/_user_programing_attr.html.erb b/app/views/users/_user_programing_attr.html.erb
index 8657e5542..e04caf533 100644
--- a/app/views/users/_user_programing_attr.html.erb
+++ b/app/views/users/_user_programing_attr.html.erb
@@ -12,8 +12,8 @@
       <% homework.homework_tests.each_with_index do |test, index| %>
           <div class="mt10">
             <label class="fl mt5" name="inputs_label"><%=index+1 %>&nbsp;&nbsp;</label>
-            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea>
-            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"  id="textarea_output_test"><%= test.output %></textarea>
+            <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]"><%= test.input %></textarea>
+            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]"><%= test.output %></textarea>
             <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
             <% if index != 0 %>
                 <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
@@ -24,8 +24,8 @@
   <% else %>
       <div class="mt10">
         <label class="fl mt5" name="inputs_label">1&nbsp;&nbsp;</label>
-        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea>
-        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" id="textarea_output_test"></textarea>
+        <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" name="program[input][]" id="textarea_input_test"></textarea>
+        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" name="program[output][]" id="textarea_output_test"></textarea>
         <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
         <div class="cl"></div>
       </div>
@@ -41,8 +41,10 @@
 </div><!----HomeWorkCon end-->
 
 <script>
-    var text = document.getElementById("textarea_input_test");
-    var text2 = document.getElementById("textarea_output_test");
-    autoTextarea2(text,text2);
-    autoTextarea2(text2,text);
+    <% if !edit_mode %>
+        var text = document.getElementById("textarea_input_test");
+        var text2 = document.getElementById("textarea_output_test");
+        autoTextarea2(text,text2);
+        autoTextarea2(text2,text);
+    <% end %>
 </script>
\ No newline at end of file
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index cafbf457f..6eddf1e05 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -3,7 +3,6 @@
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
   </div>
-  <div style="float: left; margin-top: 7px; font-size: 14px; margin-left: 15px;"><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count %></span>个资源</span></div>
 </div>
 <div class="cl"></div>
 <ul class="resource-list-tab mt10">
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 57fe9d42d..c05a2ebd0 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -4,7 +4,8 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+$("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_org.js.erb b/app/views/users/add_exist_file_to_org.js.erb
index 57fe9d42d..9bfe1230a 100644
--- a/app/views/users/add_exist_file_to_org.js.erb
+++ b/app/views/users/add_exist_file_to_org.js.erb
@@ -4,7 +4,10 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+<% if @ori.present? and @ori.quotes.present? %>
+    $("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
+<% end %>
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 57fe9d42d..ed38fa066 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -4,7 +4,10 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
+<% if @ori and @ori.quotes.present? %>
+    $("#reference_number_<%= @ori.id %>").text("<%= @ori.quotes %>");
+<% end %>
 hideModal();
-alert("发送成功")
+alert("发送成功");
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 02bfc9203..3c0c4969b 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -97,7 +97,7 @@
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
               <% if @is_test %>
-                <%=link_to '返  回',course_path(@course),:class=>'fr mt6' %>
+                <%=link_to '返  回',homework_common_index_path(:course => @course.id),:class=>'fr mt6' %>
               <% else @is_test %>
                 <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
               <% end %>
diff --git a/db/migrate/20160309024051_update_homework_common_updated_at.rb b/db/migrate/20160309024051_update_homework_common_updated_at.rb
new file mode 100644
index 000000000..89a0e992d
--- /dev/null
+++ b/db/migrate/20160309024051_update_homework_common_updated_at.rb
@@ -0,0 +1,18 @@
+class UpdateHomeworkCommonUpdatedAt < ActiveRecord::Migration
+  def up
+    count = HomeworkCommon.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        HomeworkCommon.page(i).per(30).each do |hw|
+          ca = CourseActivity.where("course_act_type = 'HomeworkCommon' and course_act_id = #{hw.id}").first
+          unless ca.nil?
+            hw.update_attributes(:updated_at => ca.updated_at)
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 76dd8e19c..5bc8b1ea0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160304234903) do
+ActiveRecord::Schema.define(:version => 20160309024051) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 337c5a9a0..7dd416dec 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -127,7 +127,15 @@ $(function(){
             $("a.CloseBtn").on('click', function(){
                 $("#BluePopupBox" ).dialog("close");
             });
-            $('#textarea_input_test').focus();
+            var inputs = document.getElementsByName("program[input][]");
+            var outputs = document.getElementsByName("program[output][]");
+            if (inputs.length == outputs.length) {
+                for (var i=0; i<inputs.length; i++) {
+                    autoTextarea2(inputs[i], outputs[i]);
+                    autoTextarea2(outputs[i], inputs[i]);
+                }
+            }
+            $(inputs[0]).focus();
         } else if($("input[name=homework_type]").val() == "2") {
             $("#NoticePopupBox" ).dialog("close");
             $("input[name=homework_type]").val(1);
@@ -168,7 +176,7 @@ $(function(){
             $("#cancel_switch").on('click', function(){
                 $("#NoticePopupBox" ).dialog("close");
             });
-            $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
+            $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
         }
         else {
             $("#BluePopupBox").dialog("open");
@@ -176,7 +184,15 @@ $(function(){
             $("a.CloseBtn").on('click', function(){
                 $("#BluePopupBox" ).dialog("close");
             });
-            $('#textarea_input_test').focus();
+            var inputs = document.getElementsByName("program[input][]");
+            var outputs = document.getElementsByName("program[output][]");
+            if (inputs.length == outputs.length) {
+                for (var i=0; i<inputs.length; i++) {
+                    autoTextarea2(inputs[i], outputs[i]);
+                    autoTextarea2(outputs[i], inputs[i]);
+                }
+            }
+            $(inputs[0]).focus();
         }
     });
 
@@ -280,7 +296,7 @@ $(function(){
             $("#cancel_switch").on('click', function(){
                 $("#NoticePopupBox" ).dialog("close");
             });
-            $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
+            $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
         }
         else {
             $("#GroupPopupBox").dialog("open");
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 8e83f2e18..1c832b4b3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1286,7 +1286,6 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectType {width:70px; text-align:center;}
 .subjectCount {width:65px; text-align:center;}
 a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: normal;}
-.contributor_course_innor{font-size: 12px;color: #888;padding-left: 36px;}
-.hero_course_innor{font-size: 12px;color: #888;padding-left:77px;}
-.contributor_course_calculate{padding-left: 54px; font-size: 12px;color: #888}
-.color_888{color: #888}
+.active-degree-rule{font-size: 12px;color: #888; text-align: center; cursor: pointer;}
+.hero-degree-rule{font-size: 12px;color: #888;text-align: center;}
+.contributor-course-calculate{padding-left: 54px; font-size: 12px;color: #888}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a923ae86f..620feaeac 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -692,7 +692,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSetting ul li:hover ul {display:block;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
-.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
+.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 707d661ea..5a9593519 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -615,7 +615,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:690px; margin:0px auto; margin-top:15px; min-height:60px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
-.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
+.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}