diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a1e547a84..1d1212bf1 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -5,6 +5,7 @@ class CoursesController < ApplicationController helper :activities helper :members helper :words + helper :attachments before_filter :auth_login1, :only => [:show, :feedback] menu_item :overview diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ccf382006..2a10af260 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -15,7 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class UsersController < ApplicationController - helper :attachments layout :setting_layout #Added by young diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index ce3dd2091..5dde6c460 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -58,18 +58,23 @@
-

- <%= topic.content %> -

- <% if topic.content.size > 300 %> -

- + +

+
+ <%= topic.content %> +
+
+ + + - <% end %> +

<%= link_to_attachments_course topic, :author => false %> <%= l(:label_activity_time)%>:  <%= format_time topic.created_on %> diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index a20bed3fd..8a9ffd990 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -32,6 +32,7 @@

讨论区共有<%= @topic_count %>个帖子

<% if @topics.any? %> <% @topics.each do |topic| %> +
<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
@@ -57,19 +58,24 @@ <%= l(:label_board_sticky)%> <% end %>
+ +
+
+ <%= topic.content %> +
+
+ -

- <%= topic.content %> -

- <% if topic.content.size > 300 %> -

- +

- <% end %> + <%= link_to_attachments_course topic, :author => false %> <%= l(:label_activity_time)%>:  <%= format_time topic.created_on %> @@ -177,6 +183,7 @@ <% end %> <% end %>
+ <% end %> <% else %>

<%= l(:label_no_data) %>

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 9faf07b9a..2e736bdf7 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -24,7 +24,14 @@