From 2cd6edbcdca6bc905e19aa1d079200f0ffebb2ce Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 25 Jul 2017 09:19:35 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=97=A0=E8=AE=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=88=9B=E5=BB=BA=E4=BA=86=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=EF=BC=8C=E5=9D=87=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=BB=BA=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E5=A5=97=E4=BB=B6=20(=E6=96=B0=E9=A1=B5=E9=9D=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/_subject_createnew.html | 46 ++++++++++++++++++++++ public/stylesheets/css/edu-public.css | 1 + 2 files changed, 47 insertions(+) create mode 100644 app/views/subjects/_subject_createnew.html diff --git a/app/views/subjects/_subject_createnew.html b/app/views/subjects/_subject_createnew.html new file mode 100644 index 000000000..a86d57578 --- /dev/null +++ b/app/views/subjects/_subject_createnew.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + +
+
+
+

+ + kosasa > 实训套件 + >新建 +

+
+ 新建实训套件 +
+
+
  • + + +
    • +
  • + + +
    • +
  • + + 保存 + 取消 +
    • +
    +
    +
    +
    + + diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css index 68b6c0bcb..ee9076d64 100644 --- a/public/stylesheets/css/edu-public.css +++ b/public/stylesheets/css/edu-public.css @@ -219,6 +219,7 @@ input.task-form-80,textarea.task-form-80,select.task-form-80,.task-form-80{paddi input.task-form-90,textarea.task-form-90,select.task-form-90,.task-form-90{padding:5px;width:90%;} input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{padding:5px;width:100%;} input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;} +input.task-height-220,textarea.task-height-220,.task-height-220{height:220px;} input.task-height-150,textarea.task-height-150,.task-height-150{height:150px;} input.task-height-150,textarea.task-height-150,.task-height-100{height:100px;} From 30072b553b7b6d5884be7315ab2a918b64234208 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 25 Jul 2017 10:35:33 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=AF=B7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 787cc95ed..846113e1b 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -31,7 +31,7 @@
    - +
    From 78a555828b425156803af51b66e1c33f0296a1d7 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 25 Jul 2017 11:21:35 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E4=B8=BAtable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/_member_all_student_list.html.erb | 51 ++++++++++-------- .../_member_group_student_list.html.erb | 52 +++++++++---------- .../_member_no_group_student_list.html.erb | 49 +++++++++-------- .../courses/_member_teacher_list.html.erb | 40 ++++++++------ .../settings/_all_student_list.html.erb | 2 +- public/stylesheets/css/edu-class.css | 2 - 6 files changed, 104 insertions(+), 92 deletions(-) diff --git a/app/views/courses/_member_all_student_list.html.erb b/app/views/courses/_member_all_student_list.html.erb index b7286f7b5..d0b32777b 100644 --- a/app/views/courses/_member_all_student_list.html.erb +++ b/app/views/courses/_member_all_student_list.html.erb @@ -27,14 +27,14 @@ <% end %> -
    +
    -
    +

    @@ -44,39 +44,44 @@

    -
      -
    • - 序号 - 姓名 - 用户ID - 学号 - 分班 - 操作 -
      • + + + + + + + + + + + + + <% unless @members.blank? %> <% @members.each_with_index do |member, index| %> <% user = member.user %> -
    • - <%= index + 1 + (@page - 1) * 20 %> - <%= link_to user.show_real_name, user_path(user), :target => '_blank' %> - <%= user.login %> - <%= user.user_extensions ? user.user_extensions.student_id : '' %> - <%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> - +
      • + + + + + + + <% end %> <% end %> - + +
      序号姓名用户ID学号分班操作
      <%= index + 1 + (@page - 1) * 20 %><%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5', :target => '_blank' %><%= user.login %><%= user.user_extensions ? user.user_extensions.student_id : '' %><%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> <% if user == User.current %> - 删除 + 删除 <% else %> -- <% end %> - - +
    -
    +
      <%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
    diff --git a/app/views/courses/_member_group_student_list.html.erb b/app/views/courses/_member_group_student_list.html.erb index 14b0be8ea..d139d5bc6 100644 --- a/app/views/courses/_member_group_student_list.html.erb +++ b/app/views/courses/_member_group_student_list.html.erb @@ -31,14 +31,14 @@ <% end %>
    -
    -