Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop

Conflicts:
	app/models/request_mailer.rb

1 files changed, 22 insertions, 0 deletions

diff --git a/public/javascripts/general.js b/public/javascripts/general.js
new file mode 100644
index 000000000..ed5095f82
--- /dev/null
+++ b/public/javascripts/general.js
@@ -0,0 +1,22 @@
+$(document).ready(function() {
+ if(window.location.search.substring(1).search("country_name") == -1) {
+    if (!$.cookie('has_seen_country_message')) {
+	$.ajax({
+		url: "/country_message",
+		    dataType: 'html',
+		    success: function(country_message){
+		    if (country_message != ''){
+			$('#other-country-notice').html(country_message);
+			$('body:not(.front) #other-country-notice').show()
+		    }
+		}
+	    })
+	    
+     }
+ }
+
+ $('#other-country-notice').click(function() {
+	 $('#other-country-notice').hide();
+	 $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'});
+     })
+})
\ No newline at end of file