diff --git a/assets/images/anticor-logo.png b/app/assets/images/anticor-logo.png
similarity index 100%
rename from assets/images/anticor-logo.png
rename to app/assets/images/anticor-logo.png
diff --git a/assets/images/hamburger.png b/app/assets/images/hamburger.png
similarity index 100%
rename from assets/images/hamburger.png
rename to app/assets/images/hamburger.png
diff --git a/assets/images/home-grad.png b/app/assets/images/home-grad.png
similarity index 100%
rename from assets/images/home-grad.png
rename to app/assets/images/home-grad.png
diff --git a/assets/images/homepage-background-small.jpg b/app/assets/images/homepage-background-small.jpg
similarity index 100%
rename from assets/images/homepage-background-small.jpg
rename to app/assets/images/homepage-background-small.jpg
diff --git a/assets/images/homepage-background.jpg b/app/assets/images/homepage-background.jpg
similarity index 100%
rename from assets/images/homepage-background.jpg
rename to app/assets/images/homepage-background.jpg
diff --git a/assets/images/icon_application_octet-stream_large.png b/app/assets/images/icon_application_octet-stream_large.png
similarity index 100%
rename from assets/images/icon_application_octet-stream_large.png
rename to app/assets/images/icon_application_octet-stream_large.png
diff --git a/assets/images/icon_application_pdf_large.png b/app/assets/images/icon_application_pdf_large.png
similarity index 100%
rename from assets/images/icon_application_pdf_large.png
rename to app/assets/images/icon_application_pdf_large.png
diff --git a/assets/images/icon_application_rtf_large.png b/app/assets/images/icon_application_rtf_large.png
similarity index 100%
rename from assets/images/icon_application_rtf_large.png
rename to app/assets/images/icon_application_rtf_large.png
diff --git a/assets/images/icon_application_vnd.ms-excel_large.png b/app/assets/images/icon_application_vnd.ms-excel_large.png
similarity index 100%
rename from assets/images/icon_application_vnd.ms-excel_large.png
rename to app/assets/images/icon_application_vnd.ms-excel_large.png
diff --git a/assets/images/icon_application_vnd.ms-powerpoint_large.png b/app/assets/images/icon_application_vnd.ms-powerpoint_large.png
similarity index 100%
rename from assets/images/icon_application_vnd.ms-powerpoint_large.png
rename to app/assets/images/icon_application_vnd.ms-powerpoint_large.png
diff --git a/assets/images/icon_application_vnd.ms-word_large.png b/app/assets/images/icon_application_vnd.ms-word_large.png
similarity index 100%
rename from assets/images/icon_application_vnd.ms-word_large.png
rename to app/assets/images/icon_application_vnd.ms-word_large.png
diff --git a/assets/images/icon_application_zip_large.png b/app/assets/images/icon_application_zip_large.png
similarity index 100%
rename from assets/images/icon_application_zip_large.png
rename to app/assets/images/icon_application_zip_large.png
diff --git a/assets/images/icon_image_bmp_large.png b/app/assets/images/icon_image_bmp_large.png
similarity index 100%
rename from assets/images/icon_image_bmp_large.png
rename to app/assets/images/icon_image_bmp_large.png
diff --git a/assets/images/icon_image_gif_large.png b/app/assets/images/icon_image_gif_large.png
similarity index 100%
rename from assets/images/icon_image_gif_large.png
rename to app/assets/images/icon_image_gif_large.png
diff --git a/assets/images/icon_image_img_large.png b/app/assets/images/icon_image_img_large.png
similarity index 100%
rename from assets/images/icon_image_img_large.png
rename to app/assets/images/icon_image_img_large.png
diff --git a/assets/images/icon_image_jpeg_large.png b/app/assets/images/icon_image_jpeg_large.png
similarity index 100%
rename from assets/images/icon_image_jpeg_large.png
rename to app/assets/images/icon_image_jpeg_large.png
diff --git a/assets/images/icon_image_png_large.png b/app/assets/images/icon_image_png_large.png
similarity index 100%
rename from assets/images/icon_image_png_large.png
rename to app/assets/images/icon_image_png_large.png
diff --git a/assets/images/icon_image_tiff_large.png b/app/assets/images/icon_image_tiff_large.png
similarity index 100%
rename from assets/images/icon_image_tiff_large.png
rename to app/assets/images/icon_image_tiff_large.png
diff --git a/assets/images/icon_message_delivery-status_large.png b/app/assets/images/icon_message_delivery-status_large.png
similarity index 100%
rename from assets/images/icon_message_delivery-status_large.png
rename to app/assets/images/icon_message_delivery-status_large.png
diff --git a/assets/images/icon_text_html_large.png b/app/assets/images/icon_text_html_large.png
similarity index 100%
rename from assets/images/icon_text_html_large.png
rename to app/assets/images/icon_text_html_large.png
diff --git a/assets/images/icon_text_plain_large.png b/app/assets/images/icon_text_plain_large.png
similarity index 100%
rename from assets/images/icon_text_plain_large.png
rename to app/assets/images/icon_text_plain_large.png
diff --git a/assets/images/icon_text_x-vcard_large.png b/app/assets/images/icon_text_x-vcard_large.png
similarity index 100%
rename from assets/images/icon_text_x-vcard_large.png
rename to app/assets/images/icon_text_x-vcard_large.png
diff --git a/assets/images/icon_unknown.png b/app/assets/images/icon_unknown.png
similarity index 100%
rename from assets/images/icon_unknown.png
rename to app/assets/images/icon_unknown.png
diff --git a/assets/images/link-icon.png b/app/assets/images/link-icon.png
similarity index 100%
rename from assets/images/link-icon.png
rename to app/assets/images/link-icon.png
diff --git a/assets/images/link-icon@2.png b/app/assets/images/link-icon@2.png
similarity index 100%
rename from assets/images/link-icon@2.png
rename to app/assets/images/link-icon@2.png
diff --git a/assets/images/locale-switcher.png b/app/assets/images/locale-switcher.png
similarity index 100%
rename from assets/images/locale-switcher.png
rename to app/assets/images/locale-switcher.png
diff --git a/assets/images/logo-opengraph.png b/app/assets/images/logo-opengraph.png
similarity index 100%
rename from assets/images/logo-opengraph.png
rename to app/assets/images/logo-opengraph.png
diff --git a/assets/images/logo.png b/app/assets/images/logo.png
similarity index 100%
rename from assets/images/logo.png
rename to app/assets/images/logo.png
diff --git a/assets/images/logo@2.png b/app/assets/images/logo@2.png
similarity index 100%
rename from assets/images/logo@2.png
rename to app/assets/images/logo@2.png
diff --git a/assets/images/navimg/logo-trans-small.png b/app/assets/images/navimg/logo-trans-small.png
similarity index 100%
rename from assets/images/navimg/logo-trans-small.png
rename to app/assets/images/navimg/logo-trans-small.png
diff --git a/assets/images/old-logo.png b/app/assets/images/old-logo.png
similarity index 100%
rename from assets/images/old-logo.png
rename to app/assets/images/old-logo.png
diff --git a/assets/images/quote-marks.png b/app/assets/images/quote-marks.png
similarity index 100%
rename from assets/images/quote-marks.png
rename to app/assets/images/quote-marks.png
diff --git a/assets/images/search.png b/app/assets/images/search.png
similarity index 100%
rename from assets/images/search.png
rename to app/assets/images/search.png
diff --git a/assets/images/small-green-cross.png b/app/assets/images/small-green-cross.png
similarity index 100%
rename from assets/images/small-green-cross.png
rename to app/assets/images/small-green-cross.png
diff --git a/assets/images/small-white-cross.png b/app/assets/images/small-white-cross.png
similarity index 100%
rename from assets/images/small-white-cross.png
rename to app/assets/images/small-white-cross.png
diff --git a/assets/images/status/classification.png b/app/assets/images/status/classification.png
similarity index 100%
rename from assets/images/status/classification.png
rename to app/assets/images/status/classification.png
diff --git a/assets/images/status/classification@2x.png b/app/assets/images/status/classification@2x.png
similarity index 100%
rename from assets/images/status/classification@2x.png
rename to app/assets/images/status/classification@2x.png
diff --git a/assets/images/status/delayed.png b/app/assets/images/status/delayed.png
similarity index 100%
rename from assets/images/status/delayed.png
rename to app/assets/images/status/delayed.png
diff --git a/assets/images/status/delayed@2x.png b/app/assets/images/status/delayed@2x.png
similarity index 100%
rename from assets/images/status/delayed@2x.png
rename to app/assets/images/status/delayed@2x.png
diff --git a/assets/images/status/delivery_error.png b/app/assets/images/status/delivery_error.png
similarity index 100%
rename from assets/images/status/delivery_error.png
rename to app/assets/images/status/delivery_error.png
diff --git a/assets/images/status/delivery_error@2x.png b/app/assets/images/status/delivery_error@2x.png
similarity index 100%
rename from assets/images/status/delivery_error@2x.png
rename to app/assets/images/status/delivery_error@2x.png
diff --git a/assets/images/status/locked.png b/app/assets/images/status/locked.png
similarity index 100%
rename from assets/images/status/locked.png
rename to app/assets/images/status/locked.png
diff --git a/assets/images/status/locked@2x.png b/app/assets/images/status/locked@2x.png
similarity index 100%
rename from assets/images/status/locked@2x.png
rename to app/assets/images/status/locked@2x.png
diff --git a/assets/images/status/notheld.png b/app/assets/images/status/notheld.png
similarity index 100%
rename from assets/images/status/notheld.png
rename to app/assets/images/status/notheld.png
diff --git a/assets/images/status/notheld@2x.png b/app/assets/images/status/notheld@2x.png
similarity index 100%
rename from assets/images/status/notheld@2x.png
rename to app/assets/images/status/notheld@2x.png
diff --git a/assets/images/status/overdue.png b/app/assets/images/status/overdue.png
similarity index 100%
rename from assets/images/status/overdue.png
rename to app/assets/images/status/overdue.png
diff --git a/assets/images/status/overdue@2x.png b/app/assets/images/status/overdue@2x.png
similarity index 100%
rename from assets/images/status/overdue@2x.png
rename to app/assets/images/status/overdue@2x.png
diff --git a/assets/images/status/partiallysuccessful.png b/app/assets/images/status/partiallysuccessful.png
similarity index 100%
rename from assets/images/status/partiallysuccessful.png
rename to app/assets/images/status/partiallysuccessful.png
diff --git a/assets/images/status/partiallysuccessful@2x.png b/app/assets/images/status/partiallysuccessful@2x.png
similarity index 100%
rename from assets/images/status/partiallysuccessful@2x.png
rename to app/assets/images/status/partiallysuccessful@2x.png
diff --git a/assets/images/status/postal.png b/app/assets/images/status/postal.png
similarity index 100%
rename from assets/images/status/postal.png
rename to app/assets/images/status/postal.png
diff --git a/assets/images/status/postal@2x.png b/app/assets/images/status/postal@2x.png
similarity index 100%
rename from assets/images/status/postal@2x.png
rename to app/assets/images/status/postal@2x.png
diff --git a/assets/images/status/refused.png b/app/assets/images/status/refused.png
similarity index 100%
rename from assets/images/status/refused.png
rename to app/assets/images/status/refused.png
diff --git a/assets/images/status/refused@2x.png b/app/assets/images/status/refused@2x.png
similarity index 100%
rename from assets/images/status/refused@2x.png
rename to app/assets/images/status/refused@2x.png
diff --git a/assets/images/status/reported.png b/app/assets/images/status/reported.png
similarity index 100%
rename from assets/images/status/reported.png
rename to app/assets/images/status/reported.png
diff --git a/assets/images/status/reported@2x.png b/app/assets/images/status/reported@2x.png
similarity index 100%
rename from assets/images/status/reported@2x.png
rename to app/assets/images/status/reported@2x.png
diff --git a/assets/images/status/review.png b/app/assets/images/status/review.png
similarity index 100%
rename from assets/images/status/review.png
rename to app/assets/images/status/review.png
diff --git a/assets/images/status/review@2x.png b/app/assets/images/status/review@2x.png
similarity index 100%
rename from assets/images/status/review@2x.png
rename to app/assets/images/status/review@2x.png
diff --git a/assets/images/status/successful.png b/app/assets/images/status/successful.png
similarity index 100%
rename from assets/images/status/successful.png
rename to app/assets/images/status/successful.png
diff --git a/assets/images/status/successful@2x.png b/app/assets/images/status/successful@2x.png
similarity index 100%
rename from assets/images/status/successful@2x.png
rename to app/assets/images/status/successful@2x.png
diff --git a/assets/images/status/unusual.png b/app/assets/images/status/unusual.png
similarity index 100%
rename from assets/images/status/unusual.png
rename to app/assets/images/status/unusual.png
diff --git a/assets/images/status/unusual@2x.png b/app/assets/images/status/unusual@2x.png
similarity index 100%
rename from assets/images/status/unusual@2x.png
rename to app/assets/images/status/unusual@2x.png
diff --git a/assets/images/status/waiting.png b/app/assets/images/status/waiting.png
similarity index 100%
rename from assets/images/status/waiting.png
rename to app/assets/images/status/waiting.png
diff --git a/assets/images/status/waiting@2x.png b/app/assets/images/status/waiting@2x.png
similarity index 100%
rename from assets/images/status/waiting@2x.png
rename to app/assets/images/status/waiting@2x.png
diff --git a/assets/images/status/withdrawn.png b/app/assets/images/status/withdrawn.png
similarity index 100%
rename from assets/images/status/withdrawn.png
rename to app/assets/images/status/withdrawn.png
diff --git a/assets/images/status/withdrawn@2x.png b/app/assets/images/status/withdrawn@2x.png
similarity index 100%
rename from assets/images/status/withdrawn@2x.png
rename to app/assets/images/status/withdrawn@2x.png
diff --git a/assets/images/widget-base.png b/app/assets/images/widget-base.png
similarity index 100%
rename from assets/images/widget-base.png
rename to app/assets/images/widget-base.png
diff --git a/assets/images/wordpress.png b/app/assets/images/wordpress.png
similarity index 100%
rename from assets/images/wordpress.png
rename to app/assets/images/wordpress.png
diff --git a/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
similarity index 100%
rename from assets/stylesheets/custom.css.scss
rename to app/assets/stylesheets/custom.css.scss
diff --git a/assets/stylesheets/responsive/_settings.scss b/app/assets/stylesheets/responsive/_settings.scss
similarity index 100%
rename from assets/stylesheets/responsive/_settings.scss
rename to app/assets/stylesheets/responsive/_settings.scss
diff --git a/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
similarity index 100%
rename from assets/stylesheets/responsive/custom.scss
rename to app/assets/stylesheets/responsive/custom.scss
diff --git a/assets/stylesheets/widget.scss b/app/assets/stylesheets/widget.scss
similarity index 100%
rename from assets/stylesheets/widget.scss
rename to app/assets/stylesheets/widget.scss
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index c245617..a70573f 100644
--- a/lib/alavetelitheme.rb
+++ b/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
diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb
index 29a138b..5bf371d 100644
--- a/lib/config/custom-routes.rb
+++ b/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
diff --git a/lib/views/help/contact.html.erb b/lib/views/help/contact.html.erb
index 70480dc..66446c9 100644
--- a/lib/views/help/contact.html.erb
+++ b/lib/views/help/contact.html.erb
@@ -87,7 +87,8 @@
<%= 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..." } %>
<% end %>
diff --git a/lib/views/help/contact.nl.html.erb b/lib/views/help/contact.nl.html.erb
index 15c3e9b..9c4821b 100644
--- a/lib/views/help/contact.nl.html.erb
+++ b/lib/views/help/contact.nl.html.erb
@@ -87,7 +87,8 @@
<%= 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..." } %>
<% end %>