From 1133b35169b67a138f8b049467c0824e996f0e45 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 4 Nov 2015 15:24:24 +0800 Subject: [PATCH 01/62] =?UTF-8?q?=E4=BD=9C=E4=B8=9Atag=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 14 +++++++++---- .../users/_user_homework_detail.html.erb | 20 ++++++++++++------- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 77f7d97dd..be7945cc0 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -13,25 +13,31 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%> -
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 3d841b087..f9743d7c3 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -10,7 +10,7 @@ TO <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
-
<% end %>
- <%= l(:label_end_time)%>：<%= homework_common.end_time%> + <%= l(:label_end_time)%>：<%= homework_common.end_time%> 23:59
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 317a21d02..22560f0aa 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -966,7 +966,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} -.m_w480{max-width: 480px;} +.m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} .ProResultTable{ color:#888888;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 6a296b941..061ad0561 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1073,7 +1073,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} -.m_w480{max-width: 480px;} +.m_w505{max-width: 505px;} .m_w530{max-width: 530px;} .ProResultTable{ color:#888888;} .T_C{ text-align:center;} From 3928b2dcaf2e820acf165ff8047c91dd94d5e1b7 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 4 Nov 2015 15:48:57 +0800 Subject: [PATCH 02/62] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/sidebar_bg.png | Bin 9913 -> 7281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png index 9ceea0f9176902560fa21d8eddd17a372d761edd..e4d12da4dffa4b7d73d9767af38102b57212c1fa 100644 GIT binary patch literal 7281 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 F{{uzF(gXki literal 9913 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 Xn+&$9^GF@=?I574sG(3UXBP55+E<+Q From 35c60c325339bc1e2416a2123beb794a6ae0169e Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 5 Nov 2015 09:37:56 +0800 Subject: [PATCH 03/62] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/index.html.erb | 27 +++++++++++++++---- app/views/users/_course_homework.html.erb | 18 ++++++------- .../users/_user_homework_detail.html.erb | 20 +++++++------- public/stylesheets/courses.css | 5 +++- public/stylesheets/new_user.css | 7 +++-- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 78f11737b..8f1f0033e 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -120,14 +120,31 @@
- + <% if @homework.homework_detail_manual%> - <% if @homework.homework_detail_manual.comment_status == 1%> - 未开启匿评 + <% if @homework.homework_detail_manual.comment_status == 0 %> + 未发布 + <% elsif @homework.homework_detail_manual.comment_status == 1%> + <% if @homework.anonymous_comment == 0%> + 未开启匿评 + <% else %> + 匿评已禁用 + <% end %> + 作品提交中 <% elsif @homework.homework_detail_manual.comment_status == 2%> - 匿评中 + <% if @homework.anonymous_comment == 0%> + 匿评中 + <% else %> + 匿评已禁用 + <% end %> + 教师评阅中 <% elsif @homework.homework_detail_manual.comment_status == 3%> - 匿评已结束 + <% if @homework.anonymous_comment == 0%> + 匿评已结束 + <% else %> + 匿评已禁用 + <% end %> + 教师评阅中 <% end%> <% end%> [ 隐藏作业信息 ] diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index be7945cc0..f442e34e4 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -19,25 +19,25 @@ <% if activity.homework_detail_manual%> <% if activity.homework_detail_manual.comment_status == 1%> <% if activity.anonymous_comment == 0%> - 未开启匿评 + 未开启匿评 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 作品提交中 + 作品提交中 <% elsif activity.homework_detail_manual.comment_status == 2%> <% if activity.anonymous_comment == 0%> - 匿评中 + 匿评中 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% elsif activity.homework_detail_manual.comment_status == 3%> <% if activity.anonymous_comment == 0%> - 匿评已结束 + 匿评已结束 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% end%> <% end%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index f9743d7c3..1947c8ce8 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -16,28 +16,28 @@ <% if homework_common.homework_detail_manual%> <% if homework_common.homework_detail_manual.comment_status == 0 %> - 未发布 + 未发布 <% elsif homework_common.homework_detail_manual.comment_status == 1%> <% if homework_common.anonymous_comment == 0%> - 未开启匿评 + 未开启匿评 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 作品提交中 + 作品提交中 <% elsif homework_common.homework_detail_manual.comment_status == 2%> <% if homework_common.anonymous_comment == 0%> - 匿评中 + 匿评中 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% elsif homework_common.homework_detail_manual.comment_status == 3%> <% if homework_common.anonymous_comment == 0%> - 匿评已结束 + 匿评已结束 <% else %> - 匿评已禁用 + 匿评已禁用 <% end %> - 教师评阅中 + 教师评阅中 <% end%> <% end%> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 22560f0aa..7a3d43469 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -178,7 +178,9 @@ a.f_grey:hover {color:#000000;} /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/ .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} @@ -966,6 +968,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} +.m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w500{max-width: 500px;} .m_w530{max-width: 530px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 061ad0561..0b45685ee 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -293,8 +293,10 @@ a:hover.bgreen_n_btn{background:#08a384;} .more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;} .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.green_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +.grey_homework_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} @@ -1073,6 +1075,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; } .W50{ width:50px;} .W200{ width:200px;} +.m_w460{max-width: 460px;} .m_w505{max-width: 505px;} .m_w530{max-width: 530px;} .ProResultTable{ color:#888888;} From 48cef54b9e3ad59315863f41d03be2e1b5a4f01f Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 5 Nov 2015 10:40:24 +0800 Subject: [PATCH 04/62] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=97=B6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=AD=A6=E7=94=9F=E7=9A=84=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_programing_work_show.html.erb | 32 ++++++++-------- app/views/student_work/_show.html.erb | 38 +++++++++---------- .../student_work/_student_work_list.html.erb | 10 ++++- app/views/student_work/show.js.erb | 4 +- 4 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb index b5ff8f064..dbf7291cb 100644 --- a/app/views/student_work/_programing_work_show.html.erb +++ b/app/views/student_work/_programing_work_show.html.erb @@ -3,21 +3,21 @@
  • 上交时间： - <%=format_time @work.created_at %> + <%=format_time work.created_at %>
    • - <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %> + <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
  • - <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> + <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %>
  • <%= link_to "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
    • <% end%> - <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%> + <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> -
  • +
  • <%= render :partial => 'student_work_praise' %>
    • <% end%> @@ -26,7 +26,7 @@
  • 编程代码：
    - <%= text_format(@work.description) if @work.description%> + <%= text_format(work.description) if work.description%>
    • @@ -37,10 +37,10 @@ 测试结果：
    - <% @work.student_work_tests.each_with_index do |test, index| %> + <% work.student_work_tests.each_with_index do |test, index| %>

    - 第<%= @work.student_work_tests.count - index%>次测试 + 第<%= work.student_work_tests.count - index%>次测试

    <%= test.created_at.to_s(:db) %> @@ -79,24 +79,24 @@ <% end%>
  • - <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%> + <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%> -
    - <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%> +
    + <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
    <% end%>
-
- <%@student_work_scores.each do |score|%> -
- <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%> +
+ <%student_work_scores.each do |student_score|%> +
+ <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
<% end%>
- 收起 + 收起
\ No newline at end of file diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index cfc4129a8..1f3d44258 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -3,21 +3,21 @@
  • 上交时间： - <%=format_time @work.created_at %> + <%=format_time work.created_at %>
    • - <% if @work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %> + <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
  • - <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %> + <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del") %>
  • - <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%> + <%= link_to "",edit_student_work_path(work),:class => "pic_edit"%>
    • <% end%> - <% if @homework.homework_detail_manual.comment_status == 3 && @work.user != User.current%> + <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%> -
  • +
  • <%= render :partial => 'student_work_praise' %>
    • <% end%> @@ -25,50 +25,50 @@ - <% if @work.project%> + <% if work.project%>
  • 关联项目： - <%= link_to( @work.project.name, project_path(@work.project.id), :class => "linkBlue" )%> + <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
    • <% end%>
  • 内容：
    - <%= text_format(@work.description) if @work.description%> + <%= text_format(work.description) if work.description%>
  • 附件： - <% if @work.attachments.empty?%> + <% if work.attachments.empty?%> 尚未提交附件 <% else%>
    - <%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments, :status => @homework.homework_detail_manual.comment_status} %> + <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments, :status => @homework.homework_detail_manual.comment_status} %>
    <% end%>
  • - <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%> + <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current )%> -
    - <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%> +
    + <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
    <% end%>
