diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 7d58a9e7b..af16f9212 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -53,7 +53,7 @@ class ShixunsController < ApplicationController @current_user_had_passed = Myshixun.find_by_sql("select count(*) as had_passed from myshixuns where status =1 and user_id=#{User.current.id} and shixun_id in (SELECT id FROM `shixuns` where authentication=1)").first.try(:had_passed).to_i @shixuns_count = @shixuns.count - @limit = 8 + @limit = 20 @is_remote = true @shixun_pages = Paginator.new @shixuns_count, @limit, params['page'] || 1 @offset ||= @shixun_pages.offset diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index c3f958a21..48e75cb4a 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -1,11 +1,15 @@ <% @syllabuses.each do | sy | %>
-
- -

+

+ +

<%= sy.title %>

+
+ 用户 + Cillian +

<% sy_author = User.find(sy.user_id) %> <% if !sy_author.user_extensions.school_id.blank? && sy_author.user_extensions.school %> diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 63e163192..4e5f0fc56 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -4,17 +4,12 @@ <%= User.current.show_name %> > 智能课堂

-
-
+
+

智能课堂

<%= link_to "创建", new_course_path, :class => "task-btn task-btn-green fr mt6" %>
-
    -
  • <%= @shixuns_count %>
    全部实训
    • -
  • <%= @current_user_had_passed %>
    你已通过
    • -
  • <%= @shixun_my_score %>
    取得成绩
    • -