75 files changed, 187 insertions, 42 deletions

diff --git a/assets/images/icon_application_octet-stream_large.png b/app/assets/images/content_type/icon_application_octet-stream_large.png
index 02347f1..02347f1 100644
--- a/assets/images/icon_application_octet-stream_large.png
+++ b/app/assets/images/content_type/icon_application_octet-stream_large.png
diff --git a/assets/images/icon_application_pdf_large.png b/app/assets/images/content_type/icon_application_pdf_large.png
index 1374851..1374851 100644
--- a/assets/images/icon_application_pdf_large.png
+++ b/app/assets/images/content_type/icon_application_pdf_large.png
diff --git a/assets/images/icon_application_rtf_large.png b/app/assets/images/content_type/icon_application_rtf_large.png
index fbed2e9..fbed2e9 100644
--- a/assets/images/icon_application_rtf_large.png
+++ b/app/assets/images/content_type/icon_application_rtf_large.png
diff --git a/assets/images/icon_application_vnd.ms-excel_large.png b/app/assets/images/content_type/icon_application_vnd.ms-excel_large.png
index 86e1ee4..86e1ee4 100644
--- a/assets/images/icon_application_vnd.ms-excel_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-excel_large.png
diff --git a/assets/images/icon_application_vnd.ms-powerpoint_large.png b/app/assets/images/content_type/icon_application_vnd.ms-powerpoint_large.png
index 6374b3b..6374b3b 100644
--- a/assets/images/icon_application_vnd.ms-powerpoint_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-powerpoint_large.png
diff --git a/assets/images/icon_application_vnd.ms-word_large.png b/app/assets/images/content_type/icon_application_vnd.ms-word_large.png
index 5a2916a..5a2916a 100644
--- a/assets/images/icon_application_vnd.ms-word_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-word_large.png
diff --git a/assets/images/icon_application_zip_large.png b/app/assets/images/content_type/icon_application_zip_large.png
index 042d8c7..042d8c7 100644
--- a/assets/images/icon_application_zip_large.png
+++ b/app/assets/images/content_type/icon_application_zip_large.png
diff --git a/assets/images/icon_image_bmp_large.png b/app/assets/images/content_type/icon_image_bmp_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_bmp_large.png
+++ b/app/assets/images/content_type/icon_image_bmp_large.png
diff --git a/assets/images/icon_image_gif_large.png b/app/assets/images/content_type/icon_image_gif_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_gif_large.png
+++ b/app/assets/images/content_type/icon_image_gif_large.png
diff --git a/assets/images/icon_image_img_large.png b/app/assets/images/content_type/icon_image_img_large.png
index 06e263d..06e263d 100644
--- a/assets/images/icon_image_img_large.png
+++ b/app/assets/images/content_type/icon_image_img_large.png
diff --git a/assets/images/icon_image_jpeg_large.png b/app/assets/images/content_type/icon_image_jpeg_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_jpeg_large.png
+++ b/app/assets/images/content_type/icon_image_jpeg_large.png
diff --git a/assets/images/icon_image_png_large.png b/app/assets/images/content_type/icon_image_png_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_png_large.png
+++ b/app/assets/images/content_type/icon_image_png_large.png
diff --git a/assets/images/icon_image_tiff_large.png b/app/assets/images/content_type/icon_image_tiff_large.png
index be2029a..be2029a 100644
--- a/assets/images/icon_image_tiff_large.png
+++ b/app/assets/images/content_type/icon_image_tiff_large.png
diff --git a/assets/images/icon_message_delivery-status_large.png b/app/assets/images/content_type/icon_message_delivery-status_large.png
index 8a895bc..8a895bc 100644
--- a/assets/images/icon_message_delivery-status_large.png
+++ b/app/assets/images/content_type/icon_message_delivery-status_large.png
diff --git a/assets/images/icon_text_html_large.png b/app/assets/images/content_type/icon_text_html_large.png
index f772ea3..f772ea3 100644
--- a/assets/images/icon_text_html_large.png
+++ b/app/assets/images/content_type/icon_text_html_large.png
diff --git a/assets/images/icon_text_plain_large.png b/app/assets/images/content_type/icon_text_plain_large.png
index fe31dc4..fe31dc4 100644
--- a/assets/images/icon_text_plain_large.png
+++ b/app/assets/images/content_type/icon_text_plain_large.png
diff --git a/assets/images/icon_text_x-vcard_large.png b/app/assets/images/content_type/icon_text_x-vcard_large.png
index 112ffb1..112ffb1 100644
--- a/assets/images/icon_text_x-vcard_large.png
+++ b/app/assets/images/content_type/icon_text_x-vcard_large.png
diff --git a/assets/images/icon_unknown.png b/app/assets/images/content_type/icon_unknown.png
index a10dd3d..a10dd3d 100644
--- a/assets/images/icon_unknown.png
+++ b/app/assets/images/content_type/icon_unknown.png
diff --git a/assets/images/hamburger.png b/app/assets/images/hamburger.png
index 0c44f63..0c44f63 100644
--- a/assets/images/hamburger.png
+++ b/app/assets/images/hamburger.png
diff --git a/assets/images/homepage-background-small.jpg b/app/assets/images/homepage-background-small.jpg
index 8b1d392..8b1d392 100644
--- a/assets/images/homepage-background-small.jpg
+++ b/app/assets/images/homepage-background-small.jpg
diff --git a/assets/images/homepage-background.jpg b/app/assets/images/homepage-background.jpg
index 8b1d392..8b1d392 100644
--- a/assets/images/homepage-background.jpg
+++ b/app/assets/images/homepage-background.jpg
diff --git a/assets/images/link-icon.png b/app/assets/images/link-icon.png
index 7a6dd01..7a6dd01 100644
--- a/assets/images/link-icon.png
+++ b/app/assets/images/link-icon.png
diff --git a/assets/images/link-icon@2.png b/app/assets/images/link-icon@2.png
index eafb1e2..eafb1e2 100644
--- a/assets/images/link-icon@2.png
+++ b/app/assets/images/link-icon@2.png
diff --git a/assets/images/logo-opengraph.png b/app/assets/images/logo-opengraph.png
index 4f495a5..4f495a5 100644
--- a/assets/images/logo-opengraph.png
+++ b/app/assets/images/logo-opengraph.png
diff --git a/assets/images/logo.png b/app/assets/images/logo.png
index 6f8e723..6f8e723 100644
--- a/assets/images/logo.png
+++ b/app/assets/images/logo.png
diff --git a/assets/images/logo@2.png b/app/assets/images/logo@2.png
index ab890df..ab890df 100644
--- a/assets/images/logo@2.png
+++ b/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
index e9ad9ea..e9ad9ea 100644
--- a/assets/images/navimg/logo-trans-small.png
+++ b/app/assets/images/navimg/logo-trans-small.png
diff --git a/assets/images/search.png b/app/assets/images/search.png
index ab38621..ab38621 100644
--- a/assets/images/search.png
+++ b/app/assets/images/search.png
diff --git a/assets/images/status/classification.png b/app/assets/images/status/classification.png
index 5ffd8af..5ffd8af 100644
--- a/assets/images/status/classification.png
+++ b/app/assets/images/status/classification.png
diff --git a/assets/images/status/classification@2x.png b/app/assets/images/status/classification@2x.png
index c5e9ba8..c5e9ba8 100644
--- a/assets/images/status/classification@2x.png
+++ b/app/assets/images/status/classification@2x.png
diff --git a/assets/images/status/delayed.png b/app/assets/images/status/delayed.png
index e2c3a29..e2c3a29 100644
--- a/assets/images/status/delayed.png
+++ b/app/assets/images/status/delayed.png
diff --git a/assets/images/status/delayed@2x.png b/app/assets/images/status/delayed@2x.png
index 9de5293..9de5293 100644
--- a/assets/images/status/delayed@2x.png
+++ b/app/assets/images/status/delayed@2x.png
diff --git a/assets/images/status/delivery_error.png b/app/assets/images/status/delivery_error.png
index cd93f43..cd93f43 100644
--- a/assets/images/status/delivery_error.png
+++ b/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
index 10fcb0e..10fcb0e 100644
--- a/assets/images/status/delivery_error@2x.png
+++ b/app/assets/images/status/delivery_error@2x.png
diff --git a/assets/images/status/locked.png b/app/assets/images/status/locked.png
index b932609..b932609 100644
--- a/assets/images/status/locked.png
+++ b/app/assets/images/status/locked.png
diff --git a/assets/images/status/locked@2x.png b/app/assets/images/status/locked@2x.png
index 5f4ac75..5f4ac75 100644
--- a/assets/images/status/locked@2x.png
+++ b/app/assets/images/status/locked@2x.png
diff --git a/assets/images/status/notheld.png b/app/assets/images/status/notheld.png
index 042ecb3..042ecb3 100644
--- a/assets/images/status/notheld.png
+++ b/app/assets/images/status/notheld.png
diff --git a/assets/images/status/notheld@2x.png b/app/assets/images/status/notheld@2x.png
index bf1c1e8..bf1c1e8 100644
--- a/assets/images/status/notheld@2x.png
+++ b/app/assets/images/status/notheld@2x.png
diff --git a/assets/images/status/overdue.png b/app/assets/images/status/overdue.png
index aa1a391..aa1a391 100644
--- a/assets/images/status/overdue.png
+++ b/app/assets/images/status/overdue.png
diff --git a/assets/images/status/overdue@2x.png b/app/assets/images/status/overdue@2x.png
index 96e3b95..96e3b95 100644
--- a/assets/images/status/overdue@2x.png
+++ b/app/assets/images/status/overdue@2x.png
diff --git a/assets/images/status/partiallysuccessful.png b/app/assets/images/status/partiallysuccessful.png
index 99cecad..99cecad 100644
--- a/assets/images/status/partiallysuccessful.png
+++ b/app/assets/images/status/partiallysuccessful.png
diff --git a/assets/images/status/partiallysuccessful@2x.png b/app/assets/images/status/partiallysuccessful@2x.png
index f429896..f429896 100644
--- a/assets/images/status/partiallysuccessful@2x.png
+++ b/app/assets/images/status/partiallysuccessful@2x.png
diff --git a/assets/images/status/postal.png b/app/assets/images/status/postal.png
index ff53de6..ff53de6 100644
--- a/assets/images/status/postal.png
+++ b/app/assets/images/status/postal.png
diff --git a/assets/images/status/postal@2x.png b/app/assets/images/status/postal@2x.png
index 51c4036..51c4036 100644
--- a/assets/images/status/postal@2x.png
+++ b/app/assets/images/status/postal@2x.png
diff --git a/assets/images/status/refused.png b/app/assets/images/status/refused.png
index b49f73f..b49f73f 100644
--- a/assets/images/status/refused.png
+++ b/app/assets/images/status/refused.png
diff --git a/assets/images/status/refused@2x.png b/app/assets/images/status/refused@2x.png
index ea18dff..ea18dff 100644
--- a/assets/images/status/refused@2x.png
+++ b/app/assets/images/status/refused@2x.png
diff --git a/assets/images/status/reported.png b/app/assets/images/status/reported.png
index c86c635..c86c635 100644
--- a/assets/images/status/reported.png
+++ b/app/assets/images/status/reported.png
diff --git a/assets/images/status/reported@2x.png b/app/assets/images/status/reported@2x.png
index 5aab446..5aab446 100644
--- a/assets/images/status/reported@2x.png
+++ b/app/assets/images/status/reported@2x.png
diff --git a/assets/images/status/review.png b/app/assets/images/status/review.png
index 95b9c31..95b9c31 100644
--- a/assets/images/status/review.png
+++ b/app/assets/images/status/review.png
diff --git a/assets/images/status/review@2x.png b/app/assets/images/status/review@2x.png
index 0f95e0d..0f95e0d 100644
--- a/assets/images/status/review@2x.png
+++ b/app/assets/images/status/review@2x.png
diff --git a/assets/images/status/successful.png b/app/assets/images/status/successful.png
index 097035d..097035d 100644
--- a/assets/images/status/successful.png
+++ b/app/assets/images/status/successful.png
diff --git a/assets/images/status/successful@2x.png b/app/assets/images/status/successful@2x.png
index f863675..f863675 100644
--- a/assets/images/status/successful@2x.png
+++ b/app/assets/images/status/successful@2x.png
diff --git a/assets/images/status/unusual.png b/app/assets/images/status/unusual.png
index 3a83785..3a83785 100644
--- a/assets/images/status/unusual.png
+++ b/app/assets/images/status/unusual.png
diff --git a/assets/images/status/unusual@2x.png b/app/assets/images/status/unusual@2x.png
index 07e0bd9..07e0bd9 100644
--- a/assets/images/status/unusual@2x.png
+++ b/app/assets/images/status/unusual@2x.png
diff --git a/assets/images/status/waiting.png b/app/assets/images/status/waiting.png
index a668f70..a668f70 100644
--- a/assets/images/status/waiting.png
+++ b/app/assets/images/status/waiting.png
diff --git a/assets/images/status/waiting@2x.png b/app/assets/images/status/waiting@2x.png
index 4e84eb9..4e84eb9 100644
--- a/assets/images/status/waiting@2x.png
+++ b/app/assets/images/status/waiting@2x.png
diff --git a/assets/images/status/withdrawn.png b/app/assets/images/status/withdrawn.png
index 1a68146..1a68146 100644
--- a/assets/images/status/withdrawn.png
+++ b/app/assets/images/status/withdrawn.png
diff --git a/assets/images/status/withdrawn@2x.png b/app/assets/images/status/withdrawn@2x.png
index f023e7a..f023e7a 100644
--- a/assets/images/status/withdrawn@2x.png
+++ b/app/assets/images/status/withdrawn@2x.png
diff --git a/assets/images/widget-base.png b/app/assets/images/widget-base.png
index 85a0eff..85a0eff 100644
--- a/assets/images/widget-base.png
+++ b/app/assets/images/widget-base.png
diff --git a/app/assets/stylesheets/responsive/_settings.scss b/app/assets/stylesheets/responsive/_settings.scss
new file mode 100644
index 0000000..015aece
--- /dev/null
+++ b/app/assets/stylesheets/responsive/_settings.scss
@@ -0,0 +1,53 @@
+$main_menu-mobile_menu_cutoff: 58em;
+$row-width: 64em;
+$body-font-family: "Helvetica Neue", Arial, Helvetica, Helmet, Freesans, sans-serif;
+$base-font-size: 16px;
+
+// Specify the filename and dimensions of your logo file here
+$logo-filename: 'logo.png';
+$logo-highdpi-filename: 'logo@2.png'; //Should be at least 2x the size, in the same proportions
+$logo-width: 275px;
+$logo-height: 44px;
+
+$color_sand: #f3f1eb;
+$color_black: #333333;
+$color_orange: #f4a140;
+$color_blue: #4faded;
+$color_green: #62b356;
+$color_yellow: #ffd836;
+$color_red: #e04b4b;
+$color_violet: #a94ca6;
+$color_purple: #5c377f;
+$color_white: #ffffff;
+$color_off_white: #f3f1eb;
+$color_light_grey: #e2dfd9;
+$color_mid_grey: #959287;
+$color_dark_grey: #6c6b68;
+
+$color_neutral_light: $color_sand;
+$color_neutral_dark: $color_black;
+$color_primary: $color_violet;
+$color_secondary: $color_orange;
+
+$body-bg: $color_neutral_light;
+
+$body-font-color: $color_neutral_dark;
+$link-color: darken($color_blue, 20%);
+$action-color: $color_green;
+$font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$form_input-bg: $color_white;
+$form-label-font-color: $color_black;
+
+$button-bg: darken($color_green, 10%);
+$button-color: $color_white;
+
+$status-success: darken($color_green, 18%);
+$status-failure: darken($color_red, 10%);
+$status-pending: darken($color_orange, 28%);
+
+$notice-color: $color_green;
+$error-color: $color_red;
+$action-color: $color_orange;
+
+$banner_inner_bg: $color_primary;
+$topnav_bg: darken($color_primary, 10%);
diff --git a/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
index d4d0aff..710a7ba 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/app/assets/stylesheets/responsive/custom.scss
@@ -32,6 +32,52 @@
   }
 }
 
