Merge branch 'master' of git.mysociety.org:/data/git/public/alaveteli

Conflicts:
	spec/controllers/api_controller_spec.rb

1 files changed, 8 insertions, 3 deletions

diff --git a/public/javascripts/general.js b/public/javascripts/general.js
index ab74cf318..9ae10593c 100644
--- a/public/javascripts/general.js
+++ b/public/javascripts/general.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
 		    }
 		}
 	    })
-	    
+
      }
  }
 
@@ -33,7 +33,7 @@ $(document).ready(function() {
 		  at: "left bottom",
 		  of:  this,
 		  collision: "fit" });
-	     
+
 	 });
      $('.close-button').click(function() { $(this).parent().hide() });
      $('div#variety-filter a').each(function() {
@@ -44,4 +44,9 @@ $(document).ready(function() {
 		     return false;
 		 })
 	 })
-})
\ No newline at end of file
+
+   if($.cookie('seen_foi2') == 1) {
+     $('#everypage').hide();
+   }
+
+})