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

app/views/forums/_forum_list.html.erb

@@ -2,15 +2,15 @@
 <% if forums.any? %>
 	<% forums.each do |forum| %>
           <div class="postRow">
-            <div class="postPortrait"><a href="javascript:void(0);" class="linkGrey2">
+            <div class="postPortrait">
               <%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
             </div>
             <div class="postWrap">
               <div class="postTitle">
-                <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
+                <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
-                <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
+                <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
+              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>

app/views/layouts/base_forums.html.erb

@@ -149,7 +149,7 @@
               <!--<div class="homepageEditProfile"><a href="javascript:void(0);" class="homepageEditProfileIcon"></a></div>-->
             </div>
             <div class="fl">
-              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%></div>
+              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
               <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>

app/views/memos/show.html.erb

@@ -30,6 +30,14 @@
     $(function() {
         init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
     });
+
+    function del_confirm(){
+        if(confirm('确认删除么?')){
+            $("#del_link").click();
+        }else{
+
+        }
+    }
 </script>
 <div class="postRightContainer">
   <div class="postThemeContainer">
@@ -43,24 +51,25 @@
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
               <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
-              <li><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" class="postOptionLink">删除</a></li>
+              <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
+              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_link" ></a></li>
             </ul>
           </li>
         </ul>
       </div>
       <%end%>
-      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb">主题: <%= @memo.subject%></a></div>
+      <div class="postDetailTitle"><a href="javascript:void(0);" class="f14 linkGrey4 fb" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;">主题: <%= @memo.subject%></a></div>
       <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
        <span id="praise_tread" style="float: right">
     <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
   </span>
       <div class="cl"></div>
-      <div class="memo-content" >
+      <div class="memo-content" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;margin-bottom: 0px !important;" >
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class="mt10 fl">
+      <div class=" fl">
         <% 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, :is_float => true} %>