diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js index e8d7795a..2840f82c 100644 --- a/src/node/hooks/express/specialpages.js +++ b/src/node/hooks/express/specialpages.js @@ -16,6 +16,13 @@ exports.expressCreateServer = function (hook_name, args, cb) { res.send(eejs.require("ep_etherpad-lite/templates/index.html")); }); + //serve javascript.html + args.app.get('/javascript', function(req, res) + { + res.send(eejs.require("ep_etherpad-lite/templates/javascript.html")); + }); + + //serve robots.txt args.app.get('/robots.txt', function(req, res) { diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index f6e9e29e..45755a49 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -20,5 +20,6 @@ +
JavaScript license information
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 5d39c388..8dd0bf88 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -41,5 +41,6 @@ +
JavaScript license information
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 71c4dbcc..0fff7843 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -112,5 +112,6 @@ +
JavaScript license information
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 560ac507..74f35521 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -50,5 +50,6 @@ +
JavaScript license information
diff --git a/src/templates/export_html.html b/src/templates/export_html.html index b8893b71..b29941c9 100644 --- a/src/templates/export_html.html +++ b/src/templates/export_html.html @@ -139,5 +139,6 @@ ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol > ol { <%- body %> +
JavaScript license information
diff --git a/src/templates/index.html b/src/templates/index.html index 0b0be79b..70478ea3 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -29,7 +29,7 @@ */ - + @@ -121,7 +121,7 @@ input[type="text"] { border-radius: 3px; box-sizing: border-box; - -moz-box-sizing: border-box; + -moz-box-sizing: border-box; line-height:36px; /* IE8 hack */ padding: 0px 45px 0 10px; *padding: 0; /* IE7 hack */ @@ -148,22 +148,22 @@ margin-top: 0; } #inner { - width: 95%; + width: 95%; } #label { text-align: center; } } - +
<% e.begin_block("indexWrapper"); %>
- -
- + + +
@@ -171,33 +171,35 @@
- +
JavaScript license information
diff --git a/src/templates/javascript.html b/src/templates/javascript.html new file mode 100644 index 00000000..29031c4b --- /dev/null +++ b/src/templates/javascript.html @@ -0,0 +1,73 @@ + + + + JavaScript license information + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
jquery-2.1.1.min.jsExpatjquery.js
html10n.jsExpathtml10n.js
l10n.jsApache-2.0-onlyl10n.js
socket.io.jsExpatsocket.io.js
require-kernel.jsExpatrequire-kernel.js
index.jsApache-2.0-onlyindex.js
timeslider.jsApache-2.0-onlytimeslider.js
pad.jsApache-2.0-onlypad.js
plugins.jsApache-2.0-onlyplugins.js
minify.json.jsExpatminify.json.js
settings.jsApache-2.0-onlysettings.js
jquery.autosize.jsExpatjquery.autosize.js
+ + diff --git a/src/templates/pad.html b/src/templates/pad.html index 767c1ec9..5f2d0328 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -350,6 +350,7 @@ <% e.begin_block("scripts"); %> @@ -378,6 +380,7 @@ +
JavaScript license information
<% e.end_block(); %> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index f52c0c50..f3fde6a4 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -230,6 +230,7 @@ <% e.end_block(); %> +
JavaScript license information
-