From 48419573ac7c6d5ca82dde81aadc12e9dcb1c7a6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:02:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E6=9C=892=E6=9D=A1=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 535e8eb59..de471ea5a 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -689,7 +689,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} -.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} From 02f7538200ed44d5aab1152b1878a8c10c2b37b0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:10:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=B8=BA=E8=8B=B1=E6=96=87=E6=97=B6=E4=B8=8D=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index bafeb8d5e..edc869a91 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -57,7 +57,7 @@
-
+

<%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>

From 76ec0d5d4828516ccd18187c8b4a8cde502d019b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:47:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=B5=84=E6=BA=90=E5=88=B0=E4=BD=9C=E4=B8=9A=E9=9D=99?= =?UTF-8?q?=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++++++++- app/views/users/_show_user_resource.html.erb | 26 +++++++++++++++++++ .../users/_user_homework_attachment.html.erb | 2 +- app/views/users/user_import_homeworks.js.erb | 2 +- app/views/users/user_import_resource.js.erb | 7 +++++ config/routes.rb | 1 + 6 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 app/views/users/_show_user_resource.html.erb create mode 100644 app/views/users/user_import_resource.js.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 544ed7bf5..e98220d26 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,7 +46,7 @@ class UsersController < ApplicationController :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index, :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource, :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, - :user_import_homeworks,:user_search_homeworks] + :user_import_homeworks,:user_search_homeworks,:user_import_resource] before_filter :auth_user_extension, only: :show #before_filter :rest_user_score, only: :show #before_filter :select_entry, only: :user_projects @@ -378,6 +378,16 @@ class UsersController < ApplicationController end end + #用户从资源库导入资源到作业 + def user_import_resource + user_course_ids = User.current.courses.map { |c| c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 + @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ + "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc") + respond_to do |format| + format.js + end + end + include CoursesHelper def user_courses diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb new file mode 100644 index 000000000..a27a51d65 --- /dev/null +++ b/app/views/users/_show_user_resource.html.erb @@ -0,0 +1,26 @@ +
+
+
资源库
+
+ +
+
+ + +
+
+ <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %> +
+ <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%> +
+
+
+ 确定 +
+
+ 取消 +
+
+ <% end%> +
+
\ No newline at end of file diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb index e184d4132..4f47cd7f2 100644 --- a/app/views/users/_user_homework_attachment.html.erb +++ b/app/views/users/_user_homework_attachment.html.erb @@ -47,7 +47,7 @@
上传附件 - + <%= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
<% content_for :header_tags do %> diff --git a/app/views/users/user_import_homeworks.js.erb b/app/views/users/user_import_homeworks.js.erb index 7f9bfa0df..d00886b1c 100644 --- a/app/views/users/user_import_homeworks.js.erb +++ b/app/views/users/user_import_homeworks.js.erb @@ -4,4 +4,4 @@ $('#ajax-modal').css('height','300px').css("width","580px"); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); -$('#ajax-modal').parent().css("top","20%").css("left","25%"); +$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed"); diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb new file mode 100644 index 000000000..ce70d68ad --- /dev/null +++ b/app/views/users/user_import_resource.js.erb @@ -0,0 +1,7 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>'); +showModal('ajax-modal', '580px'); +$('#ajax-modal').css('height','300px').css("width","580px"); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + +""); +$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 634fb6d27..7237787bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -329,6 +329,7 @@ RedmineApp::Application.routes.draw do match 'user_homeworks', :to => 'users#user_homeworks', :via => :get get 'user_import_homeworks' get 'user_search_homeworks' + get 'user_import_resource' match 'watch_projects', :to => 'users#watch_projects', :via => :get # # added by bai From bbb8e5a0627b485ff0c34d416488d06c020550de Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:56:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 2 +- app/views/users/user_homeworks.html.erb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 2d4c7eb49..3c4358b95 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -38,7 +38,7 @@
发送 或 - 取消 + 取消
\ No newline at end of file diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 2813f2006..4151334dc 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -11,6 +11,14 @@ } }; $(window).scroll(scrollHandler); + + function reset_homework(){ + $("#homework_name").val(""); + $("#homework_end_time").val(""); + $("#course_id").val(""); + $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>"); + homework_description_editor.html(""); + } <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> From 148a4e247934eac519275aaf1d30f015959e4ec2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 28 Aug 2015 16:59:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 2 +- app/views/users/user_homeworks.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 3c4358b95..e6cd1483d 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -1,6 +1,6 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-
+

diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 4151334dc..e232579f9 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -30,7 +30,7 @@
-
+
<% homework = HomeworkCommon.new %> <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>