From bfdd6b92e633c609109ee8b0fb25e689ccd0a483 Mon Sep 17 00:00:00 2001 From: "GOV.UK Team" Date: Tue, 16 Oct 2012 10:55:05 +0100 Subject: [PATCH] GOV.UK is no longer a beta Remove all beta notices from GOV.UK including: - page titles - page header - the bottom of every page - welcome popup message --- app/assets/javascripts/welcome.js | 8 +++++--- app/views/root/_base.html.erb | 8 ++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index c483427a1..a701215dd 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -91,9 +91,11 @@ $(function() { } function showPopup() { - if (getUrlVar('nopopup') != "true") { - if(getCookie(activeCookieName()) != "dismiss"){ - BetaPopup.popup(popupCopy(), "welcome-tour"); + if(onDesignPrinciples()) { + if (getUrlVar('nopopup') != "true") { + if(getCookie(activeCookieName()) != "dismiss"){ + BetaPopup.popup(popupCopy(), "welcome-tour"); + } } } } diff --git a/app/views/root/_base.html.erb b/app/views/root/_base.html.erb index a42263339..272281223 100644 --- a/app/views/root/_base.html.erb +++ b/app/views/root/_base.html.erb @@ -5,7 +5,7 @@ - <%= content_for?(:title) ? yield(:title) : "GOV.UK - This is a trial ‘beta’ version of the UK government's official website" %> + <%= content_for?(:title) ? yield(:title) : "GOV.UK - The best place to find government services and information" %> <%= stylesheet_link_tag local_assigns[:css_file] || 'application' %> @@ -47,7 +47,7 @@