From d6e765cf4a38d608a75931ab127710b5dbbf502a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 15:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb    |  7 ++++-
 app/views/messages/_project_show.html.erb | 15 +++------
 public/stylesheets/project.css            | 38 +++++++++++++++++++++++
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b9fe14aba..7b70dffe5 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -270,7 +270,12 @@ class MessagesController < ApplicationController
       if params[:is_board]
         redirect_to project_boards_url(@project)
       else
-        redirect_to board_message_url(@board, @topic, :r => @reply)
+        if @message.parent
+          redirect_to board_message_url(@board, @message.parent, :r => r)
+        else
+          redirect_to project_board_url(@project, @board)
+        end
+        # redirect_to board_message_url(@board, @topic, :r => @reply)
       end
     elsif @course
       if params[:is_board]
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 9468e05ce..a29c02225 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -104,19 +104,12 @@
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => @topic},
-                                :class => 'postOptionLink'
-                        ) if @message.editable_by?(User.current) %>
+                    <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
                   </li>
                   <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                {:action => 'destroy', :id => @topic},
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
+                    <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :class => 'postOptionLink'
                         ) if @message.destroyable_by?(User.current) %>
                     <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
                   </li>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 826dbf98f..a60198593 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1104,3 +1104,41 @@ a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !im
 a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
+/*讨论区内部样式*/
+.postDetailContainer {padding:15px; border:1px solid #dddddd; background-color:#ffffff;}
+.postlabel {background-color:#edf1f2; color:#888888; padding:2px 5px; float:left; margin-bottom:5px;}
+.postRightContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; float:left; margin-bottom:10px;}
+.postDetailBanner {height:30px; width:720px; border-bottom:1px solid #efefef;}
+.postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
+.postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
+.postDetailWrap {width:580px; float:left;}
+.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
+.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
+.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+.postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
+.postDetailDate {color:#888888; font-size:12px; float:left;}
+.postDetailReply { margin-top:28px; color:#888888; float:right;}
+a.postReplyIcon {background:url(images/post_image_list.png) -40px 2px no-repeat; width:18px; height:18px; float:left;}
+a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no-repeat;}
+.postDetailInput {width:713px; height:28px; border:1px solid #d9d9d9; outline:none !important;}
+.postAttIcon {background:url(images/post_image_list.png) 0px -91px no-repeat; width:16px; height:16px; padding-left:20px;}
+.postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;}
+.postThemeContainer {width:720px;}
+.postThemeWrap {width:655px; float:left;position: relative}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px;}
+.postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
+a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
+.postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;}
+.postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}
+.pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;}
+.homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;}
+.postRouteContainer {padding:10px 15px; background-color:#ffffff; border:1px solid #dddddd; margin-top:10px; font-size:14px;}
+a.postRouteLink {font-weight:bold; color:#484848;}
+a.postRouteLink:hover {text-decoration:underline;}
+.homepagePostSetting ul li:hover ul {display:block;}
+
+.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
+.ReplyToMessageInputContainer {width:582px; float:left;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}