Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/memos/show.html.erb

@@ -12,7 +12,13 @@
 				:method => 'get',
 				:title => l(:button_quote)
 				)if !@memo.locked? && User.current.logged? %> -->
-			<%= link_to(l(:button_quote))if !@memo.locked? && User.current.logged? %>				
+			<%= link_to(
+				l(:button_quote),
+				{:action => 'quote', :id => @memo},
+				:remote => true,
+				:method => 'get',
+				:title => l(:button_quote)
+				)if !@memo.locked? && User.current.logged? %>			
 
 			<%= link_to(
 				image_tag('edit.png'),
@@ -20,13 +26,22 @@
 				:method => 'get',
 				:title => l(:button_edit)
 				) if @memo.editable_by?(User.current) %>
-			<%= link_to(
+			<!-- <%= link_to(
 				image_tag('delete.png'),
 				{:action => 'destroy', :id => @memo},
 				:method => :delete,
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
+				) if @memo.destroyable_by?(User.current) %> -->
+			<%= link_to(
+				l(:button_delete),
+				{:action => 'destroy', :id => @memo},
+				:method => :delete,
+				:data => {:confirm => l(:text_are_you_sure)},
+				:title => l(:button_delete)
 				) if @memo.destroyable_by?(User.current) %>
+			
+				
 		</div>
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
@@ -59,20 +74,34 @@
 				:method => 'get',
 				:title => l(:button_quote)
 				)if !@memo.locked? && User.current.logged? %> -->
-			<%= link_to(l(:button_quote))if !@memo.locked? && User.current.logged? %>
+			<%= link_to(
+				l(:button_quote),
+				{:action => 'quote', :id => reply},
+				:remote => true,
+				:method => 'get',
+				:title => l(:button_quote)
+				)if !@memo.locked? && User.current.logged? %>
 				
 			<%= link_to(
 				image_tag('edit.png'),
 				{:action => 'edit', :id => reply},
 				:title => l(:button_edit)
 				) if reply.editable_by?(User.current) %>
-			<%= link_to(
+			<!-- <%= link_to(
 				image_tag('delete.png'),
 				{:action => 'destroy', :id => reply},
 				:method => :delete,
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
-				) if reply.destroyable_by?(User.current) %>
+				) if reply.destroyable_by?(User.current) %> -->
+				<%= link_to(
+				l(:button_delete),
+				{:action => 'destroy', :id => reply},
+				:method => :delete,
+				:data => {:confirm => l(:text_are_you_sure)},
+				:title => l(:button_delete)
+				) if reply.destroyable_by?(User.current) %> 			
+
 		</div>
 
 		<table class="borad-text-list">