Merge branch 'develop'

assets/stylesheets/responsive/custom.scss → app/assets/stylesheets/responsive/custom.scss

@@ -629,7 +629,7 @@ a.link_button_green_large {
 }
 
 .banner--pro .site-title__logo {
-  background-image: image-url("alaveteli_professional/wdtk-logo-white.png");
+  background-image: image-url("alaveteli-pro/wdtk-logo-white.png");
   width: 198px;
   height: 18px;
   background-size: 198px 18px;
@@ -639,7 +639,7 @@ a.link_button_green_large {
     background-size: 231px 21px;
   }
   @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
-    background-image: image-url("alaveteli_professional/[email protected]");
+    background-image: image-url("alaveteli-pro/[email protected]");
   }
 }
 

lib/alavetelitheme.rb

@@ -19,6 +19,7 @@ def set_whatdotheyknow_view_paths
 ['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/wdtk-routes.rb

@@ -1,13 +1,13 @@
 # Here you can override or add to the pages in the core website
 
 Rails.application.routes.draw do
-    # Add a route for the survey
-    scope '/profile/survey' do
-        root :to => 'user#survey', :as => :survey
-        match '/reset' => 'user#survey_reset', :as => :survey_reset
-    end
+  # Add a route for the survey
+  scope '/profile/survey' do
+    root :to => 'user#survey', :as => :survey
+    get '/reset' => 'user#survey_reset', :as => :survey_reset
+  end
 
-    match "/help/ico-guidance-for-authorities" => redirect("https://ico.org.uk/media/for-organisations/documents/how-to-disclose-information-safely-removing-personal-data-from-information-requests-and-datasets/1432979/how-to-disclose-information-safely.pdf
-"),
-    	:as => :ico_guidance
+  get "/help/ico-guidance-for-authorities" => redirect("https://ico.org.uk/media/for-organisations/documents/how-to-disclose-information-safely-removing-personal-data-from-information-requests-and-datasets/1432979/how-to-disclose-information-safely.pdf
+  "),
+  :as => :ico_guidance
 end

lib/views/help/_contact_form.html.erb

@@ -64,7 +64,7 @@
             }
         //--></script>
         <%= hidden_field_tag(:submitted_contact_form, 1) %>
-        <%= submit_tag "Send message to WhatDoTheyKnow volunteers", :disable_with => "Sending..." %>
+        <%= submit_tag "Send message to WhatDoTheyKnow volunteers", :data => { :disable_with => "Sending..." } %>
     </div>
 
 <% end %>

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

@@ -84,7 +84,7 @@ neu anfonwch e-bost at <a href="mailto:<%=@contact_email%>"><%=@contact_email%><
 
     <div class="form_button">
         <%= hidden_field_tag(:submitted_contact_form, 1) %>
-        <%= submit_tag "Anfonwch neges i'r elusen", :disable_with => "Anfon..." %>
+        <%= submit_tag "Anfonwch neges i'r elusen", :data => { :disable_with => "Anfon..." } %>
         &lt;- Ni sy'n cynnal y wefan hon, nid y Llywodraeth!
     </div>
 

lib/views/request/select_authority.html.erb

@@ -21,6 +21,7 @@
 <h1><%= _('Find an authority') %></h1>
 
 <div id="authority_selection" class="authority_selection">
+  <%# This view is rendered from multiple urls, hence why the form action is blank %>
   <%= form_tag "", { :id => 'search_form', :method => 'get' } do %>
     <div>
       <p>