From 2fc441589f337193a6be41dd00c91ef012093ee1 Mon Sep 17 00:00:00 2001 From: Stefan Hacker Date: Sat, 1 Sep 2012 18:50:33 +0200 Subject: [PATCH] Add favicon/apple-touch-icon to all layouts --- app/views/layouts/application.html.erb | 2 ++ app/views/layouts/login.html.erb | 3 ++- app/views/layouts/mobile.m.erb | 10 ++++++---- app/views/layouts/scaffold.html.erb | 2 ++ app/views/layouts/standard.html.erb | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d29802cd..60e1c98b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,6 +5,8 @@ <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> + <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 4eb908d2..1322dd08 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -3,7 +3,8 @@ <%= stylesheet_link_tag "scaffold" %> - + <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> <%= @page_title -%> diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb index 22440793..b9d433e0 100644 --- a/app/views/layouts/mobile.m.erb +++ b/app/views/layouts/mobile.m.erb @@ -6,10 +6,12 @@ - - -<%= stylesheet_link_tag "mobile", :media => 'handheld,all' %> -<%= @page_title %> + + + <%= stylesheet_link_tag "mobile", :media => 'handheld,all' %> + <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> + <%= @page_title %> <% if current_user && !current_user.prefs.nil? -%>

<% if @down_count -%><%= @down_count %><% end -%> <%= diff --git a/app/views/layouts/scaffold.html.erb b/app/views/layouts/scaffold.html.erb index 1276a598..031d8a03 100644 --- a/app/views/layouts/scaffold.html.erb +++ b/app/views/layouts/scaffold.html.erb @@ -3,6 +3,8 @@ Login <%= stylesheet_link_tag "scaffold" %> + <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> <%= yield %> diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb index 39523908..2822122f 100644 --- a/app/views/layouts/standard.html.erb +++ b/app/views/layouts/standard.html.erb @@ -24,7 +24,8 @@ setup_periodic_check("<%=check_deferred_todos_path(:format => 'js')%>", 10*60, 'POST'); <%= generate_i18n_strings %> - + <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> <%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => t('layouts.next_actions_rss_feed')}) %> <%= @page_title %>