public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/1124/head
Wikinaut 2012-11-04 11:26:17 +01:00
parent 0fa25264bc
commit c92b5283fd
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings.json.template
View File

@ -6,6 +6,10 @@
{ {
// Name your instance! // Name your instance!
"title": "Etherpad Lite", "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 and port which etherpad should bind at
"ip": "0.0.0.0", "ip": "0.0.0.0",

4
src/node/hooks/express/specialpages.js
View File

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

5
src/node/utils/Settings.js
View File

@ -34,6 +34,11 @@ exports.root = path.normalize(path.join(npm.dir, ".."));
*/ */
exports.title = "Etherpad Lite"; 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 * The IP ep-lite should listen to
*/ */

2
src/templates/index.html
View File

@ -32,7 +32,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> <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> <style>
html, body { html, body {

2
src/templates/pad.html
View File

@ -32,7 +32,7 @@
<meta name="robots" content="noindex, nofollow"> <meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"> <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"); %> <% e.begin_block("styles"); %>
<link href="../static/css/pad.css" rel="stylesheet"> <link href="../static/css/pad.css" rel="stylesheet">

2
src/templates/timeslider.html
View File

@ -30,7 +30,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="robots" content="noindex, nofollow"> <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/pad.css">
<link rel="stylesheet" href="../../static/css/timeslider.css"> <link rel="stylesheet" href="../../static/css/timeslider.css">
<link rel="stylesheet" href="../../static/custom/timeslider.css"> <link rel="stylesheet" href="../../static/custom/timeslider.css">