mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

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

Browse source 
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
commit 28bcdcec25
6 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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