Merge branch 'rails4'

lib/alavetelitheme.rb

@@ -38,6 +38,7 @@ class ActionController::Base
 ['stylesheets', 'images', 'javascripts'].each do |asset_type|
   theme_asset_path = File.join(File.dirname(__FILE__),
                                '..',
+                               'app',
                                'assets',
                                asset_type)
   Rails.application.config.assets.paths.unshift theme_asset_path

lib/config/custom-routes.rb

@@ -6,6 +6,6 @@
   # Additional help page example
   # match '/help/help_out' => 'help#help_out'
 
-  match '/help/conditions' => 'help#conditions', :as => 'help_conditions'
-  match '/help/cada' => 'help#cada', :as => 'help_cada'
+  get '/help/conditions' => 'help#conditions', :as => 'help_conditions'
+  get '/help/cada' => 'help#cada', :as => 'help_cada'
 end

lib/views/help/contact.html.erb

@@ -87,7 +87,8 @@
 
   <div class="form_button">
     <%= hidden_field_tag(:submitted_contact_form, 1) %>
-    <%= submit_tag "Envoyer votre message à #{ site_name }", :disable_with => "Envoi..." %>
+    <%= submit_tag "Envoyer votre message à #{ site_name }",
+                   :data => { :disable_with => "Envoi..." } %>
   </div>
 
 <% end %>

lib/views/help/contact.nl.html.erb

@@ -87,7 +87,8 @@
 
   <div class="form_button">
     <%= hidden_field_tag(:submitted_contact_form, 1) %>
-    <%= submit_tag "Verstuur bericht aan #{ site_name }", :disable_with => "Verzenden..." %>
+    <%= submit_tag "Verstuur bericht aan #{ site_name }",
+                   :data => { :disable_with => "Verzenden..." } %>
   </div>
 
 <% end %>