[master][#1627][s]: Favicon fixed.

ckan/config/deployment.ini_tmpl

@@ -109,7 +109,7 @@ ckan.site_description =
 ckan.site_url =
 
 ## Favicon (default is the CKAN software favicon)
-ckan.favicon = http://assets.okfn.org/p/ckan/img/ckan.ico
+ckan.favicon = /images/icons/ckan.ico
 
 ## Solr support
 #solr_url = http://127.0.0.1:8983/solr

ckan/lib/app_globals.py

@@ -18,7 +18,7 @@ def __init__(self):
         """
         self.site_title = config.get('ckan.site_title', '')
         self.favicon = config.get('ckan.favicon',
-                                  'http://assets.okfn.org/p/ckan/img/ckan.ico')
+                                  '/images/icons/ckan.ico')
         self.site_logo = config.get('ckan.site_logo', '')
         self.site_url = config.get('ckan.site_url', '')
         self.site_url_nice = self.site_url.replace('http://','').replace('www.','')

ckan/templates/layout_base.html

@@ -17,7 +17,7 @@
   <meta name="author" content="" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link rel="shortcut icon" href="${g.site_url}/favicon.ico" />
+  <link rel="shortcut icon" href="${h.url_for(g.favicon)}" />
 
   <py:choose>
   <py:when test="defined('optional_feed')">

doc/configuration.rst

@@ -57,7 +57,7 @@ site_logo
 
 Example::
 
- ckan.site_logo=/images/ckan_logo_fullname_long.png
+ ckan.site_logo = /images/ckan_logo_fullname_long.png
 
 Default value:  (none)
 
@@ -70,6 +70,17 @@ This sets the logo used in the title bar.
 .. index::
    single: package_hide_extras
 
+favicon
+^^^^^^^
+
+Example::
+
+ ckan.favicon = http://okfn.org/wp-content/themes/okfn-master-wordpress-theme/images/favicon.ico
+
+Default value: ``/images/icons/ckan.ico``
+
+This sets the site's `favicon`. This icon is usually displayed by the browser in the tab heading and bookmark.
+
 site_about
 ^^^^^^^^^^