diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index fa2c87f8c..7ec532d79 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -202,6 +202,11 @@ class AttachmentsController < ApplicationController
end
@attachment.save
@newfiledense = filedense
+ end
+ if @project
+
+ elsif @course
+
end
respond_to do |format|
format.js
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 70bce9566..988768414 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -325,7 +325,7 @@ class FilesController < ApplicationController
@containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)]
show_attachments @containers
- get_attachment_for_tip(@all_attachments)
+ # get_attachment_for_tip(@all_attachments)
@tag_list = attachment_tag_list @all_attachments
@@ -378,7 +378,7 @@ class FilesController < ApplicationController
@containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
show_attachments @containers
- get_attachment_for_tip(@all_attachments)
+ # get_attachment_for_tip(@all_attachments)
@tag_list = attachment_tag_list @all_attachments
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 5291c2d06..b5a15bc1f 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -115,21 +115,22 @@
-
- <%= render :partial => "files/tip_attachment_count" %>
+
+
+
+
共有 <%= @all_attachments.count%> 个资源
+
+ <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
-
- <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
-
-
-
-
私有资源：
仅对本班级成员可见
-
公共资源：
对所有用户可见
-
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index ebda40e6e..7504fbecb 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -85,9 +85,10 @@
-
- <%= render :partial => "files/tip_attachment_count" %>
-
+
+
+
+
共有 <%= @all_attachments.count%> 个资源
<% if @order == "asc" %>
按 <%= 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"} %> /
@@ -102,14 +103,14 @@
-
-
-
私有资源：
仅对本项目成员可见
-
公共资源：
对所有用户可见
-
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb
index 8aaff5aa5..11d4ad297 100644
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@@ -3,6 +3,6 @@
$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
<% else %>
$("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
- $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
+// $("#tip_attachment_count").html("<%#= escape_javascript( render :partial => 'files/tip_attachment_count') %>");
$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
<% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index ed54fcdce..472a18b02 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,6 +1,6 @@
<%# course_model %>
-<%# course_file_num = visable_attachemnts_incourse(@course).count%>
-<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<%# course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
<% homework_num = visable_course_homework @course %>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 2fda1e727..0ec0873ce 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -144,7 +144,7 @@
-
- <%=link_to image_tag(url_to_avatar(user), :width => "50", :height => "30"), user_path(user), :class => "image-cir", :target => '_blank' %>
+ <%=link_to image_tag(url_to_avatar(user), :width => "50", :height => "50", :class => "image-cir"), user_path(user), :target => '_blank' %>
<%=link_to (user.id == 2 ? author_info[:email] : user.show_name), user_path(user) %>
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index daae81b56..378fb3ba9 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -100,7 +100,7 @@ a.sendButtonBlue:hover {color:#ffffff;}
a.resourcesTypeAll {background:url(../images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
a.resourcesTypeAtt {background:url(../images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px no-repeat; padding-left:23px;}
-.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999;}
/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
/*.resourcesUploadBox:hover {background-color:#0781b4;}*/
@@ -1416,9 +1416,9 @@ a:hover.comment_ding_link{ color:#269ac9;}
border:1px solid #fcd9b4;
height:34px;
}
-a.syllabusbox_a_blue{
- color:#3b94d6 !important;
-
+a.syllabusbox_a_blue {
+ color: #3b94d6 !important;
+}
.icons_tishi{
width: 110px;