3 files changed, 41 insertions, 34 deletions

diff --git a/public/images/small-green-cross.png b/public/images/small-green-cross.png
new file mode 100644
index 000000000..5868f5775
--- /dev/null
+++ b/public/images/small-green-cross.png
diff --git a/public/javascripts/general.js b/public/javascripts/general.js
index 989907998..529bbeb04 100644
--- a/public/javascripts/general.js
+++ b/public/javascripts/general.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
         dataType: 'html',
         success: function(country_message){
         if (country_message != ''){
-      $('#other-country-notice').html(country_message);
+      $('#other-country-notice .popup-content').html(country_message);
       $('body:not(.front) #other-country-notice').show()
         }
     }
@@ -16,10 +16,17 @@ $(document).ready(function() {
      }
  }
 
- $('#other-country-notice').click(function() {
-   $('#other-country-notice').hide();
+ // popup messages
+ $('#other-country-notice .popup-close').click(function() {
+   $('#other-country-notice').hide('slow');
    $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'});
      });
+ $('#everypage .popup-close').click(function() {
+   $('#everypage').hide('slow');
+   $.cookie('seen_foi2', 1, { expires: 7, path: '/' });
+   return false;
+   });
+
  // "link to this" widget
      $('a.link_to_this').click(function() {
     var box = $('div#link_box');
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 21d0735e0..789bb442f 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -8,7 +8,6 @@ padding:0;
 }
 
 #banner {
-position:absolute;
 top:0;
 background-color:#F3F3F3;
 left:0;
@@ -121,7 +120,6 @@ clear:both;
 top:0;
 text-align:left;
 overflow:visible;
-padding-top:160px;
 width:900px;
 margin:0 auto 1.2em;
 }
@@ -719,28 +717,45 @@ margin:60px 0 0;
 padding:0.5em 0;
 }
 
-#everypage {
-background-color:#fc9;
-border:solid 2px #f60;
-border-top:none;
-opacity:0.97;
-border-bottom-left-radius:10px;
-border-bottom-right-radius:10px;
-position:fixed;
-width:70%;
-left:15%;
+.popup {
+background-color:#D5FFD8;
+border:solid 3px #16C132;
 z-index:2000;
-max-height:95%;
 overflow:auto;
-padding:4px;
+text-align:center;
+margin-top:2px;
+}
+
+.popup .popup-content{
+margin:0.5em;
+width: 95%;
+float: left;
+}
+
+.popup p {
+margin: 0;
 }
 
 #everypage h2,#everypage h3 {
 margin:0.5em 0;
 }
 
-#everypage .popup-close {
-  text-align: right;
+
+.popup .popup-close {
+color:#FFF;
+text-decoration:none;
+display:inline-block;
+border-radius:2px;
+-moz-border-radius:2px;
+cursor:pointer;
+background: url('/images/small-green-cross.png') no-repeat 0;
+width:15px;
+height:15px;
+border:solid 0 #FFF;
+text-indent:-999px;
+overflow:hidden;
+float:right;
+padding:10px 0;
 }
 
 #game_sidebar {
@@ -1568,17 +1583,6 @@ cursor:pointer;
 opacity:1;
 }
 
-#other-country-notice {
-background:#222;
-color:#FFF;
-font-size:1.1em;
-width:100%;
-z-index:999;
-display:block;
-position:absolute;
-top:0;
-opacity:0.9;
-}
 
 p.public-body-name-prefix {
 color:#888;
@@ -1587,10 +1591,6 @@ margin-bottom:-15px;
 font-size: 1.2em;
 }
 
-#other-country-notice a {
-color:#FFF;
-}
-
 .close-button {
 color:#FFF;
 text-decoration:none;