summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-07-29 14:58:33 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-07-29 14:58:33 +0000
commit5f20bc240ee190985393c46f4e281792856bc380 (patch)
tree78359a66c9946b53e3e38dac30c269346619f2fa
parent2a85a1cebf149aa5b4b85f7266f5c8f7c4be4b84 (diff)
downloadredmine-5f20bc240ee190985393c46f4e281792856bc380.tar.gz
redmine-5f20bc240ee190985393c46f4e281792856bc380.zip
Add a favicon link with support for suburi. #3301
Contributed by Yuki Kita and Christian Boenning git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3894 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--app/views/layouts/base.rhtml1
2 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 054bac8af..4d698a234 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -783,6 +783,10 @@ module ApplicationHelper
end
end
+ def favicon
+ "<link rel='shortcut icon' href='#{Redmine::Utils.relative_url_root}/favicon.ico' />"
+ end
+
private
def wiki_helper
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 1873191c0..9521457d6 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -5,6 +5,7 @@
<title><%=h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
+<%= favicon %>
<%= stylesheet_link_tag 'application', :media => 'all' %>
<%= javascript_include_tag :defaults %>
<%= heads_for_wiki_formatter %>