From 60d04af7c6fef02a8034c2d4a9a438bfd0fb3eca Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Fri, 22 Sep 2017 20:35:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixuns/_statistics_student_list.html.erb | 80 +++++++++---------- app/views/student_work/show.html.erb | 2 +- app/views/syllabuses/_syllabus_index.html.erb | 3 +- app/views/syllabuses/index.html.erb | 4 + 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/app/views/shixuns/_statistics_student_list.html.erb b/app/views/shixuns/_statistics_student_list.html.erb index 5b79f7747..02340d7f0 100644 --- a/app/views/shixuns/_statistics_student_list.html.erb +++ b/app/views/shixuns/_statistics_student_list.html.erb @@ -6,32 +6,32 @@ <%= render :partial => "welcome/no_data" %> <% else %> -
-
-
-

学员列表

-
- - - <% @statistics.each do |statistics| %> - - - - - - + + <% end %> + +
- - <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36", :alt => "头像"), user_path(statistics.owner), :target => '_blank', :class => "", :style => "border-radius:18px;"%> - - <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %> - <%= format_time(statistics.created_at) %> 开启 -
-
- -
-
- 挑战至第<%= statistics.current_stage %>关/共<%= statistics.games.count %>关 - 		+
+
+
+

学员列表

+
+ + + <% @statistics.each do |statistics| %> + + + + + + - - <% end %> - -
+ + <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36", :alt => "头像"), user_path(statistics.owner), :target => '_blank', :class => "", :style => "border-radius:18px;"%> + + <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %> + <%= format_time(statistics.created_at) %> 开启 +
+
+ +
+
+ 挑战至第<%= statistics.current_stage %>关/共<%= statistics.games.count %>关 + 		<% if statistics.total_score == 0 %> -- @@ -39,19 +39,19 @@ + <%= statistics.total_score %> 经验值 <% end %> -
-
-
-
    - <%= pagination_links_full @statistic_pages, @statistics_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> -
-
-
+
+
+
+
    + <%= pagination_links_full @statistic_pages, @statistics_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> +
+
+
+
+
 
-   - <% 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 a2c0e5cf4..ce7a77f2d 100644 --- a/app/views/student_work/show.html.erb +++ b/app/views/student_work/show.html.erb @@ -2,7 +2,7 @@ <%= stylesheet_link_tag "/codemirror/lib/codemirror" %>

<%= @course.name %> > <%= @homework.homework_type_ch %>作业 > - <%#= link_to get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1, student_work_index_path(:homework => @homework.id) %> > + <%#= link_to get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1, student_work_index_path(:homework => @homework.id) %> #<%= get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1 %> <% if @is_teacher || @work.user == User.current || (@homework.homework_detail_manual.comment_status != 3 && @homework.homework_detail_manual.comment_status != 4) %> <%= link_to @work.user.try(:show_real_name), user_path(@work.user) %> diff --git a/app/views/syllabuses/_syllabus_index.html.erb b/app/views/syllabuses/_syllabus_index.html.erb index 0902977a8..aec9892c2 100644 --- a/app/views/syllabuses/_syllabus_index.html.erb +++ b/app/views/syllabuses/_syllabus_index.html.erb @@ -2,8 +2,7 @@

正在进行 已结束 - + 新建 - + 加入课堂 +

<%= render :partial => "syllabuses/my_syllabuses" %> diff --git a/app/views/syllabuses/index.html.erb b/app/views/syllabuses/index.html.erb index 9b117cb3f..992c326c5 100644 --- a/app/views/syllabuses/index.html.erb +++ b/app/views/syllabuses/index.html.erb @@ -15,6 +15,10 @@
  • <%=link_to "我参与的", syllabuses_path(:tab => 3), :class => "tab_type font-16", :remote => true %>
    • +
  • + + 新建 + + 加入课堂 +