fix ether#377: add favicon url as optional settings.json parameter

BlendedLearningCollaborative · Nov 4, 2012 · c92b528 · c92b528
1 parent 0fa2526
commit c92b528
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/settings.json.template b/settings.json.template
@@ -6,6 +6,10 @@
 {
   // Name your instance!
   "title": "Etherpad Lite",
+
+  // favicon default name
+  // alternatively, set up a fully specified Url to your own favicon
+  "favicon": "favicon.ico",
 
   //Ip and port which etherpad should bind at
   "ip": "0.0.0.0",

diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
@@ -24,8 +24,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     });
   });
 
-  //serve favicon.ico
-  args.app.get('/favicon.ico', function(req, res)
+  //serve favicon.ico from all path levels
+  args.app.get( /\/favicon.ico$/, function(req, res)
   {
     var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico");
     res.sendfile(filePath, function(err)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
@@ -34,6 +34,11 @@ exports.root = path.normalize(path.join(npm.dir, ".."));
  */
 exports.title = "Etherpad Lite";
 
+/**
+ * The app favicon fully specified url, visible e.g. in the browser window
+ */
+exports.favicon = "favicon.ico";
+
 /**
  * The IP ep-lite should listen to
  */

diff --git a/src/templates/index.html b/src/templates/index.html
@@ -32,7 +32,7 @@
         <meta charset="utf-8"> 
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
-        <link rel="shortcut icon" href="favicon.ico">
+        <link rel="shortcut icon" href="<%=settings.favicon%>">
 
         <style>
             html, body {

diff --git a/src/templates/pad.html b/src/templates/pad.html
@@ -32,7 +32,7 @@
         <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="../favicon.ico">
+        <link rel="shortcut icon" href="<%=settings.favicon%>">
 
         <% e.begin_block("styles"); %>
         <link href="../static/css/pad.css" rel="stylesheet">

diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
@@ -30,7 +30,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="robots" content="noindex, nofollow">
-  <link rel="shortcut icon" href="../../favicon.ico">
+  <link rel="shortcut icon" href="<%=settings.favicon%>">
   <link rel="stylesheet" href="../../static/css/pad.css">
   <link rel="stylesheet" href="../../static/css/timeslider.css">
   <link rel="stylesheet" href="../../static/custom/timeslider.css">