From 2aa6a142892976855f0b544c8486cf9ec4f750f1 Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Fri, 24 Jan 2014 19:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/show.html.erb   | 11 +++++++----
 public/stylesheets/application.css |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index cd1758f16..391e6b956 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -99,12 +99,15 @@
 			<%= link_to_attachments @topic, :author => false %>
 		</div>
 		<div class="memo-timestamp">
-			<%= authoring @topic.created_on, @topic.author %>
+			<div style="float: left"><%= authoring @topic.created_on, @topic.author %></div>
+
+		
+			<div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div>
 		</div>
 		<% if !@topic.locked? && authorize_for('messages', 'reply') %>
-		<p style="float: right;">
-			<%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %>
-		</p>
+
+			
+
 	</div>
 	<br />
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ec82748c8..e5be822ed 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2458,7 +2458,7 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');}
 }
 .icon_enterprise-add { background-image: url(../images/add_enterprise.png); }
 .icon-add { background-image: url(../images/add.png); }
-.icon-edit { background-image: url(../images/edit.png); }
+.icon-edit { /*background-image: url(../images/edit.png);*/ }
 .icon-copy { background-image: url(../images/copy.png); }
 .icon-duplicate { background-image: url(../images/duplicate.png); }
 .icon-del { /*background-image: url(../images/delete.png); */}