From b8f9cf6ce2f83812520163c8ae3d2a3bb6f4dc77 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Aug 2017 10:40:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=B8=96=E5=AD=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 1 + app/views/boards/_course_show.html.erb | 2 +- app/views/messages/_form_course.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 5362bc204..77241f2e1 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -182,6 +182,7 @@ class BoardsController < ApplicationController @type = 1 end + @all_count = @topics.count #分页 @limit = 15 @is_remote = true diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 0ba6af1f3..1f13b215e 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -48,7 +48,7 @@
-

全部帖子

<%= @topics.count %> +

全部帖子

<%= @all_count %> <% if User.current.logged? %> + 我要发布 <% end %> diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb index 06ea03058..a8f006124 100644 --- a/app/views/messages/_form_course.html.erb +++ b/app/views/messages/_form_course.html.erb @@ -26,7 +26,7 @@ <%= f.kindeditor :content, :editor_id => 'message_content_editor', :owner_id => @message.nil? ? 0: @message.id, :owner_type => OwnerTypeHelper::MESSAGE, - :width => '90%', + :width => '89.8%', :height => 300, :minHeight=>300, :class => 'talk_text fl',