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

app/helpers/journals_helper.rb

@@ -116,7 +116,7 @@ module JournalsHelper
       end
     end
     #content << content_tag('div', links.join(' ').html_safe, :class => 'contextual', :style => 'margin-top:-25px;') unless links.empty?
-    content << textilizable(journal, :notes)
+    content << textAreailizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
     content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")

app/views/users/_user_activities.html.erb

@@ -61,4 +61,4 @@
     <% end %>
 <% end %>
 <input type="hidden" value="<%= page%>"/>
-  <%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>