From 357780d573a055979ec3917d8b3a95ea9d55fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Mon, 15 Apr 2019 17:03:06 +0200 Subject: [PATCH] Display the version in the web interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the settings drop-down this adds an “About” section that also shows the commit if "exposeVersion" is set to true. Fixes #2968 --- settings.json.template | 2 +- src/node/utils/Settings.js | 2 +- src/static/css/pad.css | 7 ++ src/templates/pad.html | 154 +++++++++++++++++++------------------ 4 files changed, 90 insertions(+), 75 deletions(-) diff --git a/settings.json.template b/settings.json.template index efdb257db..fa1baa4b4 100644 --- a/settings.json.template +++ b/settings.json.template @@ -409,7 +409,7 @@ */ /* - * Expose Etherpad version in the Server http header. + * Expose Etherpad version in the web interface and in the Server http header. * * Do not enable on production machines. */ diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index cffb20cf0..23a792ffd 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -292,7 +292,7 @@ exports.scrollWhenFocusLineIsOutOfViewport = { }; /* - * Expose Etherpad version in the Server http header. + * Expose Etherpad version in the web interface and in the Server http header. * * Do not enable on production machines. */ diff --git a/src/static/css/pad.css b/src/static/css/pad.css index be8b1f0be..7d5985946 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -938,6 +938,13 @@ input[type=checkbox] { outline: none; width: 120px; } +.row { + float: left; + width: 100%; +} +.row + .row { + margin-top: 15px; +} .column { float: left; width:50%; diff --git a/src/templates/pad.html b/src/templates/pad.html index bee248f57..61b9f2268 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -127,80 +127,88 @@