Show environment indicator

Gemfile

@@ -29,7 +29,7 @@ gem 'logstasher', '0.4.8'
 gem 'whenever', '0.9.0', require: false
 gem 'kaminari', '0.15.1'
 gem 'bootstrap-kaminari-views', '0.0.3'
-gem 'govuk_admin_template', '0.0.6'
+gem 'govuk_admin_template', '0.1.1'
 if ENV['API_DEV']
   gem "gds-api-adapters", :path => '../gds-api-adapters'
 else

Gemfile.lock

@@ -96,7 +96,7 @@ GEM
       zendesk_api (= 1.0.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    govuk_admin_template (0.0.6)
+    govuk_admin_template (0.1.1)
       bootstrap-sass (= 3.1.0)
       jquery-rails (= 3.0.4)
       rails (>= 3.2.0)
@@ -294,7 +294,7 @@ DEPENDENCIES
   gds-api-adapters (= 10.8.0)
   gds-sso (= 9.2.0)
   gds_zendesk (= 1.0.2)
-  govuk_admin_template (= 0.0.6)
+  govuk_admin_template (= 0.1.1)
   jquery-ui-rails (= 4.2.1)
   kaminari (= 0.15.1)
   logstasher (= 0.4.8)

app/views/layouts/application.html.erb

@@ -7,14 +7,19 @@
   <%= stylesheet_link_tag "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
-  <%= favicon_link_tag 'favicon.ico' %>
 
   <% # Google Analytics tracking, minified via http://mathiasbynens.be/notes/async-analytics-snippet %>
   <% if Rails.env.production? %>
     <script>var _gaq=[['_setAccount','UA-38052350-1'],['_trackPageview']];(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script'))</script>
   <% end %>
 <% end %>
 
+<% content_for :favicon do %>
+  <% environment_style = GovukAdminTemplate.environment_style %>
+  <%= favicon_link_tag environment_style ?
+        "favicon-#{environment_style}.png" : "favicon.png" %>
+<% end %>
+
 <% content_for :navbar_right do %>
   Hello, <%= link_to current_user.name, Plek.current.find('signon') %> &bull; <%= link_to 'Sign out', gds_sign_out_path %>
 <% end %>