Index: lams_build/conf/etherpad/etherpad-lite/settings.json =================================================================== diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5 --- lams_build/conf/etherpad/etherpad-lite/settings.json (.../settings.json) (revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a) +++ lams_build/conf/etherpad/etherpad-lite/settings.json (.../settings.json) (revision 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5) @@ -56,6 +56,9 @@ * "password": "${PASSW}" // if PASSW is not defined would result in password === null * "password": "${PASSW:}" // if PASSW is not defined would result in password === '' * + * If you want to use an empty value (null) as default value for a variable, + * simply do not set it, without putting any colons: "${ABIWORD}". + * * 3) if you want to use newlines in the default value of a string parameter, * use "\n" as usual. * @@ -87,6 +90,32 @@ "skinName": "no-skin", /* + * Skin Variants + * + * Use the UI skin variants builder at /p/test#skinvariantsbuilder + * + * For the colibris skin only, you can choose how to render the three main + * containers: + * - toolbar (top menu with icons) + * - editor (containing the text of the pad) + * - background (area outside of editor, mostly visible when using page style) + * + * For each of the 3 containers you can choose 4 color combinations: + * super-light, light, dark, super-dark. + * + * For example, to make the toolbar dark, you will include "dark-toolbar" into + * skinVariants. + * + * You can provide multiple skin variants separated by spaces. Default + * skinVariant is "super-light-toolbar super-light-editor light-background". + * + * For the editor container, you can also make it full width by adding + * "full-width-editor" variant (by default editor is rendered as a page, with + * a max-width of 900px). + */ + "skinVariants": "super-light-toolbar super-light-editor light-background", + + /* * IP and port which Etherpad should bind at. * * Binding to a Unix socket is also supported: just use an empty string for @@ -168,14 +197,15 @@ */ "defaultPadText" : "", + /* * Default Pad behavior. * * Change them if you want to override. */ "padOptions": { "noColors": false, - "showControls": true, + "showControls": false, "showChat": false, "showLineNumbers": false, "useMonospaceFont": false, @@ -465,7 +495,6 @@ ["timeslider_export", "timeslider_returnToPad"] ] }, - /* * Expose Etherpad version in the web interface and in the Server http header. Fisheye: Tag 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5 refers to a dead (removed) revision in file `lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js =================================================================== diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5 --- lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js (.../pad.js) (revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a) +++ lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js (.../pad.js) (revision 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5) @@ -73,7 +73,7 @@ // 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: "false", callback: function(val) { $('#editbar').addClass('hideControlsEditbar'); $('#editorcontainer').addClass('hideControlsEditor'); } }, + { name: "showControls", checkVal: "true", callback: function(val) { $('#editbar').css('display', 'flex') } }, { name: "showChat", checkVal: "true", callback: function(val) { $('#chaticon').show(); } }, { name: "showLineNumbers", checkVal: "false", callback: function(val) { settings.LineNumbersDisabled = true; } }, { name: "useMonospaceFont", checkVal: "true", callback: function(val) { settings.useMonospaceFontGlobal = true; } }, @@ -364,12 +364,6 @@ }); } -$.extend($.gritter.options, { - position: 'bottom-right', // defaults to 'top-right' but can be 'bottom-left', 'bottom-right', 'top-left', 'top-right' (added in 1.7.1) - fade: false, // dont fade, too jerky on mobile - time: 6000 // hang on the screen for... -}); - var pad = { // don't access these directly from outside this file, except // for debugging @@ -428,6 +422,11 @@ }, switchToPad: function(padId) { + // destroy old pad from DOM + // See https://github.com/ether/etherpad-lite/pull/3915 + // TODO: Check if Destroying is enough and doesn't leave negative stuff + // See ace.js "editor.destroy" for a reference of how it was done before + $('#editorcontainer').find("iframe")[0].remove(); var options = document.location.href.split('?')[1]; var newHref = padId; if (typeof options != "undefined" && options != null){ @@ -562,7 +561,21 @@ pad.changeViewOption('rtlIsTrue', true); } pad.changeViewOption('padFontFamily', padcookie.getPref("padFontFamily")); + $('#viewfontmenu').val(padcookie.getPref("padFontFamily")).niceSelect('update'); + // Prevent sticky chat or chat and users to be checked for mobiles + function checkChatAndUsersVisibility(x) { + if (x.matches) { // If media query matches + $('#options-chatandusers:checked').click(); + $('#options-stickychat:checked').click(); + } + } + var mobileMatch = window.matchMedia("(max-width: 800px)"); + mobileMatch.addListener(checkChatAndUsersVisibility); // check if window resized + setTimeout(function() { checkChatAndUsersVisibility(mobileMatch); }, 0); // check now after load + + $('#editorcontainer').addClass('initialized'); + hooks.aCallAll("postAceInit", {ace: padeditor.ace, pad: pad}); } }, Index: lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js =================================================================== diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5 --- lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js (.../pad_userlist.js) (revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a) +++ lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js (.../pad_userlist.js) (revision 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5) @@ -207,6 +207,7 @@ tr = $(getRowHtml(domId, getEmptyRowHtml(getAnimationHeight(ANIMATION_START)), authorId)); } handleRowNode(tr, data); + $("table#otheruserstable").show(); if (position == 0) { $("table#otheruserstable").prepend(tr); @@ -263,6 +264,9 @@ scheduleAnimation(); } } + if (rowsPresent.length === 0) { + $("table#otheruserstable").hide(); + } } // newPosition is position after the row has been removed @@ -421,20 +425,6 @@ jqueryNode.removeAttr('disabled').addClass('editable'); } - function updateInviteNotice() - { - if (otherUsersInfo.length == 0) - { - $("#otheruserstable").hide(); - $("#nootherusers").show(); - } - else - { - $("#nootherusers").hide(); - $("#otheruserstable").show(); - } - } - var knocksToIgnore = {}; var guestPromptFlashState = 0; var guestPromptFlash = padutils.makeAnimationScheduler( @@ -493,7 +483,7 @@ }); } */ - + // color picker $("#myswatchbox").click(showColorPicker); $("#mycolorpicker .pickerswatchouter").click(function() @@ -622,8 +612,6 @@ rowManager.insertRow(newIndex, userData); } - updateInviteNotice(); - self.updateNumberOfOnlineUsers(); }, updateNumberOfOnlineUsers: function() @@ -671,13 +659,11 @@ hooks.callAll('userLeave', { userInfo: info }); - updateInviteNotice(); } } }, 8000); // how long to wait userData.leaveTimer = thisLeaveTimer; } - updateInviteNotice(); self.updateNumberOfOnlineUsers(); }, @@ -806,7 +792,7 @@ } colorPickerOpen = false; - $("#mycolorpicker").fadeOut("fast"); + $("#mycolorpicker").removeClass('popup-show'); } function showColorPicker() @@ -844,7 +830,7 @@ colorPickerSetup = true; } - $("#mycolorpicker").fadeIn(); + $("#mycolorpicker").addClass('popup-show') colorPickerOpen = true; $("#colorpickerswatches li").removeClass('picked'); Index: lams_build/conf/etherpad/readme.txt =================================================================== diff -u -re43f0bd30b5df2f0c65f7cb75474c76ef253b39a -r68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5 --- lams_build/conf/etherpad/readme.txt (.../readme.txt) (revision e43f0bd30b5df2f0c65f7cb75474c76ef253b39a) +++ lams_build/conf/etherpad/readme.txt (.../readme.txt) (revision 68fc7659b76cba8c48bbfaa1a777fba0cd3cf3d5) @@ -1,6 +1,8 @@ Etherpad is required for Dokumaran tool and for Etherpad tag -Modifications required to be done for Etherpad server (version #1.8.0 - develop branch, snapshot made on 2020-04-16): +Modifications are required for Etherpad server version 1.8.4, available at +https://github.com/ether/etherpad-lite/tree/1.8.4 + * Install ep_resize plugin https://github.com/tiblu/ep_resize