From 756d703b5a6d67c73ea6634523331a552df26d0a Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Sep 2015 15:34:08 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=96=87=E5=AD=97=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E4=BA=8E=E2=80=9C=E8=AF=B7=E9=80=89=E6=8B=A9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8D=B3=E5=BC=B9=E5=87=BA=E4=BE=9B=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=90=8E=E8=BF=98=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 15 ++++++++++++++- app/views/users/_user_homework_form.html.erb | 7 ++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index e7ab001da..d9458bdaa 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -541,7 +541,7 @@ module UsersHelper end end - #获取指定用户作为老师的课程 +=begin def get_as_teacher_courses user type = [] user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course| @@ -552,5 +552,18 @@ module UsersHelper end type end +=end + + #获取指定用户作为老师的课程 + def get_as_teacher_courses_terms user + type = [] + user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course| + option = [] + option << course.name+"（"+course.time.to_s+course.term+"）" + option << course.id + type << option + end + type + end end diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 7cd4da414..9ff31a9d2 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -27,7 +27,7 @@
- <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w708",:value => "请选择发布作业的课程"} %> + <%= select_tag :course_id, options_for_select(get_as_teacher_courses_terms(User.current), homework.course_id), {:class => "InputBox w708"} %>
@@ -43,3 +43,8 @@
+ \ No newline at end of file From da9c374ed9b2d530ac080c91d2ac395556912b5d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 1 Sep 2015 16:21:00 +0800 Subject: [PATCH 02/16] 111 --- app/views/comments/create.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb index d55b714ad..dd3c3dfb2 100644 --- a/app/views/comments/create.js.erb +++ b/app/views/comments/create.js.erb @@ -1,3 +1,3 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>"); -init_KindEditor_data(<%= @user_activity_id%>); +init_KindEditor_data('<%= @user_activity_id%>'); From 56644ca17342cddd8cccd266dab752499fca1e93 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Tue, 1 Sep 2015 16:25:05 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=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_activities.html.erb | 2 +- public/stylesheets/new_user.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 6e03bb43d..2dcdd04cf 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,4 @@ <% end %> <% end %> -<%= link_to "加载更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true"%> \ No newline at end of file + <%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4fbcb4139..04195e7c3 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -528,6 +528,7 @@ a.menuGrey {color:#808080;} a.menuGrey:hover {color:#fe7d68;} .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} #navSearchAlert {display:none;} +.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;} /*个人主页右部分*/ .homepagePostType {width:180px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-170px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;} From 313ee0f9d8c9e92e877bc9121cc0837f71d693cb Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Tue, 1 Sep 2015 16:30:10 +0800 Subject: [PATCH 04/16] =?UTF-8?q?footer=E5=AF=B9=E9=BD=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= 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 8639d7834..4c2c3584c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -675,7 +675,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; padding-top: 10px; } +.footerAbout{ width:365px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; } .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 e4559dce78db678367e3e6b7a54f75f1bca5a08d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 1 Sep 2015 16:30:39 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BD=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 1 + app/views/users/_user_homework_list.html.erb | 3 ++- app/views/users/user_homeworks.html.erb | 13 ------------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 9b4bfb903..7a9e55205 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -72,6 +72,7 @@ +
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index faa09ef70..e1bbf6e1c 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -53,4 +53,5 @@ <% end%> - \ No newline at end of file + +<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore mt10 f_grey"%> \ 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 d401ea314..bc314565a 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -1,17 +1,4 @@ \ No newline at end of file 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 08737f5ca..c61790c40 100644 --- a/app/views/users/add_exist_file_to_course.js.erb +++ b/app/views/users/add_exist_file_to_course.js.erb @@ -1,4 +1,9 @@ <% if @flag == true%> +$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>'); +$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); +$("#res_all_count").html(<%= @atta_count%>); closePopUp(); <% 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 08737f5ca..c61790c40 100644 --- a/app/views/users/add_exist_file_to_project.js.erb +++ b/app/views/users/add_exist_file_to_project.js.erb @@ -1,4 +1,9 @@ <% if @flag == true%> +$("#search_div").html('<%= escape_javascript( render :partial => 'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>'); +$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); +$("#res_all_count").html(<%= @atta_count%>); closePopUp(); <% else%> <% end %> \ No newline at end of file diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index 556069a1f..e331b49e7 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -1,11 +1,6 @@ - - - - - - - +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %> -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %> - - - -
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 2ecda7758..c0049db88 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -4,9 +4,9 @@ <%= stylesheet_link_tag 'leftside' %> <%= javascript_include_tag 'attachments'%> - - - + + + diff --git a/config/routes.rb b/config/routes.rb index 20ef2f406..f508a74fc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -171,7 +171,7 @@ RedmineApp::Application.routes.draw do resources :contests, only: [:index] do resources :contestnotifications do # get 'preview', on: :collection - resources :notificationcomments + resources :notificationcomments end collection do @@ -232,7 +232,7 @@ RedmineApp::Application.routes.draw do end end end - + resources :shares @@ -369,7 +369,7 @@ RedmineApp::Application.routes.draw do get 'user_resource_type' get 'user_ref_resource_search' post 'import_resources_to_homework' - # end + # end end end match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "feedback" @@ -483,7 +483,7 @@ RedmineApp::Application.routes.draw do collection do match "getattachtype" , :via => [:get, :post] match "search_project",:via => [:post,:get] - #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via => [:get, :post] + #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via => [:get, :post] end end @@ -513,7 +513,7 @@ RedmineApp::Application.routes.draw do resources :repositories, :except => [:index, :show] do member do get 'newrepo', :via => [:get, :post] - # get 'create', :via=>[:get, :post] + # get 'create', :via=>[:get, :post] end end match 'wiki/index', :via => :get @@ -544,6 +544,9 @@ RedmineApp::Application.routes.draw do match 'bulk_edit', :via => [:get, :post] post 'bulk_update' end + member do + post 'add_journal' + end resources :time_entries, :controller => 'timelog' do collection do get 'report' @@ -600,8 +603,8 @@ RedmineApp::Application.routes.draw do :controller => 'repositories', :format => false, :constraints => { - :action => /(browse|show|entry|raw|annotate|diff)/, - :rev => /[a-z0-9\.\-_]+/ + :action => /(browse|show|entry|raw|annotate|diff)/, + :rev => /[a-z0-9\.\-_]+/ } get 'projects/:id/repository/statistics', :to => 'repositories#stats' @@ -618,8 +621,8 @@ RedmineApp::Application.routes.draw do :controller => 'repositories', :format => false, :constraints => { - :action => /(browse|show|entry|raw|annotate|diff)/, - :rev => /[a-z0-9\.\-_]+/ + :action => /(browse|show|entry|raw|annotate|diff)/, + :rev => /[a-z0-9\.\-_]+/ } get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))', :controller => 'repositories', @@ -722,7 +725,7 @@ RedmineApp::Application.routes.draw do get 'test_connection', :as => 'try_connection' end collection do - get 'autocomplete_for_new_user' + get 'autocomplete_for_new_user' end end @@ -784,7 +787,7 @@ RedmineApp::Application.routes.draw do collection do match 'chang_read_flag', :via => :get end - end + end end # end of resources :courses match 'courses/:id/feedback', :to => 'courses#feedback', :via => :get, :as => 'course_feedback' diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png index 4478af0708c8fb71961a090f11331279d253e4c2..d39624a2e24f10323817e45686e5090365e7f4d7 100644 GIT binary patch delta 7224 zcmZ8mc|26__n$FYvR8J4l%*1~#8?_dk_sW&sSsJmzUG<_@v%fqvQrdUGK8@+5gLpk zMq%uO>^n0Ie$)5+{p)xCxUc)V_dMr3&pGG0=Y8G}*=X=#MGGqsp?~|jTg1bMV~{0RERRL%lZc;eR%x$(TCsWz2A{yBSN+uWQOc@{lZ0)uzVH0c z1*+sEt&fT)XFvJ?JiKZ0i`|<=qCJ^iPZ5ek&>tLODbtTW78Vw2o0_8JD>$B9wg;{5 z-winBS~aqgl$Dvu2{B}BNhi@Pp9H96y{suNexdbVG7DcGIK=b<<~6D8dI9^d+e8RS ze8N>Z2`t8Rd=B=tcYGMM&)^J60_7>^9-EKfCmdQ>r*i_{F&O4O!_LJY0c%QU>#kAv z^=~p!B6U<@?Z(oMRU?uH1_t}!w16$~Ny780JA=Bl6CrLoTRlbLqt!10Jv;Zyi234HXpr@oi)6+_aL^s_3&t!acOV_brz#C6j$r)kDt#(*Of8qQ@ZoiT;1?sz z<^qbVM#{R9#wVQ|tn(L(9kNv;ehNrQ<%!Ar+Shn3(A~C_Z&sC~$tjW^;-=OBx;B$p zOZ)PBv&{GO#+MYl63Vt(Bm%fx<@OHuyhkI7CmsZe?3nMp#Ay*j; zPjx~FGm=*vVNN3V!pbXV#=kD4AXH#vA9IiU%xP-xELpQXl@+tM;J3rx*EwYE%9}$6X!7T|XsQU-4aq5nC-+#UQQ}cD$fUFOBZpVo1%G$bWh&t! zLd%1*n?9>Ic=1nh52}CtHqf%wMCgVhA<#4}#>v5S+$bO$cY@b<_cOD@F$d(3?Xq7E>K-_!Gq zG+*5OK4h}^g$p(2uZPDhVLvEsE=Bnx!s#d|1<+J0%t+}~t}3`B#6g0DU7%XrZYsgB z)QuyUFm$KW*S9)1su+V`@G*Um+V(8+;p_h-W;y&JeD1t*BO&jATBL5#&Tbn_}&pM?xH!r^)}Cu*lo< zSK7hEUyowNsJt+f1XKFQ$ggLxJ()%;@M_S8|z&gUqgMar<0oiAj zo^V9EF=plAB6`j(@H4|1dmkkFx9HRK-mNq8oo!X!I5Xq>Z0HrY-TKnDa33}SrzP`y z4-pNSybvCUjl^}0lI!Lbr})43{6zaNP&xD>)pE~ZCG|B!C1Ruiqv!e7+AJ~+EQh4% zi~f=E5R{>WDDZQtUwUDsd(Ni|Yz}fJZ&S@U8?(LDoq?&KsiJxt&xCe4=j=r1%z{|? zqK(rtO0P+$d!^vkP4s=3ul5h+k)}h$BuJX!L^x>p>90mxG;PsOE=}Vt<#uRCqZ0u< zyG?CM^GNIZE1gd1{kLP_Dx;yQkf0&eg}zZunt_}+6?w4hf2F41#y+2v$h5teuQu#L zR-nt2#LE9^@XE;OlzG@ASR``DZ7)cbEijh+Q#|*_p4-0sNMh!ftD#~h-XK%Ccx8`P zOHj{|+%EhY_KiGrkSbiuzXx*?UC+~03dC`R+pKvf!4E!1s^8=# z&-mT}QYqx+i}yuMbi=gwBr_h&10wB$5!2+>>XX%C{+1)P_n#_$jqJ}CwyHN5bj_j1 zjvDAzb08nt4(+yfNi{%28v-NLcl_PlcC3h8cpbZ?*tJK*E@QQv6f?AT=4K+)#kICe zj#TbctxHZ$SSf?*7tx0DVH6AjBKy}sJ_|3^NarU<-p`*SbzBb5QH@q)L$H$-F>&HtK zEmeSsJ7>}(ddzNQug3pVLoHoIh>gU~4pHCsOclqKk6I*oGo`o9)OUT%rQAMM&12}% zM_!Vfc+^uc@u{J(5vzM)-@vQ=itU2#!{q{vn-=rOS(B)f&REn~qua5tv|-<* z|3G2?@o_hdxx$ohe{Yt(2;Fotv<}|**}ULBT5$Zcrg+jmIP|!O+2*la=FmF2DJSju zOV`;>Oc&-x+UT}c^ARkq;PCGBy1e-((e5&U*@{){aKyX5xb|u{q28Az2|Ao^)#~c^ zbSO7|#JPKa_Qpy7M=Lc-_GW=*uTjup<^{x}M#9SZ&0BSPHD z%*x_ooIl$tH<%&0==y{aVI_qM9z`&{(ML%ow|ee}n#fP8)?9NX*pr2RibV!3W&lOy zbvJ5OrctQILgc$PIXx|$abVsgX7nA}iyFN2r9(`1#ec7tv|~=#l~q0JK^!P%s|7yZ z{PA?zblJRyr&E;XzIL)o+r$SDp4;(?wY#4n@e}$Ln;rd2B0sZt9{JNF_qbglJMOe} ztV8P%A?f5?zsYCO=9G5N)(e3+fNMU@7E0N(tkLxESS{X_nGL)vrW87x$1jjL{pb-4 zL_PGHNbQn3zFrf~D-0R+Zws41HDRd-N--5-w^lo!lmtec)*97P-F>$(mfMbCFPdo^ z5$G?}Qg8u`#nlQgk9)$RO)IC}MLLYFYY4kP6ik0rLiEE;8l~+dEnPQoi<(Vbp~O!wQf{3H^M6! zNbK&tdOwyh(s=(Y{#lG|A1o^XcL%(1F0a7Ve8x0x9vK>8jg0@7P+q4|E z!?K|_#rY%&aC|(%k$x+zGdVtDnO=*2!N@}F7^*=oy%4QS!ZUW6rph`GcF^&j8mtuX zChuph-xhhtUNJU(u*w&>6(3h`W!xqnjl^LCunQudf_+j&3{?7nwg5inTyQwUkQ!-D z*LcT~NB0%E9aU_87q-rvJK6m*6XhV5x}Tg60Aj0%M|WW8%H67_Rn{LhOE(9bVi)XoH*r*4VQ zEX#+Vw}gRURh96gb1{wM9Y}o3Y4NB>Ji11FB8QrS+8d*Jk?x)1vClLSTHFybD1zDv z6ZDy~oB+GZjlFkS^ohscY}UEbZtS)4uAXhaJd?zz^fwBEiHoev`L-c{hu{Cb}%hB{7t$ zZ$4@zI4ah{^7~+^Gk-Yqk(6gPISSn$ppMgJ8H#RRGxvkZ|Du0jG^qv$#N?{NCi24` z+Zx$|%W%|!&5X>~)zjJU+%um?#j$=nqR%JJ|-0eTk1;;90%C z%&i4h&6avDf#FD_dKDBddo^jT5inmBdd~}UqL1#0_YzQZ>n?RG>{Vx^C?T#R>=+X_ zr*Aee=b<~q#*TlTL(gV|G;M?oj5T|ZF{nec{IpOCm5=J60c#sMZPAc=c$G1rxL*OV zBefIu{>?@?x2d?xmI}k- z@%Yfa4X#6G#f;u(fZybi5+`n137AC|>nop&O*0@!h9AwpVilcr!ZwJ8l<(rUUtEi- zq8qn*5~4U;c30(u<2P4&3;o5#EB+Bm84ujJjw|F1a*dA4iY7``ME|yq{p4*jSyckd zh6NsPz~mV^Ik2yocIiKM+=}nnO}5;wgzW2c`Y{%3CHhM_f_grk$*2K|E2t?bBk(sv zhPp~Zw{WgPRsl?K=4|$rEcbBHbY{|kMP4{w{MVCy2Wg2iI?RP3RIe50G?ty}b1O4C z`SCPu+C6Um)_Ef4OC>z#o~O()7b{jURmjNK*EfmwuG>-ZGJUyojjr?!*$A4HNh~aQ zh+HQsS8LK0A6vglr1B#tfq?DG7>NB|R{#P!Yr~qb)^?-^$pe?uLu8+ha}-^lPq!DF6n^uY*_n73uQHMJ$f^O7+w<0JF4SiKbaR(2qJ{WE)?ptGH-==Q%l zT=Za#rG?$#sr%$ISoF6h_ZH3FN*}%Uoe1DH3omyvJax4~atRA*J4XsJdTx11Wb|_&@+#&ZJ^uUM^s#ETAq~!Sh4P)xFZ; zsD;bl@AtVO`BNM+y$+-ZuNARgDO?ee$fsCa>)-^Yv4jFc0*oKjx-xGHWefWy=**3W zEmg0ppOWLe8-4LVEC|-+$iNXUL+mOi%=ySK z_|zBMvOIT{OA8gOYeBbDr4YsrFGF<3qREr|kjahEVz{5&HL*JB)1NT~f>NjFbIA$| zo~yXfm6>{ao~T|QE<%qCAKtyuq~4<g9mb+u7?qX|;O;8asP#+En-}zoO-a4c~X&X11ee$8X z`Tj#AJScJL#U4z0L-NXMx6BTMSND3bjRp7Kl1w7b z4^%gc7Pk27Y*DKl8X6coR3+^59{aRn6N@y*4fl{aWgP zXOr=jsgviiG9r*imzek{uUCD%p;;pyfS5}(x`%>{bd8lEzd2!iFqOFc0+ff5z$_F5Ji{@qd-F*_un)L)xAJh7-z(dl2WTRVc6nFXF*g&(w z)g13QIYs}A2oXfHk`dt^!9A?h)%Gb_!=XgZekWFE{r82k5hHsQ8h+Rd!)frP*ved> z=8KY{nyR1y8n5{aqAI0Cs7bs_`1@f*UAd;vMj6yT>E3)X_Br5~B+JP|^uE-~%F1cVYBv>S@rGjeHn9?8q{xJycS6o@agh5GI9EqPFwgbmgSinihS z2RVZnVHMB4!L-yd+fe5RL?^m#kqi>LE08!8uk<>EaFARqXtvC1&SgzhcOb14T~2hS z-{pldCH}yjfg?;%lewcXsOkZWIB_6haNrO`eEDCe*KDhEVjGNgGEIb88+lENiC@}H z#Y8Ie{bQ99l?*#Vsi+u{#t{wXVTG@<`MVcQl~kGw-eceF7SGpqJ$4$MQJ`nTmC<}9 zu12QcGheP}tkXE3%=TQR&*h?J^9SmxNGY%Cx zG0hseTV7IpL9**w&febdl7i^+i4E9gR<~NQty}HM4c~09|EHqfzm0$<1 zJWR^=gsOzA&ED;U-B2p6#$U3#ZrKM*30V{9n&lNt{5aDd_W~=6y)Pd1l4OQr z+De$!j$rR{5G!5}Bxb)PCtT#1copHZC$}Hp>VfX=02ia5Lj%7l-__)>G5hNAY-^JV z;TFoZE z%&J|b0k5E;UfTYp#0yafdmddKySMW{v_V;-jnDmD~qr#9<1 zaYJ{2CR)crY0;5we*s|Bm|%+3t>;r4+}aQX{2F0;_@?<_zv34Keg?Y82?zERPv_-$=SpYQ;X_f>Zcps7Sd*s zPgC2w926Uf7d;$!$%9>-K?exdw69)eMnw%GhI&=>+8wU<*H6#pNL?wXyqjPV(h}tM|^> z=?Ec^m=9bExe~j|^W;P#b329cpNmN0?%Ugo+-*!TR+0MV=EOn>7x?~t48Q@Ka3Pml z35rJrV?SXt^YM&N#4E}qGT9RDtd)4Q^z7M9!JeGjxO$B>9r6GiaM3P*LL=(hr1-n( zw@EJAXAML);8TbxF{Ew8pf-z^Z@Lp~Rd3sQssnK3bFJzOa)f35Ga~w#aSgom7saef zgHJfw@2@q0gP7By+Cil0$GUQy65dcy8N)FIhL+8A+?+~wRQ2%Ks?xinE5En%UkG^v)Dj rEzS2AsG+`y2>tCwgz2n7-H8?m=Pht%KNA!TqF?&DhPTVLpZxQGxvx-T delta 7121 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 rG5i%-A$$lo&wqIEiQX?gIs*deO>;.ke-toolbar-icon",toolbar).append('表情'); - params.toolbar_container.append(toolbar); - } - }).loadPlugin('paste'); - return editor; - } - - function nh_check_field(params){ - var result=true; - if(params.content!=undefined){ - if(params.content.isEmpty()){ - result=false; - } - if(params.content.html()!=params.textarea.html() || params.issubmit==true){ - params.textarea.html(params.content.html()); - params.content.sync(); - if(params.content.isEmpty()){ - params.contentmsg.html('内容不能为空'); - params.contentmsg.css({color:'#ff0000'}); - }else{ - params.contentmsg.html('填写正确'); - params.contentmsg.css({color:'#008000'}); - } - params.contentmsg.show(); - } - } - return result; - } - function init_form(params){ - params.form.submit(function(){ - var flag = false; - if(params.form.attr('data-remote') != undefined ){ - flag = true - } - var is_checked = nh_check_field({ - issubmit:true, - content:params.editor, - contentmsg:params.contentmsg, - textarea:params.textarea - }); - if(is_checked){ - if(flag){ - return true; - }else{ - $(this)[0].submit(); - return false; - } - } - return false; - }); - } - function nh_reset_form(params){ - params.form[0].reset(); - params.textarea.empty(); - if(params.editor != undefined){ - params.editor.html(params.textarea.html()); - } - params.contentmsg.hide(); - } - KindEditor.ready(function(K){ $("a[nhname='reply_btn']").live('click',function(){ var params = {}; @@ -167,110 +98,4 @@ $(function(){ }); }); }); -function init_list_more_div(params){ - var p=params; - p.exbtn.click(function(){ - var isclose = p.container.data('isclose'); - var hasmore = p.container.data('hasmore'); - if(isclose == '1'){ - $("div[nhname='rec']",p.container).show(); - p.container.data('isclose','0'); - change_status_4_list_more_div(params); - return; - } - if(hasmore == '0'){ - change_status_4_list_more_div(params,'get'); - return; - } - var url = p.container.data('url'); - if($("div[nhname='rec']",p.container).length > 0){ - var lastid = $("div[nhname='rec']",p.container).filter(':last').data('id'); - url += "?lastid="+lastid; - var lasttime = $("div[nhname='rec']",p.container).filter(':last').data('time'); - if(lasttime != undefined){ - url += "&lasttime="+lasttime; - } - } - $.ajax( {url:url,dataType:'text',success:function(data){ - var html = $("
"+data+"
"); - var lens = $("div[nhname='rec']",html).length; - if(lens < p.size){ - p.container.data('hasmore','0'); - } - if(lens>0){ - var currpage = parseInt(p.container.data('currpage'))+1; - p.container.data('currpage',currpage); - p.container.append(html.html()) - } - change_status_4_list_more_div(params,'get'); - p.div.show(); - }} ); - }); - p.clbtn.click(function(){ - var i=0; - $("div[nhname='rec']",p.container).each(function(){ - i++; - if(i> p.size){ - $(this).hide(); - } - }); - p.container.data('isclose','1'); - change_status_4_list_more_div(params); - }); - p.exbtn.click(); -} -function change_status_4_list_more_div(params,opt){ - var p=params; - if($("div[nhname='rec']",p.container).length == 0 && opt != 'get'){ - p.exbtn.click(); - return; - } - var show_lens = $("div[nhname='rec']",p.container).length - $("div[nhname='rec']",p.container).filter(':hidden').length; - if( show_lens > p.size ){ - p.clbtn.show(); - }else{ - p.clbtn.hide(); - } - if($("div[nhname='rec']",p.container).length == 0){ - p.exbtn.html(p.nodatamsg); - }else if( p.container.data('hasmore') == '1' || p.container.data('isclose')=='1' ){ - p.exbtn.html('点击展开更多'); - }else{ - p.exbtn.html('没有更多了'); - } -} -function init_list_more_div_params(div){ - var params = {}; - params.div = div; - params.container = $("div[nhname='container']",div); - params.exbtn = $("a[nhname='expand']",div); - params.clbtn = $("a[nhname='close']",div); - params.size = params.container.data('pagesize'); - params.nodatamsg = params.container.data('nodatamsg'); - if( params.size == undefined ){ - params.size = 13; - } - return params; -} -$(function(){ - $("div[nhname='list_more_div']").each(function(){ - var params = init_list_more_div_params($(this)); - init_list_more_div(params) - }); -}); - -$(function(){ - $(".newsType").mouseover(function(){ - $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"}); - }); - $(".newsType").mouseout(function(){ - $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"}); - }); - $(".resourcesSelected").mouseover(function(){ - $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"}); - }); - $(".resourcesSelected").mouseout(function(){ - $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"}); - }); -}); //个人动态 end \ No newline at end of file From de1708b8dfbac7eeaa9342ff222635cb58558958 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Sep 2015 16:41:49 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=96=87=E5=AD=97=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E4=BA=8E=E2=80=9C=E8=AF=B7=E9=80=89=E6=8B=A9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8D=B3=E5=BC=B9=E5=87=BA=E4=BE=9B=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=90=8E=E8=BF=98=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 2 +- app/views/users/_user_homework_form.html.erb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 3f3cacae3..b9f762f69 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -546,7 +546,7 @@ module UsersHelper type = [] user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course| option = [] - option << course.name + option << course.name+"（"+course.time.to_s+course.term+"）" option << course.id type << option end diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 7a9e55205..86b8d7af7 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -74,7 +74,11 @@
- + diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index bc314565a..18238bf8f 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -1,8 +1,8 @@