'); - // Yourself (edit only) - if (config.readOnly !== 1) { - $editUsers.append('' + Messages.yourself + ''); - anonymous--; - } + var $editUsersList = $('', {'class': 'userlist-others'}); + // Editors - $editUsersList.text(editUsersNames.join('\n')); // .text() to avoid XSS + editUsersNames.forEach(function (data) { + var name = data.name || Messages.anonymous; + var $span = $('', {'title': name}).text(name); + $span.data('uid', data.uid); + $editUsersList.append($span); + }); $editUsers.append($editUsersList); - // Anonymous editors - if (anonymous > 0) { - var text = anonymous === 1 ? Messages.anonymousUser : Messages.anonymousUsers; - $editUsers.append('' + anonymous + ' ' + text + ''); - } + // Viewers if (numberOfViewUsers > 0) { var viewText = ''; - if (numberOfEditUsers > 0) { - $editUsers.append(''); - viewText += Messages.and + ' '; - } var viewerText = numberOfViewUsers !== 1 ? Messages.viewers : Messages.viewer; viewText += numberOfViewUsers + ' ' + viewerText + ''; $editUsers.append(viewText); @@ -269,18 +264,32 @@ define([ !config.userList.data || !config.userList.userNetfluxId) { throw new Error("You must provide a `userList` object to display the userlist"); } - var dropdownConfig = { - options: [{ - tag: 'p', - attributes: {'class': USERLIST_CLS}, - }] - }; - var $block = Cryptpad.createDropdown(dropdownConfig); - $block.attr('id', 'userButtons'); + var $content = $('', {'class': 'userlist-drawer'}); + $('', {'class': USERLIST_CLS}).appendTo($content); + toolbar.userlistContent = $content; + + var $container = $('', {id: 'userButtons'}); + + var $button = $('').appendTo($container); + $('',{'class': 'buttonTitle'}).appendTo($button); + toolbar.$leftside.prepend($('', {'class': 'separator'})); - toolbar.$leftside.prepend($block); + toolbar.$leftside.prepend($container); + + if (config.$contentContainer) { + config.$contentContainer.prepend($content); + } + + $button.click(function () { + $content.toggle(); + Cryptpad.setAttribute('userlist-drawer', $content.is(':visible')); + }); + + Cryptpad.getAttribute('userlist-drawer', function (err, val) { + if (val === false) { $content.hide(); } + }); - return $block; + return $container; }; var createShare = function (toolbar, config) { @@ -391,8 +400,8 @@ define([ throw new Error("Unable to display the share button: hash required in the URL"); } var $shareIcon = $('', {'class': 'fa fa-share-alt'}); - var $span = $('', {'class': 'large'}).append(' ' +Messages.shareButton); - var $button = $('', {'id': 'shareButton'}).append($shareIcon).append($span); + //var $span = $('', {'class': 'large'}).append(' ' +Messages.shareButton); + var $button = $('', {'title': Messages.shareButton}).append($shareIcon);//:.append($span); $button.click(function () { var url = window.location.href; var success = Cryptpad.Clipboard.copy(url); diff --git a/www/file/file.css b/www/file/file.css index eea42757b..97d9a545b 100644 --- a/www/file/file.css +++ b/www/file/file.css @@ -40,7 +40,7 @@ body { } media-tag img { max-width: 100%; - max-height: calc(100vh - 64px); + max-height: calc(100vh - 96px); } #upload-form, #download-form { diff --git a/www/file/file.less b/www/file/file.less index 3516b8534..f4a081549 100644 --- a/www/file/file.less +++ b/www/file/file.less @@ -48,7 +48,7 @@ body { media-tag { img { max-width: 100%; - max-height: ~"calc(100vh - 64px)"; + max-height: ~"calc(100vh - 96px)"; } } diff --git a/www/pad/inner.html b/www/pad/inner.html index e701182db..c8698e194 100644 --- a/www/pad/inner.html +++ b/www/pad/inner.html @@ -29,7 +29,7 @@ } - + diff --git a/www/pad/main.js b/www/pad/main.js index 7a9ea059f..a762221a3 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -89,6 +89,7 @@ define([ }; var andThen = function (Ckeditor) { + var $iframe = $('#pad-iframe').contents(); var secret = Cryptpad.getSecrets(); var readOnly = secret.keys && !secret.keys.editKeyStr; if (!secret.keys) { @@ -466,7 +467,8 @@ define([ ifrw: ifrw, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $iframe.find('#cke_1_contents') }; toolbar = info.realtime.toolbar = Toolbar.create(configTb); @@ -562,6 +564,8 @@ define([ editor.execCommand('maximize'); } } + // editor.execCommand('maximize') removes all the classes from the body tag + $iframe.find('body').addClass('app-pad'); if (module.realtime !== info.realtime) { module.patchText = TextPatcher.create({ diff --git a/www/poll/index.html b/www/poll/index.html index 091086f5c..09a92aa1f 100644 --- a/www/poll/index.html +++ b/www/poll/index.html @@ -17,31 +17,34 @@ + + + + CryptPoll + - - CryptPoll - - - - - + + + - - publish poll - admin - help - + + publish poll + admin + help + - - - - - - - - - - + + + + + + + + + + + + diff --git a/www/poll/main.js b/www/poll/main.js index 0948ec8b4..e3f934b70 100644 --- a/www/poll/main.js +++ b/www/poll/main.js @@ -692,7 +692,8 @@ var create = function (info) { ifrw: window, realtime: info.realtime, network: info.network, - $container: APP.$bar + $container: APP.$bar, + $contentContainer: $('#content') }; APP.toolbar = Toolbar.create(configTb); diff --git a/www/poll/poll.css b/www/poll/poll.css index 979f7f2b8..620cf8710 100644 --- a/www/poll/poll.css +++ b/www/poll/poll.css @@ -6,6 +6,17 @@ body { padding: 0px; border: 0px; } +body { + display: flex; + flex-flow: column; +} +#content { + display: flex; + flex: 1; +} +#content #poll { + flex: 1; +} .cryptpad-toolbar h2 { font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif; color: #000; diff --git a/www/poll/poll.less b/www/poll/poll.less index 95b5cfa52..b4315c297 100644 --- a/www/poll/poll.less +++ b/www/poll/poll.less @@ -19,6 +19,17 @@ html, body { padding: 0px; border: 0px; } +body { + display: flex; + flex-flow: column; +} +#content { + display: flex; + flex: 1; + #poll { + flex: 1; + } +} .cryptpad-toolbar h2 { font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif; diff --git a/www/slide/main.js b/www/slide/main.js index 6ac477e45..c0d265800 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -49,6 +49,7 @@ define([ var andThen = function (CMeditor) { var $iframe = $('#pad-iframe').contents(); + var $contentContainer = $iframe.find('#editorContainer'); var CodeMirror = Cryptpad.createCodemirror(CMeditor, ifrw, Cryptpad); editor = CodeMirror.editor; @@ -358,7 +359,8 @@ define([ ifrw: ifrw, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $contentContainer }; toolbar = module.toolbar = Toolbar.create(configTb); diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index 95a727f41..d84f96c0d 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -312,7 +312,8 @@ window.canvas = canvas; ifrw: window, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $('#canvas-area') }; toolbar = module.toolbar = Toolbar.create(configTb);
', {'class': USERLIST_CLS}).appendTo($content); + toolbar.userlistContent = $content; + + var $container = $('', {id: 'userButtons'}); + + var $button = $('').appendTo($container); + $('',{'class': 'buttonTitle'}).appendTo($button); + toolbar.$leftside.prepend($('', {'class': 'separator'})); - toolbar.$leftside.prepend($block); + toolbar.$leftside.prepend($container); + + if (config.$contentContainer) { + config.$contentContainer.prepend($content); + } + + $button.click(function () { + $content.toggle(); + Cryptpad.setAttribute('userlist-drawer', $content.is(':visible')); + }); + + Cryptpad.getAttribute('userlist-drawer', function (err, val) { + if (val === false) { $content.hide(); } + }); - return $block; + return $container; }; var createShare = function (toolbar, config) { @@ -391,8 +400,8 @@ define([ throw new Error("Unable to display the share button: hash required in the URL"); } var $shareIcon = $('', {'class': 'fa fa-share-alt'}); - var $span = $('', {'class': 'large'}).append(' ' +Messages.shareButton); - var $button = $('', {'id': 'shareButton'}).append($shareIcon).append($span); + //var $span = $('', {'class': 'large'}).append(' ' +Messages.shareButton); + var $button = $('', {'title': Messages.shareButton}).append($shareIcon);//:.append($span); $button.click(function () { var url = window.location.href; var success = Cryptpad.Clipboard.copy(url); diff --git a/www/file/file.css b/www/file/file.css index eea42757b..97d9a545b 100644 --- a/www/file/file.css +++ b/www/file/file.css @@ -40,7 +40,7 @@ body { } media-tag img { max-width: 100%; - max-height: calc(100vh - 64px); + max-height: calc(100vh - 96px); } #upload-form, #download-form { diff --git a/www/file/file.less b/www/file/file.less index 3516b8534..f4a081549 100644 --- a/www/file/file.less +++ b/www/file/file.less @@ -48,7 +48,7 @@ body { media-tag { img { max-width: 100%; - max-height: ~"calc(100vh - 64px)"; + max-height: ~"calc(100vh - 96px)"; } } diff --git a/www/pad/inner.html b/www/pad/inner.html index e701182db..c8698e194 100644 --- a/www/pad/inner.html +++ b/www/pad/inner.html @@ -29,7 +29,7 @@ } - + diff --git a/www/pad/main.js b/www/pad/main.js index 7a9ea059f..a762221a3 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -89,6 +89,7 @@ define([ }; var andThen = function (Ckeditor) { + var $iframe = $('#pad-iframe').contents(); var secret = Cryptpad.getSecrets(); var readOnly = secret.keys && !secret.keys.editKeyStr; if (!secret.keys) { @@ -466,7 +467,8 @@ define([ ifrw: ifrw, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $iframe.find('#cke_1_contents') }; toolbar = info.realtime.toolbar = Toolbar.create(configTb); @@ -562,6 +564,8 @@ define([ editor.execCommand('maximize'); } } + // editor.execCommand('maximize') removes all the classes from the body tag + $iframe.find('body').addClass('app-pad'); if (module.realtime !== info.realtime) { module.patchText = TextPatcher.create({ diff --git a/www/poll/index.html b/www/poll/index.html index 091086f5c..09a92aa1f 100644 --- a/www/poll/index.html +++ b/www/poll/index.html @@ -17,31 +17,34 @@ + + + + CryptPoll + - - CryptPoll - - - - - + + + - - publish poll - admin - help - + + publish poll + admin + help + - - - - - - - - - - + + + + + + + + + + + + diff --git a/www/poll/main.js b/www/poll/main.js index 0948ec8b4..e3f934b70 100644 --- a/www/poll/main.js +++ b/www/poll/main.js @@ -692,7 +692,8 @@ var create = function (info) { ifrw: window, realtime: info.realtime, network: info.network, - $container: APP.$bar + $container: APP.$bar, + $contentContainer: $('#content') }; APP.toolbar = Toolbar.create(configTb); diff --git a/www/poll/poll.css b/www/poll/poll.css index 979f7f2b8..620cf8710 100644 --- a/www/poll/poll.css +++ b/www/poll/poll.css @@ -6,6 +6,17 @@ body { padding: 0px; border: 0px; } +body { + display: flex; + flex-flow: column; +} +#content { + display: flex; + flex: 1; +} +#content #poll { + flex: 1; +} .cryptpad-toolbar h2 { font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif; color: #000; diff --git a/www/poll/poll.less b/www/poll/poll.less index 95b5cfa52..b4315c297 100644 --- a/www/poll/poll.less +++ b/www/poll/poll.less @@ -19,6 +19,17 @@ html, body { padding: 0px; border: 0px; } +body { + display: flex; + flex-flow: column; +} +#content { + display: flex; + flex: 1; + #poll { + flex: 1; + } +} .cryptpad-toolbar h2 { font: normal normal normal 12px Arial, Helvetica, Tahoma, Verdana, Sans-Serif; diff --git a/www/slide/main.js b/www/slide/main.js index 6ac477e45..c0d265800 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -49,6 +49,7 @@ define([ var andThen = function (CMeditor) { var $iframe = $('#pad-iframe').contents(); + var $contentContainer = $iframe.find('#editorContainer'); var CodeMirror = Cryptpad.createCodemirror(CMeditor, ifrw, Cryptpad); editor = CodeMirror.editor; @@ -358,7 +359,8 @@ define([ ifrw: ifrw, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $contentContainer }; toolbar = module.toolbar = Toolbar.create(configTb); diff --git a/www/whiteboard/main.js b/www/whiteboard/main.js index 95a727f41..d84f96c0d 100644 --- a/www/whiteboard/main.js +++ b/www/whiteboard/main.js @@ -312,7 +312,8 @@ window.canvas = canvas; ifrw: window, realtime: info.realtime, network: info.network, - $container: $bar + $container: $bar, + $contentContainer: $('#canvas-area') }; toolbar = module.toolbar = Toolbar.create(configTb);
en 
par 
';
- out.header_logoTitle = "Aller vers la page d'accueil";
+ out.updated_0_header_logoTitle = 'Retourner vers votre CryptDrive';
+ out.header_logoTitle = out.updated_0_header_logoTitle;
// Initial states
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 42f1613e0..f64153742 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -498,7 +498,8 @@ define(function () {
out.header_france = 'With