diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-04-08 10:12:58 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-04-08 10:12:58 +0100 |
| commit | d1f2d56834688c5b449ac8c50b67dff0672ca074 (patch) | |
| tree | 85111ab25fc0b68d0c1b0003ed57033c4cbe4aea | |
| parent | 39a69a0626c55331ae827b5967bfb8927dd7a1a7 (diff) | |
| parent | ce8cb9ea92d43002262099e765cccd064d7ea522 (diff) | |
Merge branch 'issues/1154-contact-form-submit' into rails-3-develop
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/views/help/contact.html.erb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1b6c98535..fd49d3b53 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,5 +1,6 @@ // ... //= require jquery +//= require jquery_ujs //= require jquery.ui.datepicker //= require jquery.ui.position //= require jquery.cookie diff --git a/app/views/help/contact.html.erb b/app/views/help/contact.html.erb index e8a5fec8c..d228aa3a5 100644 --- a/app/views/help/contact.html.erb +++ b/app/views/help/contact.html.erb @@ -93,7 +93,7 @@ <div class="form_button"> <%= hidden_field_tag(:submitted_contact_form, 1) %> - <%= submit_tag "Send message to the charity" %> + <%= submit_tag "Send message to the charity", :disable_with => "Sending..." %> <-- we run this site, not the Government! </div> |