nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'jancborchardt/1410-messages-conversation'

Browse source 
Conflicts:
	app/views/conversations/new.haml
This commit is contained in:
Raphael Sofaer 2011-07-28 12:45:40 -07:00
commit 4fa5731d5e
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/conversations/_show.haml
View file

@ -29,5 +29,4 @@
= form_for [conversation, Message.new] do |message| = form_for [conversation, Message.new] do |message|
= message.text_area :text, :rows => 5, :tabindex => 1 = message.text_area :text, :rows => 5, :tabindex => 1
.right .right
= message.submit t('cancel'), :name => "reset", :id => "reset_button", :type => "reset", :class => "button", :tabindex => 3
= message.submit t('.reply').capitalize, :class => 'button creation', :tabindex => 2 = message.submit t('.reply').capitalize, :class => 'button creation', :tabindex => 2

1
app/views/conversations/new.haml
View file

@ -50,5 +50,4 @@
.clearfix .clearfix
.bottom_submit_section .bottom_submit_section
= submit_tag t('cancel'), :class => 'button', :type => :reset, :rel => "close", :confirm => t('.abandon_changes')
= conversation.submit t('.send'), :disable_with => t('.sending'), :class => 'button creation' = conversation.submit t('.send'), :disable_with => t('.sending'), :class => 'button creation'