From baa08095498b03b7ceabfec3fc2eb932ed0103df Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 29 Jun 2017 16:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=88?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=97=AE=E9=A2=98=E6=9C=AA=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 2 +- .../users/_edu_user_watch_fan_list.html.erb | 12 ++--- .../users/_my_homepage_courses_list.html.erb | 35 +++++++------ .../users/_my_homepage_shixuns_list.html.erb | 46 +++++++++++------ app/views/users/show.html.erb | 50 ++++++++++++++----- public/javascripts/edu/syllabus.js | 2 +- public/stylesheets/css/edu-common.css | 1 + public/stylesheets/css/edu-popup.css | 2 +- public/stylesheets/css/edu-public.css | 11 +++- public/stylesheets/css/edu-user.css | 3 +- 10 files changed, 108 insertions(+), 56 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 9fc76d278..3b4727046 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -48,7 +48,7 @@ + <%# end %> -
-
-
- -
+
+
+
+
    + <%= pagination_links_full @courses_pages, @courses_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> +
+
+
<% end %> diff --git a/app/views/users/_my_homepage_shixuns_list.html.erb b/app/views/users/_my_homepage_shixuns_list.html.erb index 0884b7e92..4e228ee7e 100644 --- a/app/views/users/_my_homepage_shixuns_list.html.erb +++ b/app/views/users/_my_homepage_shixuns_list.html.erb @@ -1,22 +1,36 @@ <% if @shixuns.blank? %> <%= render :partial => "welcome/no_data" %> <% else %> - <% @shixuns.each do |shixun| %> -

- <%= shixun.name %> - 已解锁第<%= had_passed_changllenge_count(shixun) %>关/共<%= shixun.challenges.count %>关 - <%= format_time shixun.created_at %> - -

- <% end %> - -
-
-
-
    - <%= pagination_links_full @shixuns_pages, @shixuns_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> -
-
+
+ <% @shixuns.each do |shixun| %> +

+ <%= shixun.name %> + 已解锁第<%= had_passed_changllenge_count(shixun) %>关/共<%= shixun.challenges.count %>关 + <%= User.where(:id => shixun.user_id).first.show_name %> + <%= format_time shixun.created_at %> + +

+ <% end %> +
+
+
+
    + <%= pagination_links_full @shixuns_pages, @shixuns_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> +
+
+
<% end %> + diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3061d4b28..f1568b1b0 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -163,9 +163,7 @@ -
- <%= render :partial => 'edu_user_watch_fan_list', :locals => {:current_user => current_user} %> -
+
@@ -236,11 +260,11 @@