diff --git a/app/views/attachments/update_file_dense.js.erb b/app/views/attachments/update_file_dense.js.erb index 747024dec..0a3124e83 100644 --- a/app/views/attachments/update_file_dense.js.erb +++ b/app/views/attachments/update_file_dense.js.erb @@ -1,12 +1,16 @@ <% if @attachment.container_type == 'Course' %> $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), :remote=>true,:class=>"postOptionLink",:method => :post) %>"); -<%else%> +<% elsif @attachment.container_type == 'Project' %> + $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid => @attachment.id, :newtype => (@attachment.is_public? ? 0:1)), + :remote => true, :class => "postOptionLink", :method => :post) %>"); + +<% else %> $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), :remote=>true,:class=>"f_l re_open",:method => :post) %>"); -<%end %> -<%if @attachment.is_public? %> +<% end %> +<% if @attachment.is_public? %> $("#image_private_<%= @attachment.id%>").html('') <%else%> $("#image_private_<%= @attachment.id%>").html('私有') -<%end%> \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb index f86729da6..8f50148c6 100644 --- a/app/views/files/_project_list.html.erb +++ b/app/views/files/_project_list.html.erb @@ -33,19 +33,13 @@ <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
- - - + <%= render :partial => 'tool_settings', :locals => {:project => @project, :delete_allowed => delete_allowed, :file => file} %> +
- <% else %>
<%= file.filename %>是私有资源
<% end %> @@ -53,10 +47,10 @@ <% if project_attachments.count == 10%> <% if params[:action] == 'search' %> - <%=link_to "点击展开更多", search_project_files_path({:project_id => project.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> + <%=link_to "点击展开更多", search_project_project_files_path({:project_id => project.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> <%else%> - <%=link_to "点击展开更多", project_files_path({:project_id => project.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> + <%=link_to "列表点击展开更多", project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> <%end%> <% end%> diff --git a/app/views/files/_tool_settings.html.erb b/app/views/files/_tool_settings.html.erb new file mode 100644 index 000000000..72ec6d89f --- /dev/null +++ b/app/views/files/_tool_settings.html.erb @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb index e4f38f7d9..584eeb276 100644 --- a/app/views/files/index.js.erb +++ b/app/views/files/index.js.erb @@ -1,4 +1,5 @@ - <% if @course %> -$("#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} )%>"); + $("#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})%>"); <%end %> \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 24ffafb4c..6e9631d80 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -152,8 +152,8 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;} .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;} +/*.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;}*/ .resourceSendO {width:65px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:2px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;cursor: pointer} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px; text-align:center;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index bb63b8c4e..b04802adb 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -1130,9 +1130,13 @@ a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repe .postRouteContainer {padding:10px 15px; background-color:#ffffff; border:1px solid #dddddd; margin-top:10px; font-size:14px;} a.postRouteLink {font-weight:bold; color:#484848;} a.postRouteLink:hover {text-decoration:underline;} +.homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSetting ul li:hover ul {display:block;} +.resourceSendO {width:65px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:2px 0px; display:none;} .ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;} .ReplyToMessageInputContainer {width:582px; float:left;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px; text-align:center;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} +a.postOptionLink2 {color:#616060; display:block; width:35px; padding:0px 15px;} +a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;} \ No newline at end of file