Browse Source

Change USE_FAVICON to USE_SHORTCUT_ICONS

Talha Mansoor 11 years ago
parent
commit
b94caa1894
3 changed files with 7 additions and 6 deletions
  1. 2 1
      RELEASE_NOTES.md
  2. 3 3
      templates/_includes/_defaults.html
  3. 2 2
      templates/_includes/favicon_links.html

+ 2 - 1
RELEASE_NOTES.md

@@ -23,7 +23,8 @@ Performance
 
 * Performance improvement- 4x faster output
 * Reduce number of HTTP requests using `assets` plugin
-* Favicon is disabled by default. Set `USE_FAVICON` to true to enable it
+* Shortcut icons, like favicon, are disabled by default. Set
+  `USE_SHORTCUT_ICONS` to true to enable it
 
 Visual Style
 ------------

+ 3 - 3
templates/_includes/_defaults.html

@@ -108,10 +108,10 @@ search results and social media #}
 {# Set it to True to display favicon and speed dial icon. Also make sure that
 you have placed images in the appropriate directory and defined STATIC_PATHS
 accordingly #}
-{% if not USE_FAVICON %}
-{% set USE_FAVICON = False %}
+{% if not USE_SHORTCUT_ICONS %}
+{% set USE_SHORTCUT_ICONS = False %}
 {% else %}
-{% set USE_FAVICON = USE_FAVICON %}
+{% set USE_SHORTCUT_ICONS = USE_SHORTCUT_ICONS %}
 {% endif %}
 
 {# It is a dictionary with two keys: title, details. Value of each key is a

+ 2 - 2
templates/_includes/favicon_links.html

@@ -1,5 +1,5 @@
-{% from '_includes/_defaults.html' import USE_FAVICON with context %}
-{%if USE_FAVICON == True %}
+{% from '_includes/_defaults.html' import USE_SHORTCUT_ICONS with context %}
+{%if USE_SHORTCUT_ICONS == True %}
         <link rel="shortcut icon" href="{{ SITEURL }}/theme/images/favicon.ico" type="image/x-icon" type="image/png" />
         {# Opera Speed Dial Icon #}
         {# See https://github.com/operasoftware/devopera-static-backup/blob/master/http/dev.opera.com/articles/view/opera-speed-dial-enhancements/index.html #}