From 0fef583fb000eeb438d252b31782d85d2be38b64 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sun, 25 Nov 2012 22:44:29 +0100 Subject: [PATCH 1/5] fix connectingbar.gif path --- src/templates/pad.html | 2 +- src/templates/timeslider.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 3f3eee4f1..ed98a2e7f 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -285,7 +285,7 @@

-

+

diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index dfeee16c7..0ed09c339 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -117,7 +117,7 @@

-

+

From 335dc7fd569825249dd58e29f49663cbfd0d8d0a Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sun, 25 Nov 2012 22:51:22 +0100 Subject: [PATCH 2/5] reverted wrong patch in pad.html --- src/templates/pad.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index ed98a2e7f..3f3eee4f1 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -285,7 +285,7 @@

-

+

From 2babccc9314a5d9e2f18cc4401134eae4bdb0bf0 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sun, 25 Nov 2012 23:49:13 +0100 Subject: [PATCH 3/5] partial rerevert --- src/templates/pad.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 3f3eee4f1..ed98a2e7f 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -285,7 +285,7 @@

-

+

From 984c18904d71bf33145fe61acbdedbf6a4690caf Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sat, 1 Dec 2012 10:32:48 +0100 Subject: [PATCH 4/5] fix 1236 favicon url --- src/node/utils/Settings.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index fb2a592cb..05e4f349a 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -38,8 +38,6 @@ 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 @@ -169,6 +167,20 @@ exports.reloadSettings = function reloadSettings() { } } + var favicon = exports.favicon; + if (favicon.match(/^https?:\/\//i)) + { + settings.faviconPad = favicon; + settings.faviconTimeslider = favicon; + }else + { + settings.faviconPad = "../" + favicon; + settings.faviconTimeslider = "../../" + favicon; + } + exports.faviconPad = settings.faviconPad; + exports.faviconTimeslider = settings.faviconTimeslider; + + if(exports.dbType === "dirty"){ console.warn("DirtyDB is used. This is fine for testing but not recommended for production.") } From 04e9c8159f31ee0a7a7b764f487642c8ec11e081 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Sat, 1 Dec 2012 10:38:59 +0100 Subject: [PATCH 5/5] path correction --- src/templates/pad.html | 2 +- src/templates/timeslider.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 78605657b..c1300d5e3 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -285,7 +285,7 @@

-

+

diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index f785dbf75..281fa01b9 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -117,7 +117,7 @@

-

+