Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #94 from alphagov/launch-govuk

Launch GOV.UK
  • Loading branch information...
commit 83247f2594fc16e86af5cfd4fb4ec61174e9fb17 2 parents 6829584 + bfdd6b9
James Stewart jystewart authored
8 app/assets/javascripts/welcome.js
View
@@ -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");
+ }
}
}
}
8 app/views/root/_base.html.erb
View
@@ -5,7 +5,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title><%= content_for?(:title) ? yield(:title) : "GOV.UK - This is a trial ‘beta’ version of the UK government's official website" %></title>
+ <title><%= content_for?(:title) ? yield(:title) : "GOV.UK - The best place to find government services and information" %></title>
<!--[if gt IE 8]><!--><%= stylesheet_link_tag local_assigns[:css_file] || 'application' %><!--<![endif]-->
<!--[if IE 6]><%= stylesheet_link_tag local_assigns[:css_file] || 'application-ie6' %><![endif]-->
@@ -47,7 +47,7 @@
<header role="banner" class="group" id="global-header">
<div class="header-wrapper group">
- <a href="/" title="Go to the gov.uk homepage" id="logo"><img src="<%= asset_path 'gov.uk_logotype_beta.png' %>" alt="GOV.UK Logo"></a>
+ <a href="/" title="Go to the gov.uk homepage" id="logo"><img src="<%= asset_path 'gov.uk_logotype.png' %>" alt="GOV.UK Logo"></a>
<a href="#search" class="button search-toggle">Search</a>
@@ -84,10 +84,6 @@
<footer class="group" id="footer" role="contentinfo">
- <div class="beta-notice">
- <p>This is a <a href="http://digital.cabinetoffice.gov.uk/2012/01/31/beta/">test website</a>, so may be inaccurate or misleading. The official websites remain <a href="http://www.direct.gov.uk">Directgov</a>, <a href="http://www.businesslink.gov.uk/">Business Link</a>, and the website of the <a href="http://www.cabinetoffice.gov.uk/content/list-government-departments-and-ministers">relevant government department or organisation</a></p>
- </div>
-
<div class="footer-wrapper">
<nav class="footer-categories">
<h2>Explore GOV.UK</h2>
Please sign in to comment.
Something went wrong with that request. Please try again.