From aeb3abf1f3b53b9f2f431a5f16954f2d8cd0ccd3 Mon Sep 17 00:00:00 2001
From: Liang Ding <dl88250@gmail.com>
Date: Thu, 3 Dec 2015 09:29:57 +0800
Subject: [PATCH] =?UTF-8?q?favicon=20=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=20Server=20=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 andrea/macro-head.ftl     | 2 +-
 bruce/macro-head.ftl      | 2 +-
 classic/macro-head.ftl    | 2 +-
 community/macro-head.ftl  | 2 +-
 ease/macro-head.ftl       | 2 +-
 favourite/macro-head.ftl  | 2 +-
 finding/macro-head.ftl    | 2 +-
 i-nove/macro-head.ftl     | 2 +-
 metro-hot/macro-head.ftl  | 2 +-
 mobile/macro-head.ftl     | 2 +-
 neoease/macro-head.ftl    | 2 +-
 owmx-3.0/macro-head.ftl   | 2 +-
 timeline/macro-head.ftl   | 2 +-
 tree-house/macro-head.ftl | 2 +-
 yilia/macro-head.ftl      | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/andrea/macro-head.ftl b/andrea/macro-head.ftl
index 1797123..ca333cb 100644
--- a/andrea/macro-head.ftl
+++ b/andrea/macro-head.ftl
@@ -13,6 +13,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/bruce/macro-head.ftl b/bruce/macro-head.ftl
index d2b881b..e2280ae 100644
--- a/bruce/macro-head.ftl
+++ b/bruce/macro-head.ftl
@@ -12,6 +12,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/bootstrap${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/classic/macro-head.ftl b/classic/macro-head.ftl
index 934b256..ea864a8 100644
--- a/classic/macro-head.ftl
+++ b/classic/macro-head.ftl
@@ -11,6 +11,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/community/macro-head.ftl b/community/macro-head.ftl
index 934b256..ea864a8 100644
--- a/community/macro-head.ftl
+++ b/community/macro-head.ftl
@@ -11,6 +11,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/ease/macro-head.ftl b/ease/macro-head.ftl
index 18a1170..cdb9659 100644
--- a/ease/macro-head.ftl
+++ b/ease/macro-head.ftl
@@ -10,6 +10,6 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/favourite/macro-head.ftl b/favourite/macro-head.ftl
index 934b256..ea864a8 100644
--- a/favourite/macro-head.ftl
+++ b/favourite/macro-head.ftl
@@ -11,6 +11,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/finding/macro-head.ftl b/finding/macro-head.ftl
index 5f6313e..dc91646 100644
--- a/finding/macro-head.ftl
+++ b/finding/macro-head.ftl
@@ -12,6 +12,6 @@
 <link rel="stylesheet" type="text/css" href="//fonts.useso.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/i-nove/macro-head.ftl b/i-nove/macro-head.ftl
index 934b256..ea864a8 100644
--- a/i-nove/macro-head.ftl
+++ b/i-nove/macro-head.ftl
@@ -11,6 +11,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/metro-hot/macro-head.ftl b/metro-hot/macro-head.ftl
index a12b2e5..a42f650 100644
--- a/metro-hot/macro-head.ftl
+++ b/metro-hot/macro-head.ftl
@@ -13,6 +13,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}-responsive${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/mobile/macro-head.ftl b/mobile/macro-head.ftl
index b8bab88..6accda8 100644
--- a/mobile/macro-head.ftl
+++ b/mobile/macro-head.ftl
@@ -43,7 +43,7 @@ overflow: hidden;
 
 </style>
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n${miniPostfix}.js?${staticResourceVersion}'></script>
 <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
 <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script>
diff --git a/neoease/macro-head.ftl b/neoease/macro-head.ftl
index 769321e..7d29ede 100644
--- a/neoease/macro-head.ftl
+++ b/neoease/macro-head.ftl
@@ -10,6 +10,6 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/owmx-3.0/macro-head.ftl b/owmx-3.0/macro-head.ftl
index 8845f64..647278f 100644
--- a/owmx-3.0/macro-head.ftl
+++ b/owmx-3.0/macro-head.ftl
@@ -11,7 +11,7 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 <script type="text/javascript">
     (function() {
         if (! 
diff --git a/timeline/macro-head.ftl b/timeline/macro-head.ftl
index 769321e..7d29ede 100644
--- a/timeline/macro-head.ftl
+++ b/timeline/macro-head.ftl
@@ -10,6 +10,6 @@
 <meta http-equiv="Window-target" content="_top" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/tree-house/macro-head.ftl b/tree-house/macro-head.ftl
index 934b256..ea864a8 100644
--- a/tree-house/macro-head.ftl
+++ b/tree-house/macro-head.ftl
@@ -11,6 +11,6 @@
 <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file
diff --git a/yilia/macro-head.ftl b/yilia/macro-head.ftl
index 5f6313e..dc91646 100644
--- a/yilia/macro-head.ftl
+++ b/yilia/macro-head.ftl
@@ -12,6 +12,6 @@
 <link rel="stylesheet" type="text/css" href="//fonts.useso.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400" />
 <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
 <link href="${servePath}/blog-articles-rss.do" title="RSS" type="application/rss+xml" rel="alternate" />
-<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
 ${htmlHead}
 </#macro>
\ No newline at end of file