diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-28 23:45:40 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-28 23:45:40 +0400 |
| commit | 4fa5731d5eac0d7abd7d3347bc6f1a93fd29dbe9 (patch) | |
| tree | 53f93e91ab88d1426c0c606ee082ade2656c306a /app | |
| parent | 192ae3a52be47347ce751bc21f88daeabf40fad6 (diff) | |
| parent | 5d998a8e939ba927ccb4b98493bcb7e9a396de65 (diff) | |
Merge remote branch 'jancborchardt/1410-messages-conversation'
Conflicts:
app/views/conversations/new.haml
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/conversations/_show.haml | 1 | ||||
| -rw-r--r-- | app/views/conversations/new.haml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml index 277b8973a..43623aae6 100644 --- a/app/views/conversations/_show.haml +++ b/app/views/conversations/_show.haml @@ -29,5 +29,4 @@ = form_for [conversation, Message.new] do |message| = message.text_area :text, :rows => 5, :tabindex => 1 .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 diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index aeaa9b79b..7beaf855e 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -50,5 +50,4 @@ .clearfix .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' |