From 535cf74f1f1e2925c61e3b989390e619a373bfa6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 10 Sep 2014 15:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=98=BE=E7=A4=BA=E6=9C=89html=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84BUG=20=20#1215=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88:?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_forum_list.html.erb  |  2 +-
 app/views/forums/show.html.erb         | 12 ------------
 app/views/layouts/base_forums.html.erb |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index 2b8f98494..df897151e 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -10,7 +10,7 @@
           </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>
-			<p ><%= forum.description%></p>
+			<p ><%= textAreailizable forum.description%></p>
 			<p ><%= authoring forum.created_at, forum.creator %></p></div>
 		<div class="forums-index-count">
 			<table class="forums-count-color"><tr class="forums-count-color" align="center"><td><%= link_to (forum.memo_count), forum_path(forum) %></td><td><%= link_to (forum.topic_count), forum_path(forum) %></td></tr>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 1622bbe02..6e41cc904 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -3,24 +3,12 @@
 	<h3><%=l(:label_memo_new)%></h3>
 	<% if User.current.logged? %>
 	<%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f|  %>
-	<!--<#% if @memo.errors.any? %>
-		<div id="error_explanation">
-			<h2><#%= pluralize(@memo.errors.count, "error") %> prohibited this memo from being saved:</h2>
-
-			<ul>
-				<#% @memo.errors.full_messages.each do |msg| %>
-				<li><#%= msg %></li>
-				<#% end %>
-			</ul>
-		</div>
-	<#% end %>  -->
 	<div class="actions" style="max-width:680px">
 		<p><%= f.text_field :subject, :required => true%></p>
 		<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
 		<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
         <p style="color: #ff0000">(<%= l(:label_memos_max_length) %>)</p>
 		<p>
-
 			<%= l(:label_attachment_plural) %><br />
 			<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
 		</p>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 4d981c23a..e5597afcf 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -52,7 +52,7 @@
 							<div class="sidebar-forums">
 								<div class="forums-line">																																							
 									<div class="forums-title"><%= @forum.name %></div>
-									<div class="forums-description"><%= textilizable @forum.description %></div>
+									<div class="forums-description"><%= textAreailizable @forum.description %></div>
 								</div>																																		
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>