Index: lams_build/conf/etherpad/etherpad-lite/settings.json =================================================================== diff -u -r6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987 -r62e3273274a51b2dc8699e6ddf507d61e1b2c665 --- lams_build/conf/etherpad/etherpad-lite/settings.json (.../settings.json) (revision 6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987) +++ lams_build/conf/etherpad/etherpad-lite/settings.json (.../settings.json) (revision 62e3273274a51b2dc8699e6ddf507d61e1b2c665) @@ -516,6 +516,7 @@ //*LAMS* commented out the following two lines //["importexport", "timeslider", "savedrevision"], //["settings", "embed"], + ["settings"], ["timeslider"], ["showusers"] ], Index: lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js =================================================================== diff -u -r6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987 -r62e3273274a51b2dc8699e6ddf507d61e1b2c665 --- lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js (.../pad.js) (revision 6c35e7bbcc3c98e9e3a1c31a367c44cb87bdf987) +++ lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js (.../pad.js) (revision 62e3273274a51b2dc8699e6ddf507d61e1b2c665) @@ -72,7 +72,15 @@ // callback: the function to call when all above succeeds, `val` is the value supplied by the user var getParameters = [ { name: "noColors", checkVal: "true", callback: function(val) { settings.noColors = true; $('#clearAuthorship').hide(); } }, - { name: "showControls", checkVal: "true", callback: function(val) { $('#editbar').css('display', 'flex') } }, + { name: "showControls", checkVal: "true", callback: function(val) { + $('#editbar').css('display', 'flex'); + let settingsPopup = $('#settings .popup-content'); + $('h1, h2, span, a, div.dropdowns-container, p.hide-for-mobile', settingsPopup) + .add($('#options-colorscheck', settingsPopup).closest('p')) + .add($('#options-linenoscheck', settingsPopup).closest('p')) + .add($('#options-rtlcheck', settingsPopup).closest('p')) + .hide(); + } }, { name: "showChat", checkVal: null, callback: function(val) { if(val==="false"){settings.hideChat = true;chat.hide();$('#chaticon').hide();} } }, { name: "showLineNumbers", checkVal: null, callback: function(val) { settings.LineNumbersDisabled = val == 'false'; } }, { name: "useMonospaceFont", checkVal: "true", callback: function(val) { settings.useMonospaceFontGlobal = true; } },