+
+#navigation .more-menu {
+  background-color: #333;
+}
+
+.account-link:after {
+  position: relative;
+  top: -0.15em;
+  margin-left: 1em;
+  font-size: 0.5em;
+  content: "▼";
+}
+
+.logged-in-menu {
+  color: black;
+  box-shadow: 0 3px 15px 0 rgba(0, 0, 0, 0.1);
+}
+
+#navigation .logged-in-menu a,
+#navigation .logged-in-menu__signout-link a {
+  color: #197ace;
+  text-decoration: none;
+  transition: none;
+  &:hover {
+    color: #197ace;
+    background-color: transparent;
+    text-decoration: underline;
+  }
+}
+
+#navigation .logged-in-menu__signout-link a {
+  text-transform: uppercase;
+  font-weight: bold;
+  font-size: 0.8em;
+  color: #888;
+  &:hover {
+    color: #888;
+  }
+}
+
+.pro-pill {
+  color: #567386;
+  font-weight: 600;
+  background-color: #FFFF00;
+}
+
 /* General styles */
 body{
   background-color: $body-bg;
@@ -916,27 +962,15 @@ dt {
   }
 }
 
-.intro__title {
-  color: $color_white;
-  text-shadow: 0 1px 2px transparentize($color_black, 0.7);
-}
-
-.new-request__content {
-  background-color: $color_neutral_dark;
-  border-radius: 5px;
-  padding: 1.888888889em;
-}
-
-.new-request__title {
-  color: $color_white;
-  font-size: 1.4375em;
-  margin: 0 0 0.5em;
+// User menu
+.pro-pill {
+  background-color: desaturate(darken($color_secondary, 10%), 5%);
 }
 
-.new-request__description {
-  color: transparentize($color_white, 0.2);
-  @include ie8 {
-    color: $color_white;
+#logged_in_bar {
+  .logged-in-menu a,
+  .logged-in-menu__signout-link a {
+    color: $link-color;
   }
 }
 
diff --git a/assets/stylesheets/widget.scss b/app/assets/stylesheets/widget.scss
index e0fa302..e0fa302 100644
--- a/assets/stylesheets/widget.scss
+++ b/app/assets/stylesheets/widget.scss
diff --git a/assets/images/home-grad.png b/assets/images/home-grad.png
deleted file mode 100644
index ff9887a..0000000
--- a/assets/images/home-grad.png
+++ /dev/null
diff --git a/assets/images/locale-switcher.png b/assets/images/locale-switcher.png
deleted file mode 100644
index 850cb9a..0000000
--- a/assets/images/locale-switcher.png
+++ /dev/null
diff --git a/assets/images/old-logo.png b/assets/images/old-logo.png
deleted file mode 100644
index 8b88458..0000000
--- a/assets/images/old-logo.png
+++ /dev/null
diff --git a/assets/images/quote-marks.png b/assets/images/quote-marks.png
deleted file mode 100644
index e98f35c..0000000
--- a/assets/images/quote-marks.png
+++ /dev/null
diff --git a/assets/images/small-green-cross.png b/assets/images/small-green-cross.png
deleted file mode 100644
index 96ebac9..0000000
--- a/assets/images/small-green-cross.png
+++ /dev/null
diff --git a/assets/images/wordpress.png b/assets/images/wordpress.png
deleted file mode 100644
index 31955ac..0000000
--- a/assets/images/wordpress.png
+++ /dev/null
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index 668d92a..c472d34 100644
--- a/lib/alavetelitheme.rb
+++ b/lib/alavetelitheme.rb
@@ -39,11 +39,26 @@ $alaveteli_route_extensions << 'custom-routes.rb'
 ['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
 end
 
+# Append individual theme assets to the asset path
+theme_asset_path = File.join(File.dirname(__FILE__),
+                             '..',
+                             'app',
+                             'assets')
+theme_asset_path = Pathname.new(theme_asset_path).cleanpath.to_s
+
+LOOSE_THEME_ASSETS = lambda do |logical_path, filename|
+  filename.start_with?(theme_asset_path) &&
+  !['.js', '.css', ''].include?(File.extname(logical_path))
+end
+
+Rails.application.config.assets.precompile.unshift(LOOSE_THEME_ASSETS)
+
 # Tell FastGettext about the theme's translations: look in the theme's
 # locale-theme directory for a translation in the first place, and if
 # it isn't found, look in the Alaveteli locale directory next:
diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb
index 98fccf7..efbf95e 100644
--- a/lib/config/custom-routes.rb
+++ b/lib/config/custom-routes.rb
@@ -3,7 +3,7 @@
 
 Rails.application.routes.draw do
   # brand new controller example
-  # match '/mycontroller' => 'general#mycontroller'
+  # get '/mycontroller' => 'general#mycontroller'
   # Additional help page example
-  # match '/help/help_out' => 'help#help_out'
+  # get '/help/help_out' => 'help#help_out'
 end
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
deleted file mode 100644
index 66002c0..0000000
--- a/lib/views/general/_orglink.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%# Put the link to your organisation here, or leave blank %>
-<%= link_to image_tag('logo.png'), frontpage_path, :id=>'logo' %>
diff --git a/lib/views/help/about.html.erb b/lib/views/help/about.html.erb
index 36120f1..9f7d7d5 100644
--- a/lib/views/help/about.html.erb
+++ b/lib/views/help/about.html.erb
@@ -32,6 +32,34 @@
       it must be kept confidential.
     </dd>
 
+    <dt id="reporting">What if I see a request I feel to be inappropriate? <a href="#reporting">#</a></dt>
+    <dd>
+      <p>
+        Requests for personal information and vexatious requests are not considered valid for FOI purposes (read more).
+      </p>
+
+      <p>
+        If you believe a request is not suitable, you can report it for attention by the site administrators.
+      </p>
+    </dd>
+
+    <dt id="reporting_unavailable">Why won't it let me report some requests? <a href="#reporting_unavailable">#</a></dt>
+    <dd>
+      <p>
+        If a request has already been reported to the site administrators, you
+        can't report it a second time - this is to prevent the administrators
+        being notified multiple times about the same issue before they've had
+        a chance to conduct a review.
+      </p>
+
+      <p>
+        Where a request has been previously reported but an administrator has
+        chosen not to hide it from public view, you can use the form in the
+        sidebar of the request page to contact the administrators if you still
+        think it should be hidden.
+      </p>
+    </dd>
+
     <dt id="who">Who makes <%= site_name %> ? <a href="#who">#</a> </dt>
     <dd><%= site_name %> runs on <a href="http://alaveteli.org">Alaveteli</a>, which was created and run by <a href="http://www.mysociety.org">mySociety</a>,
       and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the
@@ -49,4 +77,4 @@
   <p><strong>Next</strong>, read about <a href="<%= help_requesting_path %>">making requests</a> --&gt;</p>
 
   <div id="hash_link_padding"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/views/help/contact.html.erb b/lib/views/help/contact.html.erb
index 21e5349..2072d0c 100644
--- a/lib/views/help/contact.html.erb
+++ b/lib/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", :disable_with => "Sending..." %>
+    <%= submit_tag "Send message to the charity", :data => { :disable_with => "Sending..." } %>
     &lt;-- we run this site, not the Government!
   </div>
 
diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb
index 5a0418f..f6be968 100644
--- a/lib/views/help/officers.html.erb
+++ b/lib/views/help/officers.html.erb
@@ -170,10 +170,13 @@
         responses to requests.  Please <a href="<%= help_contact_path %>">contact us</a> if we've
         missed one.
         For technical reasons we don't always remove them from attachments, such as certain PDFs.</p>
-      <p>If you need to know what an address was that we've removed, please <a
-        href="<%= help_contact_path %>">get in touch with us</a>. Occasionally, an email address
-        forms an important part of a response and we will post it up in an obscured
-        form in an annotation.
+    <p>If you need to know what an address was that we've removed, please <a
+      href="<%= help_contact_path %>">get in touch with us</a>.
+      <% if AlaveteliConfiguration::enable_annotations %>
+        Occasionally, an email address forms an important part of a response
+        and we will post it up in an obscured form in an annotation.
+      <% end %>
+    </p>
     </dd>
 
     <dt id="copyright"><a id="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
@@ -187,10 +190,19 @@
       requests, and for good public relations, we'd advise you not to do that.
     </dd>
 
+    <dt id="allowed_responses">My response to an old request on <%= site_name %> has been bounced!<a href="#allowed_responses">#</a> </dt>
+      <dd>After six months of inactivity, <%= site_name %> limits who can respond to a request to stop
+      spammers targeting old requests. At that point, the request can only be responded to by someone who's
+      from the authority. After twelve months, the request is closed to responses from anyone. If you need an
+      old request to be re-opened so that you can respond to it, please <a href="<%= help_contact_path %>">
+      contact us</a>.
+      </dd>
+
+
   </dl>
 
   <p><strong>If you haven't already</strong>, read <a href="<%= help_about_path %>">the introduction</a> --&gt;
     <br><strong>Otherwise</strong>, the <a href="<%= help_credits_path %>">credits</a> or the <a href="<%= help_api_path %>">programmers API</a> --&gt;
 
     <div id="hash_link_padding"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb
index ca6bff7..f85e817 100644
--- a/lib/views/help/requesting.html.erb
+++ b/lib/views/help/requesting.html.erb
@@ -91,9 +91,12 @@
         run your campaign, we encourage you to use it to get the information you
         need. We also encourage to run your campaign elsewhere - one effective
         and very easy way is to <%= link_to 'start your own blog',
-          "http://wordpress.com/"%>. You are welcome to link to your campaign
-          from this site in an annotation to your request (you can make
-          annotations after submitting the request).
+          "http://wordpress.com/"%>.
+        <% if AlaveteliConfiguration::enable_annotations %>
+          You are welcome to link to your campaign from this site in an
+          annotation to your request (you can make annotations after submitting
+          the request).
+        <% end %>
       </p>
 
     </dd>
@@ -266,20 +269,22 @@
       you can always make the same request again via <%= site_name %>.
     </dd>
 
-    <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
+    <% if AlaveteliConfiguration::enable_annotations %>
+      <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
 
-    <dd>
-      <p>Annotations on <%= site_name %> are to help
-        people get the information they want, or to give them pointers to places they
-        can go to help them act on it. We reserve the right to remove anything else.
-      </p>
-      <p>Endless, political discussions are not allowed.
-        Post a link to a suitable forum or campaign site elsewhere.</p>
       <dd>
+        <p>Annotations on <%= site_name %> are to help
+          people get the information they want, or to give them pointers to places they
+          can go to help them act on it. We reserve the right to remove anything else.
+        </p>
+        <p>Endless, political discussions are not allowed.
+          Post a link to a suitable forum or campaign site elsewhere.</p>
+      </dd>
+    <% end %>
 
   </dl>
 
   <p><strong>Next</strong>, read about <a href="<%= help_privacy_path %>">your privacy</a> --&gt;
 
     <div id="hash_link_padding"></div>
-</div>
\ No newline at end of file
+</div>