Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/memos/show.html.erb

@@ -48,13 +48,14 @@
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
-			<%= raw @memo.content %>
+		<%=h sanitize(@memo.content.html_safe) %>
 			<p>							
 				<% if @memo.attachments.any?%>
 				<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
 				<%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options} %>
 				<% end %>
 			</p>
+			<div class="clearfix"></div>
 		</div>
 		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author.name %></div>
 

app/views/users/user_fanslist.html.erb

@@ -2,15 +2,18 @@
 <h3><%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count) %></h3>
 <div class="inf_user_image">
   <% for user in @user.watcher_users %>
-	<ul class="list_watch"><li>
+      <ul class="list_watch">
+        <li>
           <table width="660px" border="0" align="center">
             <tr>
               <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(user), :class => "avatar"),
                                                                   user_path(user),
                                                                   :title => "#{user.name}" %></td>
-     <td><table width="580px" border="0">
+              <td>
+                <table width="580px" border="0">
                   <tr>  <!-- modified by bai -->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
+                    <td colspan="2" valign="top">
+                      <strong><%= content_tag "div", link_to(user.name, user_path(user)), :class => "project_avatar_name" %></strong>
                     </td>
                   </tr>
 
@@ -26,6 +29,7 @@
                           <% end %>
                       <% end %>
                     </p>
+
                       <p class="font_description">
                         <% unless user.memberships.empty? %>
                             <% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
@@ -44,8 +48,11 @@
                     <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
                     </td>
                   </tr>
-    </table></td>
+                </table>
+              </td>
             </tr>
-</table></li></ul>
+          </table>
+        </li>
+      </ul>
   <% end %>
 </div>