diff options
| author | John McLear <john@mclear.co.uk> | 2012-11-30 22:50:54 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-11-30 22:50:54 +0000 |
| commit | d76100358840e24079a523b7b9c8d135370878ef (patch) | |
| tree | 47af5acb4defbb262f9c945b178bccc770f0918c /src | |
| parent | ab148ebc1afd91e34430e4d8812ab21c31156efc (diff) | |
| download | etherpad-lite-d76100358840e24079a523b7b9c8d135370878ef.zip | |
fix path to favicon resolves #1236
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/utils/Settings.js | 2 | ||||
| -rw-r--r-- | src/templates/pad.html | 2 | ||||
| -rw-r--r-- | src/templates/timeslider.html | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 9caa2b0b..fb2a592c 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -38,6 +38,8 @@ exports.title = "Etherpad Lite"; * The app favicon fully specified url, visible e.g. in the browser window */ exports.favicon = "favicon.ico"; +exports.faviconPad = "../" + exports.favicon; +exports.faviconTimeslider = "../../" + exports.favicon; /** * The IP ep-lite should listen to diff --git a/src/templates/pad.html b/src/templates/pad.html index 3f3eee4f..c1300d5e 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -32,7 +32,7 @@ <meta charset="utf-8"> <meta name="robots" content="noindex, nofollow"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> - <link rel="shortcut icon" href="<%=settings.favicon%>"> + <link rel="shortcut icon" href="<%=settings.faviconPad%>"> <link rel="resource" type="application/l10n" href="../locales.ini" /> <script type="text/javascript"> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index dfeee16c..281fa01b 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -31,7 +31,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex, nofollow"> - <link rel="shortcut icon" href="<%=settings.favicon%>"> + <link rel="shortcut icon" href="<%=settings.faviconTimeslider%>"> <link rel="resource" type="application/l10n" href="../../locales.ini" /> <script type="text/javascript"> |