NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Display the version in the web interface

Browse source 
In the settings drop-down this adds an “About” section that also shows
the commit if "exposeVersion" is set to true.

Fixes #2968
This commit is contained in:
Tristram Gräbener 2019-04-15 17:03:06 +02:00 committed by muxator
parent 28a6f505c5
commit 357780d573
4 changed files with 90 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings.json.template
View file

@ -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. * Do not enable on production machines.
*/ */

2
src/node/utils/Settings.js
View file

@ -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. * Do not enable on production machines.
*/ */

7
src/static/css/pad.css
View file

@ -938,6 +938,13 @@ input[type=checkbox] {
outline: none; outline: none;
width: 120px; width: 120px;
} }
.row {
float: left;
width: 100%;
}
.row + .row {
margin-top: 15px;
}
.column { .column {
float: left; float: left;
width:50%; width:50%;

154
src/templates/pad.html
View file

@ -127,80 +127,88 @@
<div id="settings" class="popup"> <div id="settings" class="popup">
<h1 data-l10n-id="pad.settings.padSettings"></h1> <h1 data-l10n-id="pad.settings.padSettings"></h1>
<div class="column"> <div class="row">
<% e.begin_block("mySettings"); %> <div class="column">
<h2 data-l10n-id="pad.settings.myView"></h2> <% e.begin_block("mySettings"); %>
<p> <h2 data-l10n-id="pad.settings.myView"></h2>
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();"> <p>
<label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label> <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
</p> <label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
<p> </p>
<input type="checkbox" id="options-chatandusers" onClick="chat.chatAndUsers();"> <p>
<label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label> <input type="checkbox" id="options-chatandusers" onClick="chat.chatAndUsers();">
</p> <label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
<p> </p>
<input type="checkbox" id="options-colorscheck"> <p>
<label for="options-colorscheck" data-l10n-id="pad.settings.colorcheck"></label> <input type="checkbox" id="options-colorscheck">
</p> <label for="options-colorscheck" data-l10n-id="pad.settings.colorcheck"></label>
<p> </p>
<input type="checkbox" id="options-linenoscheck" checked> <p>
<label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label> <input type="checkbox" id="options-linenoscheck" checked>
</p> <label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label>
<p> </p>
<input type="checkbox" id="options-rtlcheck"> <p>
<label for="options-rtlcheck" data-l10n-id="pad.settings.rtlcheck"></label> <input type="checkbox" id="options-rtlcheck">
</p> <label for="options-rtlcheck" data-l10n-id="pad.settings.rtlcheck"></label>
<% e.end_block(); %> </p>
<table> <% e.end_block(); %>
<% e.begin_block("mySettings.dropdowns"); %> <table>
<tr> <% e.begin_block("mySettings.dropdowns"); %>
<td> <tr>
<label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label> <td>
</td> <label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
<td> </td>
<select id="viewfontmenu"> <td>
<option value="normal" data-l10n-id="pad.settings.fontType.normal"></option> <select id="viewfontmenu">
<option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option> <option value="normal" data-l10n-id="pad.settings.fontType.normal"></option>
<option value="montserrat" data-l10n-id="pad.settings.fontType.montserrat"></option> <option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option>
<option value="opendyslexic" data-l10n-id="pad.settings.fontType.opendyslexic"></option> <option value="montserrat" data-l10n-id="pad.settings.fontType.montserrat"></option>
<option value="comicsans" data-l10n-id="pad.settings.fontType.comicsans"></option> <option value="opendyslexic" data-l10n-id="pad.settings.fontType.opendyslexic"></option>
<option value="georgia" data-l10n-id="pad.settings.fontType.georgia"></option> <option value="comicsans" data-l10n-id="pad.settings.fontType.comicsans"></option>
<option value="impact" data-l10n-id="pad.settings.fontType.impact"></option> <option value="georgia" data-l10n-id="pad.settings.fontType.georgia"></option>
<option value="lucida" data-l10n-id="pad.settings.fontType.lucida"></option> <option value="impact" data-l10n-id="pad.settings.fontType.impact"></option>
<option value="lucidasans" data-l10n-id="pad.settings.fontType.lucidasans"></option> <option value="lucida" data-l10n-id="pad.settings.fontType.lucida"></option>
<option value="palatino" data-l10n-id="pad.settings.fontType.palatino"></option> <option value="lucidasans" data-l10n-id="pad.settings.fontType.lucidasans"></option>
<option value="robotomono" data-l10n-id="pad.settings.fontType.robotomono"></option> <option value="palatino" data-l10n-id="pad.settings.fontType.palatino"></option>
<option value="tahoma" data-l10n-id="pad.settings.fontType.tahoma"></option> <option value="robotomono" data-l10n-id="pad.settings.fontType.robotomono"></option>
<option value="timesnewroman" data-l10n-id="pad.settings.fontType.timesnewroman"></option> <option value="tahoma" data-l10n-id="pad.settings.fontType.tahoma"></option>
<option value="trebuchet" data-l10n-id="pad.settings.fontType.trebuchet"></option> <option value="timesnewroman" data-l10n-id="pad.settings.fontType.timesnewroman"></option>
<option value="verdana" data-l10n-id="pad.settings.fontType.verdana"></option> <option value="trebuchet" data-l10n-id="pad.settings.fontType.trebuchet"></option>
<option value="symbol" data-l10n-id="pad.settings.fontType.symbol"></option> <option value="verdana" data-l10n-id="pad.settings.fontType.verdana"></option>
<option value="webdings" data-l10n-id="pad.settings.fontType.webdings"></option> <option value="symbol" data-l10n-id="pad.settings.fontType.symbol"></option>
<option value="wingdings" data-l10n-id="pad.settings.fontType.wingdings"></option> <option value="webdings" data-l10n-id="pad.settings.fontType.webdings"></option>
<option value="sansserif" data-l10n-id="pad.settings.fontType.sansserif"></option> <option value="wingdings" data-l10n-id="pad.settings.fontType.wingdings"></option>
<option value="serif" data-l10n-id="pad.settings.fontType.serif"></option> <option value="sansserif" data-l10n-id="pad.settings.fontType.sansserif"></option>
</select> <option value="serif" data-l10n-id="pad.settings.fontType.serif"></option>
</td> </select>
</tr> </td>
<tr> </tr>
<td> <tr>
<label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label> <td>
</td> <label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
<td> </td>
<select id="languagemenu"> <td>
<% for (lang in langs) { %> <select id="languagemenu">
<option value="<%=lang%>"><%=langs[lang].nativeName%></option> <% for (lang in langs) { %>
<% } %> <option value="<%=lang%>"><%=langs[lang].nativeName%></option>
</select> <% } %>
</td> </select>
</tr> </td>
<% e.end_block(); %> </tr>
</table> <% e.end_block(); %>
</table>
</div>
<div class="column">
<% e.begin_block("globalSettings"); %>
<h2 data-l10n-id="pad.settings.globalView"></h2>
<% e.end_block(); %>
</div>
</div> </div>
<div class="column"> <div class="row">
<% e.begin_block("globalSettings"); %> <h2 data-l10n-id="pad.settings.about">About</h2>
<h2 data-l10n-id="pad.settings.globalView"></h2> <span data-l10n-id="pad.settings.poweredBy">Powered by</span>
<% e.end_block(); %> <a href="http://etherpad.org">Etherpad-lite</a>
<% if (settings.exposeVersion) { %>(commit <%=settings.getGitCommit()%>)<% } %>
</div> </div>
</div> </div>