Skip to content

Commit 357780d

Browse files
Tristramgmuxator
Tristramg
authored and
muxator
committed
Display the version in the web interface
In the settings drop-down this adds an “About” section that also shows the commit if "exposeVersion" is set to true. Fixes ether#2968
1 parent 28a6f50 commit 357780d

File tree

4 files changed

+90
-75
lines changed

4 files changed

+90
-75
lines changed

‎settings.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
*/
410410

411411
/*
412-
* Expose Etherpad version in the Server http header.
412+
* Expose Etherpad version in the web interface and in the Server http header.
413413
*
414414
* Do not enable on production machines.
415415
*/

‎src/node/utils/Settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ exports.scrollWhenFocusLineIsOutOfViewport = {
292292
};
293293

294294
/*
295-
* Expose Etherpad version in the Server http header.
295+
* Expose Etherpad version in the web interface and in the Server http header.
296296
*
297297
* Do not enable on production machines.
298298
*/

‎src/static/css/pad.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,13 @@ input[type=checkbox] {
938938
outline: none;
939939
width: 120px;
940940
}
941+
.row {
942+
float: left;
943+
width: 100%;
944+
}
945+
.row + .row {
946+
margin-top: 15px;
947+
}
941948
.column {
942949
float: left;
943950
width:50%;

‎src/templates/pad.html

Lines changed: 81 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -127,80 +127,88 @@
127127

128128
<div id="settings" class="popup">
129129
<h1 data-l10n-id="pad.settings.padSettings"></h1>
130-
<div class="column">
131-
<% e.begin_block("mySettings"); %>
132-
<h2 data-l10n-id="pad.settings.myView"></h2>
133-
<p>
134-
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
135-
<label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
136-
</p>
137-
<p>
138-
<input type="checkbox" id="options-chatandusers" onClick="chat.chatAndUsers();">
139-
<label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
140-
</p>
141-
<p>
142-
<input type="checkbox" id="options-colorscheck">
143-
<label for="options-colorscheck" data-l10n-id="pad.settings.colorcheck"></label>
144-
</p>
145-
<p>
146-
<input type="checkbox" id="options-linenoscheck" checked>
147-
<label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label>
148-
</p>
149-
<p>
150-
<input type="checkbox" id="options-rtlcheck">
151-
<label for="options-rtlcheck" data-l10n-id="pad.settings.rtlcheck"></label>
152-
</p>
153-
<% e.end_block(); %>
154-
<table>
155-
<% e.begin_block("mySettings.dropdowns"); %>
156-
<tr>
157-
<td>
158-
<label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
159-
</td>
160-
<td>
161-
<select id="viewfontmenu">
162-
<option value="normal" data-l10n-id="pad.settings.fontType.normal"></option>
163-
<option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option>
164-
<option value="montserrat" data-l10n-id="pad.settings.fontType.montserrat"></option>
165-
<option value="opendyslexic" data-l10n-id="pad.settings.fontType.opendyslexic"></option>
166-
<option value="comicsans" data-l10n-id="pad.settings.fontType.comicsans"></option>
167-
<option value="georgia" data-l10n-id="pad.settings.fontType.georgia"></option>
168-
<option value="impact" data-l10n-id="pad.settings.fontType.impact"></option>
169-
<option value="lucida" data-l10n-id="pad.settings.fontType.lucida"></option>
170-
<option value="lucidasans" data-l10n-id="pad.settings.fontType.lucidasans"></option>
171-
<option value="palatino" data-l10n-id="pad.settings.fontType.palatino"></option>
172-
<option value="robotomono" data-l10n-id="pad.settings.fontType.robotomono"></option>
173-
<option value="tahoma" data-l10n-id="pad.settings.fontType.tahoma"></option>
174-
<option value="timesnewroman" data-l10n-id="pad.settings.fontType.timesnewroman"></option>
175-
<option value="trebuchet" data-l10n-id="pad.settings.fontType.trebuchet"></option>
176-
<option value="verdana" data-l10n-id="pad.settings.fontType.verdana"></option>
177-
<option value="symbol" data-l10n-id="pad.settings.fontType.symbol"></option>
178-
<option value="webdings" data-l10n-id="pad.settings.fontType.webdings"></option>
179-
<option value="wingdings" data-l10n-id="pad.settings.fontType.wingdings"></option>
180-
<option value="sansserif" data-l10n-id="pad.settings.fontType.sansserif"></option>
181-
<option value="serif" data-l10n-id="pad.settings.fontType.serif"></option>
182-
</select>
183-
</td>
184-
</tr>
185-
<tr>
186-
<td>
187-
<label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
188-
</td>
189-
<td>
190-
<select id="languagemenu">
191-
<% for (lang in langs) { %>
192-
<option value="<%=lang%>"><%=langs[lang].nativeName%></option>
193-
<% } %>
194-
</select>
195-
</td>
196-
</tr>
197-
<% e.end_block(); %>
198-
</table>
130+
<div class="row">
131+
<div class="column">
132+
<% e.begin_block("mySettings"); %>
133+
<h2 data-l10n-id="pad.settings.myView"></h2>
134+
<p>
135+
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
136+
<label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
137+
</p>
138+
<p>
139+
<input type="checkbox" id="options-chatandusers" onClick="chat.chatAndUsers();">
140+
<label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
141+
</p>
142+
<p>
143+
<input type="checkbox" id="options-colorscheck">
144+
<label for="options-colorscheck" data-l10n-id="pad.settings.colorcheck"></label>
145+
</p>
146+
<p>
147+
<input type="checkbox" id="options-linenoscheck" checked>
148+
<label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label>
149+
</p>
150+
<p>
151+
<input type="checkbox" id="options-rtlcheck">
152+
<label for="options-rtlcheck" data-l10n-id="pad.settings.rtlcheck"></label>
153+
</p>
154+
<% e.end_block(); %>
155+
<table>
156+
<% e.begin_block("mySettings.dropdowns"); %>
157+
<tr>
158+
<td>
159+
<label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
160+
</td>
161+
<td>
162+
<select id="viewfontmenu">
163+
<option value="normal" data-l10n-id="pad.settings.fontType.normal"></option>
164+
<option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option>
165+
<option value="montserrat" data-l10n-id="pad.settings.fontType.montserrat"></option>
166+
<option value="opendyslexic" data-l10n-id="pad.settings.fontType.opendyslexic"></option>
167+
<option value="comicsans" data-l10n-id="pad.settings.fontType.comicsans"></option>
168+
<option value="georgia" data-l10n-id="pad.settings.fontType.georgia"></option>
169+
<option value="impact" data-l10n-id="pad.settings.fontType.impact"></option>
170+
<option value="lucida" data-l10n-id="pad.settings.fontType.lucida"></option>
171+
<option value="lucidasans" data-l10n-id="pad.settings.fontType.lucidasans"></option>
172+
<option value="palatino" data-l10n-id="pad.settings.fontType.palatino"></option>
173+
<option value="robotomono" data-l10n-id="pad.settings.fontType.robotomono"></option>
174+
<option value="tahoma" data-l10n-id="pad.settings.fontType.tahoma"></option>
175+
<option value="timesnewroman" data-l10n-id="pad.settings.fontType.timesnewroman"></option>
176+
<option value="trebuchet" data-l10n-id="pad.settings.fontType.trebuchet"></option>
177+
<option value="verdana" data-l10n-id="pad.settings.fontType.verdana"></option>
178+
<option value="symbol" data-l10n-id="pad.settings.fontType.symbol"></option>
179+
<option value="webdings" data-l10n-id="pad.settings.fontType.webdings"></option>
180+
<option value="wingdings" data-l10n-id="pad.settings.fontType.wingdings"></option>
181+
<option value="sansserif" data-l10n-id="pad.settings.fontType.sansserif"></option>
182+
<option value="serif" data-l10n-id="pad.settings.fontType.serif"></option>
183+
</select>
184+
</td>
185+
</tr>
186+
<tr>
187+
<td>
188+
<label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
189+
</td>
190+
<td>
191+
<select id="languagemenu">
192+
<% for (lang in langs) { %>
193+
<option value="<%=lang%>"><%=langs[lang].nativeName%></option>
194+
<% } %>
195+
</select>
196+
</td>
197+
</tr>
198+
<% e.end_block(); %>
199+
</table>
200+
</div>
201+
<div class="column">
202+
<% e.begin_block("globalSettings"); %>
203+
<h2 data-l10n-id="pad.settings.globalView"></h2>
204+
<% e.end_block(); %>
205+
</div>
199206
</div>
200-
<div class="column">
201-
<% e.begin_block("globalSettings"); %>
202-
<h2 data-l10n-id="pad.settings.globalView"></h2>
203-
<% e.end_block(); %>
207+
<div class="row">
208+
<h2 data-l10n-id="pad.settings.about">About</h2>
209+
<span data-l10n-id="pad.settings.poweredBy">Powered by</span>
210+
<a href="http://etherpad.org">Etherpad-lite</a>
211+
<% if (settings.exposeVersion) { %>(commit <%=settings.getGitCommit()%>)<% } %>
204212
</div>
205213
</div>
206214

0 commit comments

Comments
 (0)