Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
@@ -91,9 +91,11 @@ $(function() {
91 91 }
92 92
93 93 function showPopup() {
94   - if (getUrlVar('nopopup') != "true") {
95   - if(getCookie(activeCookieName()) != "dismiss"){
96   - BetaPopup.popup(popupCopy(), "welcome-tour");
  94 + if(onDesignPrinciples()) {
  95 + if (getUrlVar('nopopup') != "true") {
  96 + if(getCookie(activeCookieName()) != "dismiss"){
  97 + BetaPopup.popup(popupCopy(), "welcome-tour");
  98 + }
97 99 }
98 100 }
99 101 }
8 app/views/root/_base.html.erb
@@ -5,7 +5,7 @@
5 5 <head>
6 6 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
7 7
8   - <title><%= content_for?(:title) ? yield(:title) : "GOV.UK - This is a trial ‘beta’ version of the UK government's official website" %></title>
  8 + <title><%= content_for?(:title) ? yield(:title) : "GOV.UK - The best place to find government services and information" %></title>
9 9
10 10 <!--[if gt IE 8]><!--><%= stylesheet_link_tag local_assigns[:css_file] || 'application' %><!--<![endif]-->
11 11 <!--[if IE 6]><%= stylesheet_link_tag local_assigns[:css_file] || 'application-ie6' %><![endif]-->
@@ -47,7 +47,7 @@
47 47
48 48 <header role="banner" class="group" id="global-header">
49 49 <div class="header-wrapper group">
50   - <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>
  50 + <a href="/" title="Go to the gov.uk homepage" id="logo"><img src="<%= asset_path 'gov.uk_logotype.png' %>" alt="GOV.UK Logo"></a>
51 51
52 52 <a href="#search" class="button search-toggle">Search</a>
53 53
@@ -84,10 +84,6 @@
84 84
85 85 <footer class="group" id="footer" role="contentinfo">
86 86
87   - <div class="beta-notice">
88   - <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>
89   - </div>
90   -
91 87 <div class="footer-wrapper">
92 88 <nav class="footer-categories">
93 89 <h2>Explore GOV.UK</h2>

0 comments on commit 83247f2

Please sign in to comment.
Something went wrong with that request. Please try again.