-
- <%@student_work_scores.each do |score|%> -
- <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%> +
+ <%student_work_scores.each do |student_score|%> +
+ <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
<% end%>
- 收起 + 收起
\ No newline at end of file diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index e23fcceda..c8248d86a 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -35,6 +35,14 @@ <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%> <% end%>
-
+
+ <% if student_work.user == User.current %> + <% if @homework.homework_type == 2%> + <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% else %> + <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %> + <% end %> + <% end %> +
<% end%> \ No newline at end of file diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb index e6b99c146..d61c4b9a1 100644 --- a/app/views/student_work/show.js.erb +++ b/app/views/student_work/show.js.erb @@ -3,9 +3,9 @@ if($("#about_hwork_<%= @work.id%>").children().length > 0){ } else{ <% if @homework.homework_type == 2%> - $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>"); + $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>"); <% else%> - $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>"); + $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>"); <% end%> $('#score_<%= @work.id%>').peSlider({range: 'min'}); } \ No newline at end of file From 59e95b08d7b462120c1b9e91b0d9cd3de85245e1 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 5 Nov 2015 13:49:27 +0800 Subject: [PATCH 05/62] feed_back --- config/locales/commons/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 3b5e9790e..ee361cc2f 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -354,7 +354,7 @@ zh: # 意见反馈 # label_feedback: 意见反馈 - label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!" + label_feedback_tips: "请在此提问平台问题，或直接加入师姐答疑群，谢谢！" label_technical_support: "QQ 在线支持：" label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" label_feedback_value: "该帖来自用户反馈:)" From 223b17d8fe7ae109e54484ab6498210bd090451c Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 5 Nov 2015 14:45:22 +0800 Subject: [PATCH 06/62] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E7=B3=BB=E7=BB=9F=E8=AF=84=E5=88=86?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E3=80=81=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_un_title.html.erb | 2 +- .../student_work/_student_work_list.html.erb | 2 +- db/schema.rb | 18 ++++++++++++++---- public/stylesheets/courses.css | 9 +++++---- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index 26c69d225..4ed0a538a 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -1,6 +1,6 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -314,7 +314,7 @@ <% end %>

    - 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！ + 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！

    <% end %> @@ -397,7 +397,7 @@
    • 课程名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)
    • 作业标题：<%= ma.course_message.homework_common.name %>
      • -
    • 提交截止：<%= ma.course_message.homework_common.end_time %> 24:00
      • +
    • 提交截止：<%= ma.course_message.homework_common.end_time %> 23:59
    • 提交时间：<%= format_time(ma.course_message.created_at) %>
    • 迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分
    From 88dc0070119d7a97424d13feb7aaec5708545e00 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 Nov 2015 17:45:06 +0800 Subject: [PATCH 33/62] =?UTF-8?q?=E6=9F=90=E4=BA=9B=E8=BF=9F=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=9C?= =?UTF-8?q?[=E8=BF=9F=E4=BA=A4]=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_work.html.erb | 2 +- app/views/student_work/_evaluation_work.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 6996ed6a6..02e73aaab 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -28,7 +28,7 @@
  • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %> <% end %> diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 4a6a4eb68..78114d62b 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -48,7 +48,7 @@
  • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %>
    • From 48547f3e113f844cf610d407cf936b089a8cdb8c Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 6 Nov 2015 17:47:56 +0800 Subject: [PATCH 34/62] =?UTF-8?q?1/=E6=B7=BB=E5=8A=A0members=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=202=E3=80=81=E8=BF=87=E6=BB=A4=E6=8E=89=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=BA=93identifier=E9=87=8D=E5=A4=8D=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=BA=93=203=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0puts=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitlab_to_git.rake | 11 +++++++++++ lib/tasks/sync_sigle_rep.rake | 26 +++++++++++++++++--------- lib/trustie/gitlab/sync.rb | 20 ++++++++++++++++++++ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/lib/tasks/gitlab_to_git.rake b/lib/tasks/gitlab_to_git.rake index 8b7f7279e..c7b97e00d 100644 --- a/lib/tasks/gitlab_to_git.rake +++ b/lib/tasks/gitlab_to_git.rake @@ -8,4 +8,15 @@ namespace :rep_fault do rep.save end + desc "forge and ossean's members" + task :sync_members => :environment do + projects = [] + projects << Project.where("id =? ",2) + projects << Project.where("id =? ",299) + puts projects + s = Trustie::Gitlab::Sync.new + projects.each do |project| + s.only_members(project.first) + end + end end \ No newline at end of file diff --git a/lib/tasks/sync_sigle_rep.rake b/lib/tasks/sync_sigle_rep.rake index b99221c83..591dcce84 100644 --- a/lib/tasks/sync_sigle_rep.rake +++ b/lib/tasks/sync_sigle_rep.rake @@ -3,19 +3,27 @@ namespace :sync_rep do desc "sync some projects which just have sigle repository" task :sigle => :environment do - projects = Project.all + projects = Project.where("user_id !=?",12) projects.each do |project| # 针对类型为Git并且只有一个版本库的项目 if project.repositories && project.repositories.count == 1 && project.repositories.first.type == "Repository::Git" rep = project.repositories.first - s = Trustie::Gitlab::Sync.new - s.sync_project(project, path: rep.identifier, import_url: rep.url) - rep.type = 'Repository::Gitlab' - rep.save - puts "*************************************" - puts project.id - puts rep.id - puts rep.identifier + count = Repository.find_by_sql("SELECT * FROM `repositories` where identifier = '#{rep.identifier}'").count + puts count + unless count > 1 + rep.identifier + puts "################################" + puts project.id + puts rep.id + s = Trustie::Gitlab::Sync.new + s.sync_project(project, path: rep.identifier, import_url: rep.url) + rep.type = 'Repository::Gitlab' + rep.save + puts "*************************************" + puts project.id + puts rep.id + puts rep.identifier + end end end end diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb index 8c84984ee..a303b22fb 100644 --- a/lib/trustie/gitlab/sync.rb +++ b/lib/trustie/gitlab/sync.rb @@ -69,6 +69,11 @@ module Trustie # import url http://xianbo_trustie2:1234@repository.trustie.net/xianbo/trustie2.git # can use password + puts "@@@@@@@@@@@@@@@@@@@@@@@" + puts path + puts project.description + puts gid + puts import_url gproject = self.g.create_project(path, path: path, description: project.description, @@ -81,6 +86,7 @@ module Trustie user_id: gid, import_url: import_url ) + puts "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" project.gpid = gproject.id project.save! puts "Successfully created #{project.name}" @@ -100,6 +106,20 @@ module Trustie end end + def only_members(project) + project.members.each do |m| + begin + gid = m.user.gid + unless gid + gid = sync_user(m.user).id + end + self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER) + rescue => e + puts e + end + end + end + def remove_project end end From 4e62dd121978fea218a862eb75f890aab2314ed9 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Sat, 7 Nov 2015 19:58:19 +0800 Subject: [PATCH 35/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/new_user_commit_homework.html.erb | 2 +- app/views/users/user_commit_homework.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index c3a736058..0e2648509 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -112,7 +112,7 @@
    <% if test.status.to_i == -2 %> -
    <%= test.results.first %>
    + 
    <%= test.results.first %>
    <% else %>
      diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index a7416cf40..6f14ce05d 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -86,7 +86,7 @@
    <% if test.status.to_i == -2 %> -
    <%= test.results.first %>
    + 
    <%= test.results.first %>
    <% else %>
      From f229d18776be27caed0cdda006bd0797fce718c6 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 10:03:06 +0800 Subject: [PATCH 36/62] =?UTF-8?q?=E5=9C=A8=E8=AF=BE=E7=A8=8B=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 6 +++ app/views/files/_upload_course_files.erb | 2 +- app/views/files/_upload_show_project.html.erb | 1 + app/views/files/create.js.erb | 45 +++++++++++-------- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 1cd5b0f15..dd8dc84c4 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -332,6 +332,9 @@ class FilesController < ApplicationController #modify by nwb if @project @addTag=false + if params[:in_project_toolbar] + @in_project_toolbar = params[:in_project_toolbar] + end container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) attachments = Attachment.attach_filesex(container, params[:attachments], params[:attachment_type]) render_attachment_warning_if_needed(container) @@ -363,6 +366,9 @@ class FilesController < ApplicationController end elsif @course @addTag=false + if params[:in_course_toolbar] + @in_course_toolbar = params[:in_course_toolbar] + end attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type]) if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index 62d5c68e4..3578d4eb9 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -7,7 +7,7 @@ <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> - +
      课件 |  diff --git a/app/views/files/_upload_show_project.html.erb b/app/views/files/_upload_show_project.html.erb index 8223f071e..53c57b3c6 100644 --- a/app/views/files/_upload_show_project.html.erb +++ b/app/views/files/_upload_show_project.html.erb @@ -8,6 +8,7 @@ <%= form_tag(project_files_path(project), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + <%= render :partial => 'files/attachement_list',:locals => {:project => project} %>
      <%= l(:button_cancel)%> diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb index f24d60811..9de7aa042 100644 --- a/app/views/files/create.js.erb +++ b/app/views/files/create.js.erb @@ -23,26 +23,35 @@ $("#upload_file_count").text("未上传文件"); $('#upload_file_div').slideToggle('slow'); <% if @project %> hideModal(); - $("#resource_list").html('<%= j(render partial: "project_file_new" ,locals: {project: @project}) %>'); - $("#project_files_count_info").html("<%= @all_attachments.count%>"); - $("#project_files_count_nav").html("(<%= @all_attachments.count%>)") -// 添加文件上传成功提示 - <% unless params[:attachments].nil? %> - var div = $('
      文件上传成功！
      '); - $("#course_list").prepend(div); - setTimeout( function(){div.remove();},3000) + <%if @in_project_toolbar%> + window.location.href = '<%= project_files_path(@project)%>' + <%else%> + + $("#resource_list").html('<%= j(render partial: "project_file_new" ,locals: {project: @project}) %>'); + $("#project_files_count_info").html("<%= @all_attachments.count%>"); + $("#project_files_count_nav").html("(<%= @all_attachments.count%>)") + // 添加文件上传成功提示 + <% unless params[:attachments].nil? %> + var div = $('
      文件上传成功！
      '); + $("#course_list").prepend(div); + setTimeout( function(){div.remove();},3000) + <% end %> <% end %> <%elsif @course%> - closeModal(); - $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>'); - $("#courses_files_count_info").html("<%= @all_attachments.count%>"); - $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)") - // 添加文件上传成功提示, - <% unless params[:attachments].nil? %> - var div = $('
      文件上传成功！
      '); - $("#course_list").prepend(div); - setTimeout( function(){div.remove();},3000) - <% end %> + hideModal(); + <%if @in_course_toolbar %> + window.location.href='<%= course_files_path(@course)%>' + <%else%> + $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>'); + $("#courses_files_count_info").html("<%= @all_attachments.count%>"); + $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)") + // 添加文件上传成功提示, + <% unless params[:attachments].nil? %> + var div = $('
      文件上传成功！
      '); + $("#course_list").prepend(div); + setTimeout( function(){div.remove();},3000) + <% end %> + <%end%> <% end %> <% end %> $(document).ready(img_thumbnails); From 8e66bb8fe166c4f9ead3c5be7b4f93c221564018 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 10:07:12 +0800 Subject: [PATCH 37/62] =?UTF-8?q?=E5=9C=A8=E8=AF=BE=E7=A8=8B=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=90=8E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index b7e1bfa1c..11662fc7b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -528,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :primary_key => "Num", :force => true do |t| - t.string "Defect", :limit => 50 - t.string "Category", :limit => 50 - t.string "File" - t.string "Method" - t.string "Module", :limit => 20 - t.string "Variable", :limit => 50 - t.integer "StartLine" - t.integer "IPLine" - t.string "IPLineCode", :limit => 200 - t.string "Judge", :limit => 15 - t.integer "Review", :limit => 1 + create_table "dts", :force => true do |t| + t.string "IPLineCode" t.string "Description" - t.text "PreConditions", :limit => 2147483647 - t.text "TraceInfo", :limit => 2147483647 - t.text "Code", :limit => 2147483647 + t.string "Num" + t.string "Variable" + t.string "TraceInfo" + t.string "Method" + t.string "File" + t.string "IPLine" + t.string "Review" + t.string "Category" + t.string "Defect" + t.string "PreConditions" + t.string "StartLine" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "enabled_modules", :force => true do |t| @@ -817,6 +814,16 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_details_copy", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" From 4b272b6b9c622dbc009da3de584847ae3a1cc083 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:14:24 +0800 Subject: [PATCH 38/62] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA40000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index 33b24db50..f6449a550 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 5000 + validates_length_of :content, maximum: 40000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 25a4fae46..3d239cff1 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,10 +76,10 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } -// if(memo_content.html().trim().length > 5000){ -// $("#error").html("内容 过长（最长为 5000 个字符）").show(); -// return false; -// } + if(memo_content.html().trim().length > 40000){ + $("#error").html("内容 过长（最长为 40000 个字符）").show(); + return false; + } return true; } From 1edd87f9e020cc69efd3f41d0689fd6baf76ba06 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:15:01 +0800 Subject: [PATCH 39/62] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA20000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index f6449a550..94ff5cee2 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 40000 + validates_length_of :content, maximum: 20000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 3d239cff1..4bbf81668 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,8 +76,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().trim().length > 40000){ - $("#error").html("内容 过长（最长为 40000 个字符）").show(); + if(memo_content.html().trim().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); return false; } return true; From 463262e83819c9039f3adeac4765773a4ffdc777 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 11:16:19 +0800 Subject: [PATCH 40/62] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E6=97=B6=E7=AB=8B=E9=A9=AC=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 12 ++++++++++++ app/views/student_work/edit.html.erb | 13 +++++++++++-- app/views/student_work/new.html.erb | 13 +++++++++++-- app/views/student_work/update.js.erb | 16 ++++++++++++++++ public/javascripts/course.js | 10 ++++++++-- public/javascripts/new_user.js | 10 ++++++++-- 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 app/views/student_work/update.js.erb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index c36877092..9ad46cd69 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -221,24 +221,36 @@ class StudentWorkController < ApplicationController def update if params[:student_work] + @submit_result = true @work.name = params[:student_work][:name] @work.description = params[:student_work][:description] @work.project_id = params[:student_work][:project] @work.save_attachments(params[:attachments]) render_attachment_warning_if_needed(@work) if @work.save +=begin respond_to do |format| format.html { flash[:notice] = l(:notice_successful_edit) redirect_to student_work_index_url(:homework => @homework.id) } +=end + @student_work = @work + respond_to do |format| + format.js end return end end +=begin respond_to do |format| format.html{redirect_to edit_student_work_url(@work)} end +=end + @submit_result = false + respond_to do |format| + format.js + end end def show diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index 25a65f039..517a238b0 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -26,7 +26,7 @@
      - <%= labelled_form_for @work,:html => { :multipart => true } do |f|%> + <%= labelled_form_for @work,:html => { :multipart => true },:remote=>true do |f|%>
      提示：作品名称和描述中不要出现真实的姓名信息
      @@ -52,7 +52,7 @@
      - 确定 + 确定 或 <%= link_to "取消", student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
      @@ -60,3 +60,12 @@ <% end%>
    + \ No newline at end of file diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index db83fd432..fdf1e31a3 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -111,11 +111,20 @@
    - 确定 + 确定 或 <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
    <% end%>
    -
    \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb new file mode 100644 index 000000000..79733db31 --- /dev/null +++ b/app/views/student_work/update.js.erb @@ -0,0 +1,16 @@ +<% if @submit_result%> +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>'); +showModal('ajax-modal', '500px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("anonymos"); +<% else %> +window.location.href = '<%= edit_student_work_url(@work)%>'; +<% end %> + +function clickCanel() { + hideModal('#popbox02'); + window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>'; +} \ No newline at end of file diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 0c7f4156f..84e087c49 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -954,13 +954,19 @@ function regexStudentWorkDescription() function new_student_work() { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#new_student_work").submit();} + { + $("#new_student_work").submit(); + $("#ajax-indicator").hide(); + } } function edit_student_work(id) { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#edit_student_work_" + id).submit();} + { + $("#edit_student_work_" + id).submit(); + $("#ajax-indicator").hide(); + } } // diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index ca7b28ee7..a0647b592 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -250,13 +250,19 @@ function regex_evaluation_num(){ function new_student_work() { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#new_student_work").submit();} + { + $("#new_student_work").submit(); + $("#ajax-indicator").hide(); + } } function edit_student_work(id) { if(regexStudentWorkName()&®exStudentWorkDescription()) - {$("#edit_student_work_" + id).submit();} + { + $("#edit_student_work_" + id).submit(); + $("#ajax-indicator").hide(); + } } //验证作品名称 From 2d321d2dbc2d11b9a79fe19c147400c424c849d4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:24:20 +0800 Subject: [PATCH 41/62] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA20000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=B6=85=E8=BF=87=E4=B8=A4=E4=B8=87?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 4bbf81668..8e5a6b8e0 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,7 +76,7 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().trim().length > 20000){ + if(memo_content.html().length > 20000){ $("#error").html("内容 过长（最长为 20000 个字符）").show(); return false; } From 2e092b0d04078f0a1c09f0dfcaf4d9c8d30fc71d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 11:27:05 +0800 Subject: [PATCH 42/62] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A9=E5=A4=A7=E4=B8=BA30000=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=B6=85=E8=BF=87=E4=B8=A4=E4=B8=87?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/memo.rb | 2 +- app/views/forums/show.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/memo.rb b/app/models/memo.rb index 94ff5cee2..7c4fbdcf1 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -9,7 +9,7 @@ class Memo < ActiveRecord::Base # 若是主题帖，则内容可以是空 #validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? } validates_length_of :subject, maximum: 50 - validates_length_of :content, maximum: 20000 + validates_length_of :content, maximum: 30000 validate :cannot_reply_to_locked_topic, :on => :create acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC" diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 8e5a6b8e0..523ab1300 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -76,8 +76,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().length > 20000){ - $("#error").html("内容 过长（最长为 20000 个字符）").show(); + if(memo_content.html().length > 30000){ + $("#error").html("内容 过长（最长为 30000 个字符）").show(); return false; } return true; From d461e1be0d95d785c54652a49d5e75215e2cb7c9 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 11:54:33 +0800 Subject: [PATCH 43/62] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E2=80=9C=E6=82=A8?= =?UTF-8?q?=E5=B0=9A=E6=9C=AA=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index d834bc845..64f097114 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -2,10 +2,10 @@ 作品 - （<%= @student_work_count%>） + (已有<%= @student_work_count%>人提交) <% if !@is_teacher && @stundet_works.empty?%> - 未提交 + 您尚未提交作品 <% end %> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%> From 157ba12513784cb6f9526c8cb2df64d4dd67e203 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:04:51 +0800 Subject: [PATCH 44/62] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E8=99=9A?= =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resources_list.html.erb | 2 ++ public/stylesheets/new_user.css | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index 34d609487..6f47e3535 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -21,5 +21,7 @@
  • <%= format_date(attach.created_on) %>
  • <%= attach.id %>
    • +
      + <% end %> <% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 7263c2f58..a4b8da25f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -401,7 +401,8 @@ a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: a.resourcesBlack:hover {font-size:12px; color:#000000;} .resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;} .resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;} -.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} +.resourcesList {width:710px; height:39px; background-color:#ffffff; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;} /*border-bottom:1px dashed #eaeaea;*/ +.resourcesListDashLine {width:710px;border-bottom:1px dashed #eaeaea !important; margin-left:auto; margin-right:auto; padding-bottom: 2px} /*border-bottom:1px dashed #eaeaea;*/ .resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;} .resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;} .resourcesSelectSend {float:right;} From 0c202a47bb5436b3249996a1efb35efce4b1ace2 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:35:12 +0800 Subject: [PATCH 45/62] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 2d4754a0a..54c9541f2 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -164,7 +164,7 @@
      <%= form_for :blog_comment, :url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id}, :html => {:multipart => true, :id => 'message_form'} do |f| %> <%= render :partial => 'blog_comments/reply_form', :locals => {:f => f,:user=>@user,:article=>@article} %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'canel_message_replay();', :class => " grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'message_content_editor.html("");', :class => " grey_btn fr c_white mt10 mr5" %> <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-right: 5px;" %> <% end %>
      From 0e42554ef9b706fbabbb8fae68543f2886327cf9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 14:58:01 +0800 Subject: [PATCH 46/62] =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=92=8C=20=E7=9B=B4=E6=8E=A5=E4=B8=8A=E4=BC=A0=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=9C=A8=E5=90=8C=E4=B8=80=E5=88=97=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/import_resources_to_homework.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/import_resources_to_homework.js.erb b/app/views/users/import_resources_to_homework.js.erb index c929f48e5..804b4ec44 100644 --- a/app/views/users/import_resources_to_homework.js.erb +++ b/app/views/users/import_resources_to_homework.js.erb @@ -2,7 +2,7 @@ <% @attachments.each do |attachment| %> $("#attachments_fields").append( ''+ - '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+ + '<%= text_field_tag("attachments[p#{attachment.id}][filename]", attachment.filename, :class => "upload_filename link_file", :readonly=>"readonly")%>'+ '<%= text_field_tag("attachments[p#{attachment.id}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+ '<%= l(:field_is_public)%>:'+ '<%= check_box_tag("attachments[p#{attachment.id}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+ From dc7a90cab5280ee9c17debb3cb531a44397648ee Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 Nov 2015 15:07:33 +0800 Subject: [PATCH 47/62] =?UTF-8?q?=E5=8A=A9=E6=95=99=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_add_score.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index 961f351de..0258b3b83 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -16,7 +16,7 @@ <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
      <%end%> - 提交 + 提交
      <% end%> \ No newline at end of file From 20b49385de29a421d0ea8b6ce7cd0d6b238c7933 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:36:32 +0800 Subject: [PATCH 48/62] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 1 + config/application.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 41c7c1eee..eb15fa717 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,6 +66,7 @@
    • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • +
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M:%S').to_s %>
    • 提交截止：<%= ma.course_message.end_time %>  23:59
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
      • diff --git a/config/application.rb b/config/application.rb index 90cc299c6..6e4a2983a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -41,7 +41,7 @@ module RedmineApp config.active_record.store_full_sti_class = true config.active_record.default_timezone = :local - + config.time_zone = 'Beijing' # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' From 7bd9c5b65cf0f1b05f34d1c1913cd52ee6ba0dad Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:55:55 +0800 Subject: [PATCH 49/62] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E4=BD=9C=E4=B8=9A=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index eb15fa717..384a91e54 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,10 +66,10 @@
    • 课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
    • 作业标题：<%= ma.course_message.name %>
      • -
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M:%S').to_s %>
      • -
    • 提交截止：<%= ma.course_message.end_time %>  23:59
      • -
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  23:59
      • -
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  23:59
      • +
    • 发布时间：<%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %>
      • +
    • 提交截止：<%= ma.course_message.end_time %> 23:59
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %> 23:59
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %> 23:59
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • @@ -382,7 +382,7 @@
    • <%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %>
    • <%=link_to ma.course_message.homework_common.user.show_name, user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher" %> - ">发布的作业： + ">老师发布的作业：
    • <%= link_to "作业题目：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id), From 3c93103bc75755f97c62806f6a9f95cf939476ff Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 9 Nov 2015 15:59:24 +0800 Subject: [PATCH 50/62] =?UTF-8?q?=E8=BF=9F=E4=BA=A4=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E8=80=81=E5=B8=88=E5=90=8D=E7=A7=B0=E8=A6=81=E7=BB=99?= =?UTF-8?q?=E7=A7=B0=E5=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 384a91e54..da649663d 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -381,8 +381,8 @@ diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 4a6a4eb68..253a6418a 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -1,62 +1,63 @@ - -
        - <% is_my_work = student_work.user == User.current%> -
      • -
          - <% if is_my_work%> -
        • - <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> -
          • -
        • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
          - <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> -
          -
          • -
        • -
            -
          • - <%= student_work.user.show_name%> -
            • -
          • - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
            • -
          -
          • - <% else%> -
        • - <%= image_tag(url_to_avatar(""),width:"40", height: "40") %> -
          • -
        • -
          - <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> -
          -
          • -
        • -
            -
          • - 匿名 -
            • -
          • - -- -
            • -
          -
          • - <% end%> - -
        -
        • -
      • - <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> - [迟交] - <% end %> -
        • - - - <% my_score = student_work_score(student_work,User.current) %> -
      • - <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%> -
        • -
      - + +
        + <% is_my_work = student_work.user == User.current%> +
      • +
          + <% if is_my_work%> +
        • + <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> +
          • +
        • + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
          + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> +
          +
          • +
        • +
            +
          • + <%= student_work.user.show_name%> +
            • +
          • + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> +
            • +
          +
          • + <% else%> +
        • + <%= image_tag(url_to_avatar(""),width:"40", height: "40") %> +
          • +
        • +
          + <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%> +
          +
          • +
        • +
            +
          • + 匿名 +
            • +
          • + -- +
            • +
          +
          • + <% end%> + +
        +
        • +
      • + <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> + [迟交] + <% end %> +
        • + + + <% my_score = student_work_score(student_work,User.current) %> +
      • + <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%> +
        • +
      • 点击查看详情
        • +
      + diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1cff7e07a..97af45fa2 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -43,10 +43,13 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .pingBackTit{ float:left; width:573px; margin-left:10px; } .hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;} .hworkH30 {height:30px !important; line-height:30px !important;} -.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle;} +.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle; position: relative;} .hworkListRow:hover {background-color:#f6f6f7;} .hworkUl li{ float:left;} .hworkListRow li{ float:left;} +.hworkTip{position:absolute; padding:3px 5px; border:1px solid #eaeaea; display:block; right:-108px; top:20px; background-color:#ffffff; line-height:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} +.hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} +.hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;} .hworkList80 {width:80px; text-align:center;} .hworkList50 {width:50px; text-align:center;} From 4adc6deabf8f0dbddceb0b2ff3683087589ea275 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 14:18:39 +0800 Subject: [PATCH 53/62] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=8F=90=E9=86=92=E7=94=A8=E6=88=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_term_select.html.erb | 41 +++++++++++++++++++++++++ app/views/courses/settings.html.erb | 19 ++++++++++-- public/stylesheets/courses.css | 7 +++++ 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 app/views/courses/_term_select.html.erb diff --git a/app/views/courses/_term_select.html.erb b/app/views/courses/_term_select.html.erb new file mode 100644 index 000000000..e295e7c94 --- /dev/null +++ b/app/views/courses/_term_select.html.erb @@ -0,0 +1,41 @@ +
      +
      +

      + 当前课程的学期信息不能修改。如果您希望为本课程新建学期，请根据需要执行以下两种操作之一（目前复制学期正在改进中，将尽快上线）。选择前请参考按钮右侧的说明： +

      +
      +
      + + 新建学期 + + 新建学期将为您创建一个新的课程学期，新学期不包括之前学期的任何内容。 +
      +
      +
      + +
      + 复制学期 + (开发中...) +
      + 复制学期将为您创建一个新的课程学期，新学期将继承本学期的相关资源，具体您稍后可以选择。 +
      +
      +
      + + 如何复制之前学期的资源？ + + 退  出 +
      +
      +
      + + \ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index a462db79d..a90be14ea 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -36,8 +36,8 @@
    • - <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {} %> - <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{} %> + <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"} %> + <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"} %>
    • @@ -92,4 +92,17 @@ -
      \ No newline at end of file +
      + \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 8b5e2fba3..85d2e3334 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -492,6 +492,13 @@ a:hover.tijiao{ background:#0f99a9;} .ni_con_work p{ color:#808181; } a.xls{ margin-left:5px; color:#136b3b;} .grey_c{ color:#808181;} + +.disable_btn { height:46px; display:block; width:90px; color:#fff; background:#d0d2d0; text-align:center; padding-top:4px; margin-right:15px;} +a.term_btn{ height:38px; display:block; width:90px; color:#fff; background:#269ac9; text-align:center; padding-top:12px; margin-right:15px;} +a:hover.term_btn{ background:#297fb8;} +p.c_black{ color:#000000;} +a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3c3; text-align:center; padding-top:4px;} +.lh22{ line-height: 22px;} /* 学生列表*/ .st_list{ width:670px;} .st_search{ } From 8d94f57ec33fd3a37eb47be8f9dc0bebf4aa2361 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 14:33:46 +0800 Subject: [PATCH 54/62] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E8=A7=81=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 ++ public/stylesheets/new_user.css | 2 ++ public/stylesheets/project.css | 2 ++ 3 files changed, 6 insertions(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 8b5e2fba3..da4c03398 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -893,6 +893,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a4b8da25f..2ba5a7374 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1153,6 +1153,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 4594d0c51..6a4254046 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,6 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From dcdffe5d04782f3e8dd4d0ba01fe0685e31e190b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 14:37:16 +0800 Subject: [PATCH 55/62] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E8=A7=81=E4=BA=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 ++ public/stylesheets/new_user.css | 2 ++ public/stylesheets/project.css | 2 ++ 3 files changed, 6 insertions(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2fd06bf69..054dd5ffc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -903,6 +903,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 7263c2f58..2fbf79c30 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1152,6 +1152,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 4594d0c51..6a4254046 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,6 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } +#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} +#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From 4be3b16b60f4d4acfca25b115dab9be49d8eac86 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 Nov 2015 14:51:44 +0800 Subject: [PATCH 56/62] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_work.html.erb | 2 +- app/views/student_work/_evaluation_work.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 0d55cb130..ebe3d4cc6 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -80,6 +80,6 @@ <% end%>
      • -
    • 点击查看详情
      • + diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index aa6009466..81d868a50 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -48,7 +48,7 @@
    • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  - <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> + <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] <% end %>
      • @@ -58,6 +58,6 @@
    • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
      • -
    • 点击查看详情
      • + From 82c377a60aa1988a562073bb088163e378f617f3 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 15:18:13 +0800 Subject: [PATCH 57/62] =?UTF-8?q?=E5=9C=A8=E5=AF=BC=E8=88=AA=E5=A4=84?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/_new_style_attachment_list.html.erb | 82 +++++-------------- app/views/files/_upload_course_files.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- .../_upload_project_files_list.html.erb | 35 ++++++++ .../_upload_project_files_on_navbar.html.erb | 30 +++++++ public/stylesheets/courses.css | 4 +- public/stylesheets/new_user.css | 4 +- public/stylesheets/project.css | 4 +- 8 files changed, 95 insertions(+), 68 deletions(-) create mode 100644 app/views/projects/_upload_project_files_list.html.erb create mode 100644 app/views/projects/_upload_project_files_on_navbar.html.erb diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index 022486413..af679c4d3 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -1,71 +1,33 @@ + <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> - -<% if @course %> - <%= file_field_tag 'attachments[dummy][file]', - :id => '_file', - :class => ie8? ? '':'file_selector', - :multiple => true, - :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");', - :style => ie8? ? '': 'display:none', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description), - :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure), - :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) - } %> -<% else %> - <%= file_field_tag 'attachments[dummy][file]', - :id => '_file', - :class => ie8? ? '':'file_selector', - :multiple => true, - :onchange => 'addInputFiles(this);', - :style => ie8? ? '': 'display:none', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description), - :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure), - :file_count => l(:label_file_count), - :delete_all_files => l(:text_are_you_sure_all) - } %> -<% end %> - + + <%= file_field_tag 'attachments[dummy][file]', + :id => "_file#{container.id}", + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => "addInputFiles_board(this, '#{container.id}');", + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> + - + <%= l(:label_no_file_uploaded)%> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
      - -<% if defined?(container) && container && container.saved_attachments %> - <% container.attachments.each_with_index do |attachment, i| %> - - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> - <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> - <%= l(:field_is_public)%>: - <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> - <%= if attachment.id.nil? - #待补充代码 - else - link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') - end - %> - <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> - - <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> - - <% end %> -<% end %> +
      \ No newline at end of file diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index 3578d4eb9..9c7021383 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -19,7 +19,7 @@
      - <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %> + <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
      <%= l(:button_cancel)%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index e06db1d0f..d2186118d 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -226,7 +226,7 @@ function project_files_upload() { - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_show_project',:locals => {:project => @project}) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); diff --git a/app/views/projects/_upload_project_files_list.html.erb b/app/views/projects/_upload_project_files_list.html.erb new file mode 100644 index 000000000..59da30012 --- /dev/null +++ b/app/views/projects/_upload_project_files_list.html.erb @@ -0,0 +1,35 @@ + +<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> + + <%= file_field_tag 'attachments[dummy][file]', + :id => "_file#{container.id}", + :class => ie8? ? '':'file_selector', + :multiple => true, + :onchange => "addInputFiles_board(this, '#{container.id}');", + :style => ie8? ? '': 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> + + + + + <%= l(:label_no_file_uploaded)%> + +(<%= l(:label_max_size) %>: +<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) +
      + +
      + + +
      +
      \ No newline at end of file diff --git a/app/views/projects/_upload_project_files_on_navbar.html.erb b/app/views/projects/_upload_project_files_on_navbar.html.erb new file mode 100644 index 000000000..591e159f1 --- /dev/null +++ b/app/views/projects/_upload_project_files_on_navbar.html.erb @@ -0,0 +1,30 @@ + +
      +
      +

      <%= l(:label_upload_files)%>

      +
      + <%= error_messages_for 'attachment' %> + + + <%= form_tag(project_files_path(container), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + + + <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %> +
      + <%= l(:button_cancel)%> + <%= l(:button_confirm)%> + <% end %> +
      + +
      + <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> +
      + + \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index da4c03398..342833981 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -893,8 +893,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2ba5a7374..f21a4b1fd 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1153,8 +1153,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 6a4254046..e7a24b151 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,8 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From c20ff6980bd3aba176ec265608b08eb53d778560 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 15:22:10 +0800 Subject: [PATCH 58/62] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D?= =?UTF-8?q?=E8=A7=81=E4=BA=86bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 4 ++-- public/stylesheets/new_user.css | 4 ++-- public/stylesheets/project.css | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 054dd5ffc..48c6a2d88 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -903,8 +903,8 @@ a.work_list_tit{width:580px; display:block; overflow:hidden; font-size:14px; f .c_w{ color:#fff;} .filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .evaluation{position: relative;} .evaluation_submit{position: absolute;right: 0px;bottom: 0px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 2fbf79c30..11ce8e613 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1152,8 +1152,8 @@ img.ui-datepicker-trigger { text-overflow: ellipsis; margin-bottom: 3px; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 6a4254046..e7a24b151 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -369,8 +369,8 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} .reply_btn:hover{ background:#999; color:#fff; } -#attachments_fields .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} -#attachments_fields .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} + .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} + .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;} .upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 370px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;} .attachments_fields input.description {margin-left:4px; width:100px; } .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} From ef74d8d95693e50f4f69444c16c1680f27a5c119 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 10 Nov 2015 15:31:24 +0800 Subject: [PATCH 59/62] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1--?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E4=B8=8D?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/gitlab_to_git.rake | 22 ----------- lib/tasks/sync_gitlab_user.rake | 39 +++++++++++++++++++ lib/trustie/gitlab/helper.rb | 68 ++++++++++++++++----------------- 3 files changed, 73 insertions(+), 56 deletions(-) delete mode 100644 lib/tasks/gitlab_to_git.rake create mode 100644 lib/tasks/sync_gitlab_user.rake diff --git a/lib/tasks/gitlab_to_git.rake b/lib/tasks/gitlab_to_git.rake deleted file mode 100644 index c7b97e00d..000000000 --- a/lib/tasks/gitlab_to_git.rake +++ /dev/null @@ -1,22 +0,0 @@ -#coding=utf-8 - -namespace :rep_fault do - desc "set ossean's type value" - task :rep_update => :environment do - rep = Repository.find(400) - rep.type = "Repository::Git" - rep.save - end - - desc "forge and ossean's members" - task :sync_members => :environment do - projects = [] - projects << Project.where("id =? ",2) - projects << Project.where("id =? ",299) - puts projects - s = Trustie::Gitlab::Sync.new - projects.each do |project| - s.only_members(project.first) - end - end -end \ No newline at end of file diff --git a/lib/tasks/sync_gitlab_user.rake b/lib/tasks/sync_gitlab_user.rake new file mode 100644 index 000000000..c932ca36c --- /dev/null +++ b/lib/tasks/sync_gitlab_user.rake @@ -0,0 +1,39 @@ +#coding=utf-8 + +namespace :gitlab do + desc "sync gitlab's users which lost in last sync" + task :add_gid => :environment do + users = User.find_by_sql("select * from users where gid is null") + s = Trustie::Gitlab::Sync.new + g = Gitlab.client + users.each do |user| + us = g.get("/users?search=#{user.mail}") + puts user.mail + if us.blank? + puts "55555555555555555" + s.sync_user(user) + else + # 解决查询的时候出现多值的情况，比如:123@163.com和g123@163.com + puts "66666666666666666666" + puts user.id + if Array === us + us.each do |u| + if u.email == user.mail + user.gid = u.id + user.save + end + end + end + end + end + end + + task :sync_members => :environment do + projects = Project.all + s = Trustie::Gitlab::Sync.new + projects.each do |project| + puts project.id + s.only_members(project.first) + end + end +end \ No newline at end of file diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb index 57c333875..61c1fbd17 100644 --- a/lib/trustie/gitlab/helper.rb +++ b/lib/trustie/gitlab/helper.rb @@ -3,46 +3,46 @@ module Trustie module Gitlab module Helper - def change_password(uid, en_pwd, salt) - return unless uid - options = {:encrypted_password=>en_pwd, :password_salt=>salt} - self.g.put("/users/ext/#{uid}", :body => options) - # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt) - end + def change_password(uid, en_pwd, salt) + return unless uid + options = {:encrypted_password=>en_pwd, :password_salt=>salt} + self.g.put("/users/ext/#{uid}", :body => options) + # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt) + end - def find_user(user) - us = self.g.get("/users?search=#{user.mail}") - if Array === us - us.each do |u| - return u if u.email == user.mail - end + def find_user(user) + us = self.g.get("/users?search=#{user.mail}") + if Array === us + us.each do |u| + return u if u.email == user.mail end - return nil end + return nil + end - def add_user(user) - u = nil - begin - u = find_user(user) - unless u - u = self.g.create_user(user.mail, - user.hashed_password, - name: user.show_name, - username: user.login, - confirm: "true") - user.gid = u.id - end - change_password(u.id, user.hashed_password, user.salt) - rescue => e - puts e - end - return u + def add_user(user) + u = nil + begin + u = find_user(user) + unless u + u = self.g.create_user(user.mail, + user.hashed_password, + name: user.show_name, + username: user.login, + confirm: "true") + user.gid = u.id + end + change_password(u.id, user.hashed_password, user.salt) + rescue => e + puts e end + return u + end - def del_user(user) - return unless user.gid - self.g.delete_user(user.gid) - end + def del_user(user) + return unless user.gid + self.g.delete_user(user.gid) + end end end From 463b6e91f5e5ebbf38ab0911fac13989eddb1685 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 16:03:06 +0800 Subject: [PATCH 60/62] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index fadf5e465..b316aa406 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -128,6 +128,11 @@ }); $mail.blur(function (event) { + if (/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){ + $('#mail_req').html( '邮件格式不对').show(); + $mail_correct = false; + return ; + } if ($(this).is('#user_mail')) { $.get('<%=account_valid_ajax_path%>', { valid: "mail", From db0978c6571e5645fc5cc931d911e145b8fcc68a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 17:07:37 +0800 Subject: [PATCH 61/62] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 118 +++++++++++++++++---------------- app/views/memos/edit.html.erb | 9 +-- public/javascripts/feedback.js | 38 ++++++++++- 3 files changed, 102 insertions(+), 63 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 523ab1300..5bbc52db2 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,4 +1,56 @@ <%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %> + +
      + +
      + + + + +
      +
      +
      + <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%> +
      +
        + <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %> +
      + + + + + + + + + + + +
      + -
      - -
      - - - - -
      -
      -
      - <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%> -
      -
        - <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %> -
      - - - - - - - - - - - -
      - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index d26ebdbf8..b2b7d73f0 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,10 +7,11 @@ $("#error").html('主题不能超过50个字符').show(); return; } -// if(memo_content.html().trim().length > 5000 ){ -// $("#error").html('内容不能超过5000个字符').show(); -// return; -// } + if(memo_content.html().length > 30000){ + $("#error").html("内容 过长（最长为 30000 个字符）").show(); + $("html,body").animate({scrollTop:$("#error").offset().top},1000) + return false; + } memo_content.sync(); $("#edit_memo").submit(); }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){ diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index b30c8f91d..97209131e 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -1,5 +1,10 @@ (function($){ $.fn.fix = function(options){ + var u = navigator.userAgent; + if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } var defaults = { float : 'right', minStatue : true, @@ -73,6 +78,11 @@ function cookieget(n) $(function(){ + var u = navigator.userAgent; + if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } $(".closeSidebar").click(function(){ $(".show_btn").css("display","none"); $("#scrollsidebar").css("display","none"); @@ -109,4 +119,30 @@ $(function(){ $("#textCount").text(50-$("#subject").val().length) } }); -}); \ No newline at end of file +}); + +//var browser={ +// versions:function(){ +// var u = navigator.userAgent, app = navigator.appVersion; +// return {//移动终端浏览器版本信息 +// trident: u.indexOf('Trident') > -1, //IE内核 +// presto: u.indexOf('Presto') > -1, //opera内核 +// webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 +// gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核 +// mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端 +// ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 +// android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 +// iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 +// iPad: u.indexOf('iPad') > -1, //是否iPad +// webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 +// }; +// }(), +// language:(navigator.browserLanguage || navigator.language).toLowerCase() +//} +//document.writeln("语言版本: "+browser.language); +//document.writeln(" 是否为移动终端: "+browser.versions.mobile); +//document.writeln(" ios终端: "+browser.versions.ios); +//document.writeln(" android终端: "+browser.versions.android); +//document.writeln(" 是否为iPhone: "+browser.versions.iPhone); +//document.writeln(" 是否iPad: "+browser.versions.iPad); +//document.writeln(navigator.userAgent); \ No newline at end of file From 2cf61ad74f9eb6a0f05cd5645bc805107b15a3fe Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 10 Nov 2015 17:34:18 +0800 Subject: [PATCH 62/62] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 4 ++-- app/views/memos/edit.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 5bbc52db2..05c086ed4 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -128,8 +128,8 @@ $("#error").html("主题 过长（最长为 50 个字符）").show(); return false; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; } diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index b2b7d73f0..cace5bcc8 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -7,8 +7,8 @@ $("#error").html('主题不能超过50个字符').show(); return; } - if(memo_content.html().length > 30000){ - $("#error").html("内容 过长（最长为 30000 个字符）").show(); + if(memo_content.html().length > 20000){ + $("#error").html("内容 过长（最长为 20000 个字符）").show(); $("html,body").animate({scrollTop:$("#error").offset().top},1000) return false; }