From cbbf318d7e5826f8e9bc06368353b6b9097f1315 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 5 Jun 2014 13:30:29 +0100 Subject: [PATCH 1/2] Upgrade admin to 0.1.1 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c4911c08d..f3ad104a7 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 36faec534..bd49904f2 100644 --- a/Gemfile.lock +++ b/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) From 7b3af25e5a0789cdd177aa39e2e28f3d4f2e62e4 Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Thu, 5 Jun 2014 13:30:50 +0100 Subject: [PATCH 2/2] Add custom Support favicons --- app/assets/images/favicon-development.png | Bin 0 -> 552 bytes app/assets/images/favicon-preview.png | Bin 0 -> 556 bytes app/assets/images/favicon-production.png | Bin 0 -> 551 bytes app/assets/images/favicon.png | Bin 0 -> 529 bytes app/views/layouts/application.html.erb | 7 ++++++- 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/favicon-development.png create mode 100644 app/assets/images/favicon-preview.png create mode 100644 app/assets/images/favicon-production.png create mode 100644 app/assets/images/favicon.png diff --git a/app/assets/images/favicon-development.png b/app/assets/images/favicon-development.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d88b0656dda27e9fd65c91fbd28f58ab42b4b6 GIT binary patch literal 552 zcmV+@0@wYCP)g*6-MbeqTzK>54YJ_UrAx`T;Q90C5L4d0 zd*|rn1QF!r;{yiH_wV1~b|@$+l4F6MzCPTD*|TS($@cX2!ezt4!pO0}-rgQ=#O~d@ zfeuHO1*WKa7=U|@Gz$cUgns<^0k`Ay>C^f7`6{Za)XWDnXU@b-IX7?K1SYM>s3-|Z zNlGmMmLwZCY`~R9KYsk!-P0o?DoSZa^Y!xs#=*~@KXGLR{280rqC!$i3K%TFz`1|_ zKAIhUeSK6e?5u5U4jnoKx8TyHOXOH^@ZiC>U;xZ+nB@Ub zIC&B|GJ#>ee*Jo2!bOhfKY#vU^&e4@EU%z&@7_H;#Wk>!D6goXC?5dxQ9)thJ&dFY z3?HCZOwG)wQ)L3O%1)H~SKXB;C{)309j)2Aj q4QHT{>2Nz3XlFVE(cTBNjspONN0vbyE-Fg^0000g*6-MbeqTzK>54YJ_UrAx`T;Q90C5L4d0 zd*|rn1QF!r;{yiH_wV1~b|@$+l4F6MzCPTD*|TS($@cX2!ezt4!pO0}-rgQ=#O~d@ zfeuHO1*WKa7=U|@Gz$cUgns<^0k`Ay>C^f7`6{Za)XWDnXU@b-IX7?K1SYM>s3-|Z zNlGmMmLwZCY`~R9KYsk!-P0o?DoSZa^Y!xs#=*~@KXGLR{280rqC!$i3K%TFz`1|_ zKAIhUeSK6e?5u5U4jnoKx8TyHOXOH^@ZiC>U;xZ+nB@Ub zIC&B|GJ#>ee*Jo2!bOhfKY#vU^&e4@EU%z&@7_H;#Wk>!D6goXC?5dxQ9)thJ&dFY z3?HCZOwG)wQ)L3O%1#eb4{XgjOf4@8R(LoQO u;SB!|y3@pTs2%PMG&CKIXzv4B#{mExt8ZBgny&i*0000g*6-MbeqTzK>54YJ_UrAx`T;Q90C5L4d0 zd*|rn1QF!r;{yiH_wV1~b|@$+l4F6MzCPTD*|TS($@cX2!ezt4!pO0}-rgQ=#O~d@ zfeuHO1*WKa7=U|@Gz$cUgns<^0k`Ay>C^f7`6{Za)XWDnXU@b-IX7?K1SYM>s3-|Z zNlGmMmLwZCY`~R9KYsk!-P0o?DoSZa^Y!xs#=*~@KXGLR{280rqC!$i3K%TFz`1|_ zKAIhUeSK6e?5u5U4jnoKx8TyHOXOH^@ZiC>U;xZ+nB@Ub zIC&B|GJ#>ee*Jo2!bOhfKY#vU^&e4@EU%z&@7_H;#Wk>!D6goXC?5dxQ9)thJ&dFY z3?HCZOwG)wQ)L3O%1sC-U9~hY2rvU;Q3pAX8 pMyA8Fj?-t(wyUuIiCOg`GeJeL`AZ^g2KIf_wW?gz)GULqJpA)0L(`Pg@yO- z-$yeV7(PI+n3|bUr^*Dzp{ACWyN5?|N=k5Wu#vGb@wMh?vt=Y$AVACJJJ4_dn#e-W TYCg$d00000NkvXXu0mjfs@nw3 literal 0 HcmV?d00001 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a9de7ac6e..4f0a3bf9e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,6 @@ <%= 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? %> @@ -15,6 +14,12 @@ <% 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') %> • <%= link_to 'Sign out', gds_sign_out_path %> <% end %>