diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 056d6404d..08a9b965f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3823,6 +3823,7 @@ class UsersController < ApplicationController end end + # 导入资源 def import_resources @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id] diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb index 2cec0fc27..d6f3f1b30 100644 --- a/app/views/layouts/_base_footer_public.html.erb +++ b/app/views/layouts/_base_footer_public.html.erb @@ -21,7 +21,7 @@
+ +
  • + + 取  消 + <%= submit_tag '确定',:onclick => 'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sy_btn_blue fl ml20' %>
    - \ No newline at end of file +
  • + \ No newline at end of file diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb index 758b8c2f0..21e4704f8 100644 --- a/app/views/users/user_resource.js.erb +++ b/app/views/users/user_resource.js.erb @@ -1,3 +1,8 @@ +<% if params[:upload_resourse] == 'true' %> + var htmlvalue = "<%= escape_javascript(render :partial => 'upload_resource' ,:locals => {:user => User.current.id, :type => @type, :status => @status}) %>"; + pop_box_new(htmlvalue, 420, 316); +<% end %> + $("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form', :locals => {:user => @user, :type => @type} ) %>'); $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>'); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>'); diff --git a/public/images/footer_logo/ucloud_logo.png b/public/images/footer_logo/ucloud_logo.png new file mode 100644 index 000000000..5889e3773 Binary files /dev/null and b/public/images/footer_logo/ucloud_logo.png differ