diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index 286219356..7934a80fe 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -2,15 +2,15 @@ <% if forums.any? %> <% forums.each do |forum| %>
-
+
<%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
- - <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %> + <%=forum.name.gsub(/(\r\n)/,'
').html_safe %>
+ <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'
'), forum_path(forum),:class=>"f16 linkBlue" %>
-
<%= textAreailizable forum.description%>
+
<%= textAreailizable forum.description%>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 366291691..ec19b5b97 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -149,7 +149,7 @@
-
<%= @forum.name%>
+
<%= @forum.name%>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 133a90547..8aeb0120b 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -49,14 +49,14 @@
<%end%> -
主题: <%= @memo.subject%>
+
主题: <%= @memo.subject%>
<%= @memo.author.name%>
<%= format_date( @memo.created_at)%>
<%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-
+
<%= @memo.content.html_safe%>