From 24458ecb48a4578854bc65f9a3bea82707348876 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 16 Jun 2016 11:31:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?table=E5=8F=AF=E6=8B=96=E6=8B=BD=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C=E8=A1=A8=E6=A0=BC=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_student_table.html.erb | 25 ++++++++++--------- .../student_work/_evaluation_title.html.erb | 6 +---- .../_evaluation_un_title.html.erb | 6 +---- app/views/student_work/index.js.erb | 3 +-- public/javascripts/resizeable_table.js | 5 ++-- public/stylesheets/courses.css | 2 +- 6 files changed, 19 insertions(+), 28 deletions(-) diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb index cbb56025e..f3a72b20e 100644 --- a/app/views/exercise/_student_table.html.erb +++ b/app/views/exercise/_student_table.html.erb @@ -1,23 +1,24 @@ +<%= javascript_include_tag 'resizeable_table'%> + - - + + + + + + + <% @exercise_users_list.each_with_index do |exercise, index|%> - + @@ -30,7 +31,7 @@ - +
- 序号 -    - 姓名 - 学号 - 班级 -
序号  姓名学号班级   - <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%> - <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + <%= link_to "成绩",'',:class => "c_dark f14 fb",:remote => true%>
<%=index + 1 %><%=index + 1 %> <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %> --    <% if exercise.created_at%> <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>  diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb index 6a89b51b1..950c1660a 100644 --- a/app/views/student_work/_evaluation_title.html.erb +++ b/app/views/student_work/_evaluation_title.html.erb @@ -1,8 +1,4 @@ - - - +
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index c4a6a3e9b..5ed2e82d6 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -1,8 +1,4 @@ - - -
序号  
+
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb index da2428316..f65782805 100644 --- a/app/views/student_work/index.js.erb +++ b/app/views/student_work/index.js.erb @@ -1,4 +1,3 @@ $("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>"); $("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>"); -/* -$("th").each(function(){$(this).css("width",$(this).width()-1);});*/ +$("th").each(function(){$(this).css("width",$(this).width()-1);}); diff --git a/public/javascripts/resizeable_table.js b/public/javascripts/resizeable_table.js index a43078dee..1f84d4471 100644 --- a/public/javascripts/resizeable_table.js +++ b/public/javascripts/resizeable_table.js @@ -1,7 +1,7 @@ /** * Created by ttang on 2016/5/24. */ - /*$(document).ready(function(){ + $(document).ready(function(){ $("th").each(function(){ $(this).css("width",$(this).width()-1); }); @@ -80,5 +80,4 @@ element.addEventListener?element.addEventListener(type,listener,useCapture):element.attachEvent("on" + type,listener); } } - }); -*/ \ 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 46fbc5950..382283f75 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -109,7 +109,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re /*20160520作品列表table*/ .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;} -.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1;} +.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border:1px solid #e1e1e1; text-align:center;} /*作业信息*/ .mt-2 {margin-top:-2px;} From fd765b1d733b3f64518ccfb7d51d882981256bca Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 21 Jun 2016 15:17:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E5=BC=B9=E6=A1=86js=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/course_outline.js.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/courses/course_outline.js.erb b/app/views/courses/course_outline.js.erb index 490361a24..df968955a 100644 --- a/app/views/courses/course_outline.js.erb +++ b/app/views/courses/course_outline.js.erb @@ -6,4 +6,5 @@ $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(' '); $('#ajax-modal').parent().css("top","30%").css("left","50%"); $('#ajax-modal').parent().addClass("courseOutlinePopup"); +$('#ajax-modal').parent().removeClass("copyCoursePopup"); $('#ajax-modal').css("padding-left","16px")//.css("padding-bottom","16px");
序号