libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter 

fix #377: add favicon url as optional settings.json parameter
This commit is contained in:
John McLear 2012-11-06 03:08:25 -08:00
parent 6f1bab5faf a575de7884
commit 28bcdcec25
6 changed files with 26 additions and 16 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!
"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",

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

@ -24,8 +24,20 @@ exports.expressCreateServer = function (hook_name, args, cb) {
});
});
//serve favicon.ico
args.app.get('/favicon.ico', function(req, res)
//serve pad.html under /p
args.app.get('/p/:pad', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {req: req}));
});
//serve timeslider.html under /p/$padname/timeslider
args.app.get('/p/:pad/timeslider', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req}));
});
//serve favicon.ico from all path levels except as a pad name
args.app.get( /\/favicon.ico$/, function(req, res)
{
var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico");
res.sendfile(filePath, function(err)
@ -39,16 +51,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
});
});
//serve pad.html under /p
args.app.get('/p/:pad', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {req: req}));
});
//serve timeslider.html under /p/$padname/timeslider
args.app.get('/p/:pad/timeslider', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req}));
});
}

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

@ -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
*/

2
src/templates/index.html
View File

@ -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 {

2
src/templates/pad.html
View File

@ -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">

2
src/templates/timeslider.html
View File

@ -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">