From e6dfdb8b567d763fbf5394aa08037af47ecc10cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 7 Jun 2021 12:38:53 +0100
Subject: [PATCH 01/30] Adjust spacing

---
 www/form/app-form.less | 5 +++++
 www/form/inner.js      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 278e1d1db..1469310fa 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -67,6 +67,9 @@
 
             .cp-form-creator-settings {
                 padding: 30px;
+                .cp-form-actions {
+                    margin-top: 5px;
+                }
                 & > div:not(:last-child) {
                     margin-bottom: 20px;
                 }
@@ -90,6 +93,7 @@
             div.cp-form-creator-content, div.cp-form-creator-results {
                 max-width: 1000px;
                 min-width: 300px;
+                margin-top: 10px;
                 padding: 10px;
                 display: flex;
                 flex-flow: column;
@@ -246,6 +250,7 @@
                     .cp-form-block-content {
                         overflow-x: auto;
                         .cp-form-page-break-edit {
+                            font-size: 20px;
                             text-align: center;
                             padding: 10px;
                             i {
diff --git a/www/form/inner.js b/www/form/inner.js
index fcf1cc349..f6469f2f2 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2180,7 +2180,7 @@ define([
             var refreshPublic = function () {
                 $results.empty();
                 var makePublic = h('button.btn.btn-secondary', Messages.form_makePublic);
-                var makePublicDiv = h('div', makePublic);
+                var makePublicDiv = h('div.cp-form-actions', makePublic);
                 if (content.answers.privateKey) { makePublicDiv = undefined; }
                 var publicText = content.answers.privateKey ? Messages.form_isPublic : Messages.form_isPrivate;
                 $results.append(h('span.cp-form-results-type', publicText));

From 14cebd32bbb5d51de8eea3011007981f12219014 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 7 Jun 2021 16:46:33 +0200
Subject: [PATCH 02/30] Fix syntax highlighting in form descriptions

---
 www/common/common-ui-elements.js | 1 +
 www/form/inner.js                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 011bb587b..60b0571c8 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1069,6 +1069,7 @@ define([
             editor.replaceSelections(newTexts, 'around');
             editor.focus();
         };
+        Messages.mdToolbar_embed = "Embed file"; // XXX
         for (var k in actions) {
             $('<button>', {
                 'data-type': k,
diff --git a/www/form/inner.js b/www/form/inner.js
index f6469f2f2..2acedba23 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -27,7 +27,7 @@ define([
     '/bower_components/sortablejs/Sortable.min.js',
 
     'cm/addon/display/placeholder',
-    'cm/mode/markdown/markdown',
+    'cm/mode/gfm/gfm',
     'css!cm/lib/codemirror.css',
 
     'css!/bower_components/codemirror/lib/codemirror.css',

From b78b221e32990df7823b355bc988981e413a3905 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 7 Jun 2021 17:00:19 +0200
Subject: [PATCH 03/30] Add characters count and limit to textarea questions

---
 www/form/inner.js | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 2acedba23..cda2fbfd8 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -111,6 +111,7 @@ define([
 
     Messages.form_duplicates = "Duplicate entries have been removed";
     Messages.form_maxOptions = "{0} answer(s) max";
+    Messages.form_maxLength = "Characters limit: {0}/{1}";
 
     Messages.form_submit = "Submit";
     Messages.form_update = "Update";
@@ -922,23 +923,46 @@ define([
             },
             get: function (opts, a, n, evOnChange) {
                 if (!opts) { opts = TYPES.textarea.defaultOpts; }
-                var tag = h('textarea', {maxlength: opts.maxLength});
-                var $tag = $(tag);
-                $tag.on('change keypress', Util.throttle(function () {
+                var text = h('textarea', {maxlength: opts.maxLength});
+                var $text = $(text);
+                var charCount = h('div.cp-form-type-textarea-charcount');
+                var updateChar = function () {
+                    var l = $text.val().length;
+                    if (l > opts.maxLength) {
+                        $text.val($text.val().slice(0, opts.maxLength));
+                        l = $text.val().length;
+                    }
+                    $(charCount).text(Messages._getKey('form_maxLength', [
+                        $text.val().length,
+                        opts.maxLength
+                    ]));
+                };
+                updateChar();
+                var tag = h('div.cp-form-type-textarea', [
+                    text,
+                    charCount
+                ]);
+
+                var evChange = Util.throttle(function () {
                     evOnChange.fire();
-                }, 500));
+                }, 500);
+
+                $text.on('change keypress', function () {
+                    setTimeout(updateChar);
+                    evChange();
+                });
                 var cursorGetter;
                 var setCursorGetter = function (f) { cursorGetter = f; };
                 return {
                     tag: tag,
-                    getValue: function () { return $tag.val(); },
-                    setValue: function (val) { $tag.val(val); },
+                    getValue: function () { return $text.val().slice(0, opts.maxLength); },
+                    setValue: function (val) { $text.val(val); },
                     edit: function (cb, tmp) {
                         var v = Util.clone(opts);
                         return editTextOptions(v, setCursorGetter, cb, tmp);
                     },
                     getCursor: function () { return cursorGetter(); },
-                    reset: function () { $tag.val(''); }
+                    reset: function () { $text.val(''); }
                 };
             },
             printResults: function (answers, uid) {

From 65e9b779e85a3ac9027d8be0506da87c87c7abe3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 7 Jun 2021 17:32:30 +0200
Subject: [PATCH 04/30] Fix resizing codemirror in the code app #745

---
 www/code/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 2eb433c01..d74513035 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -257,8 +257,8 @@ define([
                 'class': 'cp-splitter'
             }).appendTo($previewContainer);
 
-            $preview.on('scroll', function() {
-                splitter.css('top', $preview.scrollTop() + 'px');
+            $previewContainer.on('scroll', function() {
+                splitter.css('top', $previewContainer.scrollTop() + 'px');
             });
 
             var $target = $codeMirrorContainer;

From cb1d4c1a0d24dd7f364b0a4967177d76c4e454d2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 7 Jun 2021 17:45:41 +0200
Subject: [PATCH 05/30] Fix poll UI in forms

---
 www/form/app-form.less |  6 ++++++
 www/form/inner.js      | 30 +++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 1469310fa..95431ad65 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -512,6 +512,12 @@
                 width: 100%;
             }
         }
+        .cp-poll-answer-name {
+            .cp-avatar {
+                .avatar_main(30px);
+                margin-right: 10px;
+            }
+        }
         .cp-poll-time-day {
             flex-basis: 100px;
             border-right: 1px solid @cryptpad_text_col;
diff --git a/www/form/inner.js b/www/form/inner.js
index cda2fbfd8..d5be04e91 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -87,6 +87,7 @@ define([
     Messages.form_poll_day = "Day";
     Messages.form_poll_time = "Time";
 
+    Messages.form_pollYourAnswers = "Your answers";
 
     Messages.form_textType = "Text type";
     Messages.form_text_text = "Text";
@@ -702,9 +703,12 @@ define([
 
         // Add answers
         if (Array.isArray(answers)) {
-            answers.forEach(function (answer) {
-                if (!answer.name || !answer.values) { return; }
-                var _name = answer.name;
+            answers.forEach(function (answerObj) {
+                var answer = answerObj.results;
+                if (!answer || !answer.values) { return; }
+                var name = Util.find(answerObj, ['user', 'name']) || answer.name || Messages.anonymous;
+                var avatar = h('span.cp-avatar');
+                APP.common.displayAvatar($(avatar), Util.find(answerObj, ['user', 'avatar']), name);
                 var values = answer.values || {};
                 var els = opts.values.map(function (data) {
                     var res = values[data] || 0;
@@ -714,7 +718,10 @@ define([
                     }, v);
                     return cell;
                 });
-                els.unshift(h('div.cp-poll-cell.cp-poll-answer-name', _name));
+                els.unshift(h('div.cp-poll-cell.cp-poll-answer-name', [
+                    avatar,
+                    h('span', name)
+                ]));
                 lines.push(h('div', els));
             });
         }
@@ -748,7 +755,10 @@ define([
         return Object.keys(answers || {}).map(function (user) {
             if (filterCurve && user === filterCurve) { return; }
             try {
-                return answers[user].msg[uid];
+                return {
+                    user: answers[user].msg._userdata,
+                    results: answers[user].msg[uid]
+                };
             } catch (e) { console.error(e); }
         }).filter(Boolean);
     };
@@ -1418,7 +1428,8 @@ define([
                     return cell;
                 });
                 // Name input
-                var nameInput = h('input', { value: username || Messages.anonymous });
+                //var nameInput = h('input', { value: username || Messages.anonymous });
+                var nameInput = h('span.cp-poll-your-answers', Messages.form_pollYourAnswers)
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
@@ -1431,13 +1442,11 @@ define([
                     tag: tag,
                     getValue: function () {
                         var res = {};
-                        var name = $(nameInput).val().trim() || Messages.anonymous;
                         $tag.find('.cp-form-poll-choice').each(function (i, el) {
                             var $el = $(el);
                             res[$el.data('option')] = $el.attr('data-value');
                         });
                         return {
-                            name: name,
                             values: res
                         };
                     },
@@ -1451,9 +1460,8 @@ define([
                     getCursor: function () { return cursorGetter(); },
                     setValue: function (res) {
                         this.reset();
-                        if (!res || !res.values || !res.name) { return; }
+                        if (!res || !res.values) { return; }
                         var val = res.values;
-                        $(nameInput).val(res.name);
                         $tag.find('.cp-form-poll-choice').each(function (i, el) {
                             if (!el._setValue) { return; }
                             var $el = $(el);
@@ -2037,7 +2045,7 @@ define([
                         framework._.cpNfInner.chainpad.onSettle(function () {
                             $(editButtons).show();
                             UI.log(Messages.saved);
-                            var _answers = getBlockAnswers(APP.answers, uid);
+                            _answers = getBlockAnswers(APP.answers, uid);
                             data = model.get(newOpts, _answers, null, evOnChange);
                             if (!data) { data = {}; }
                             $oldTag.before(data.tag).remove();

From 6b85a0bcc88be7be173d10ca4ef01b0fd101a239 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 7 Jun 2021 18:10:58 +0200
Subject: [PATCH 06/30] Fix first and last pages in forms

---
 www/form/inner.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index d5be04e91..ee218ecd0 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2130,6 +2130,8 @@ define([
                         h('span', Messages.form_page_next),
                         h('i.fa.fa-chevron-right'),
                     ]);
+                    if (current === pages) { $(right).css('visibility', 'hidden'); }
+                    if (current === 1) { $(left).css('visibility', 'hidden'); }
                     $(left).click(function () { refreshPage(current - 1); });
                     $(right).click(function () { refreshPage(current + 1); });
                     $page.append([left, state, right]);

From 7f39114a3f80c3131f2a8566fd17cde94aacb0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 7 Jun 2021 17:34:48 +0100
Subject: [PATCH 07/30] Poll styles

---
 www/form/app-form.less | 33 +++++++++++++++++++++++++++------
 www/form/inner.js      | 13 ++++++-------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 1469310fa..9067fa8bf 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -197,6 +197,15 @@
                 .cp-form-page + .cp-form-send-container {
                     margin-top: 10px;
                 }
+                .cp-form-send-container {
+                    text-align: center;
+                    margin: 50px auto 100px auto;
+                    button {
+                        &:not(:last-child) {
+                            margin-right: 10px;
+                        }
+                    }
+                }
 
                 .cp-form-page-container {
                     display: flex;
@@ -210,11 +219,12 @@
                         justify-content: center;
                     }
                     button {
-                        &.cp-next {
-                            .fa {
-                                margin-right: 0;
-                                margin-left: 5px;
-                            }
+                        display: flex;
+                        height: 38px;
+                        align-items: center;
+                        i {
+                            margin-right: 0;
+                            font-size: 25px;
                         }
                     }
                 }
@@ -505,11 +515,19 @@
             display: inline-flex;
             align-items: center;
             justify-content: center;
+            margin:5px;
             &:first-child {
                 width: 200px;
             }
             button {
                 width: 100%;
+                border-top: 0px;
+                border-left: 0px;
+                background-color: @cp_form-bg1;
+                .fa{
+                    margin-left:10px;
+                    transform: rotate(-45deg);
+                }
             }
         }
         .cp-poll-time-day {
@@ -544,6 +562,7 @@
                 display: none;
             }
             color: @cp_form-poll-color;
+            font-size: 25px;
             &[data-value="0"] {
                 background: @cp_form-poll-no;
                 .cp-no { display: inline; }
@@ -560,7 +579,9 @@
         div.cp-form-poll-choice {
             cursor: pointer;
             padding: 5px;
-            border: 5px double @cp_form-bg1;
+            //margin: 10px 0px 0px 10px;
+            //border: 1px solid @cryptpad_text_col;
+            color: @cryptpad_text_col;
         }
         div.cp-form-poll-answer {
             color: @cp_form-poll-yes-color;
diff --git a/www/form/inner.js b/www/form/inner.js
index f6469f2f2..d107cfc3a 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -86,7 +86,7 @@ define([
     Messages.form_poll_text = "Text";
     Messages.form_poll_day = "Day";
     Messages.form_poll_time = "Time";
-
+    Messages.form_poll_switch = "Switch axes" // XXX DB
 
     Messages.form_textType = "Text type";
     Messages.form_text_text = "Text";
@@ -676,6 +676,7 @@ define([
         });
         // Insert axis switch button
         var switchAxis = h('button.btn.btn-default', [
+            Messages.form_poll_switch,
             h('i.fa.fa-exchange'),
         ]);
         els.unshift(h('div.cp-poll-cell.cp-poll-switch', switchAxis));
@@ -2089,14 +2090,12 @@ define([
                     $page.empty();
                     if (!current || current < 1) { current = 1; }
                     if (current > pages) { current = pages; }
-                    var left = h('button.btn.btn-secondary.small.cp-prev', [
-                        h('i.fa.fa-chevron-left'),
-                        h('span', Messages.form_page_prev)
+                    var left = h('button.btn.btn-secondary.cp-prev', [
+                        h('i.fa.fa-arrow-left'),
                     ]);
                     var state = h('span', Messages._getKey('form_page', [current, pages]));
-                    var right = h('button.btn.btn-secondary.small.cp-next', [
-                        h('span', Messages.form_page_next),
-                        h('i.fa.fa-chevron-right'),
+                    var right = h('button.btn.btn-secondary.cp-next', [
+                        h('i.fa.fa-arrow-right'),
                     ]);
                     $(left).click(function () { refreshPage(current - 1); });
                     $(right).click(function () { refreshPage(current + 1); });

From e61fdaf2cd583ce794e37a2ad4ef94878f6a765b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 14:06:15 +0200
Subject: [PATCH 08/30] Fix switching from time to day in form polls

---
 www/form/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index ee218ecd0..b026958e1 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -489,6 +489,7 @@ define([
                     $(addMultiple).hide();
                 }
             } else {
+                $(addMultiple).hide();
                 $calendar.show();
                 $container.hide();
             }

From 63cf7f133c9731ad41eb86a234fb6e9aa255594b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 14:08:52 +0200
Subject: [PATCH 09/30] Fix mediatag width in polls

---
 www/form/app-form.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 95431ad65..70278f926 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -265,6 +265,11 @@
                         input:invalid {
                             border: 1px solid @cp_form-invalid;
                         }
+                        media-tag {
+                            & > * {
+                                max-width: 100%;
+                            }
+                        }
                     }
                     .cp-form-input-block {
                         //width: @form_input-width;

From 61db88778582d5ed7e7febd68578a6368f50d468 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 14:35:24 +0200
Subject: [PATCH 10/30] Add an empty value in polls 'time' type

---
 www/form/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index b026958e1..9d4f87b79 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -503,6 +503,7 @@ define([
                 refreshView();
                 if (val !== "text") {
                     $container.find('.cp-form-edit-block-input').remove();
+                    $(add).click();
                     return;
                 }
                 $container.find('input').each(function (i, input) {

From 4f01d8fa31bd8fa6c3e88fa2a03ebd24c590e63a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 14:44:15 +0200
Subject: [PATCH 11/30] Update inline calendar style (box-shadow)

---
 www/form/app-form.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 70278f926..8f1ad2483 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -244,6 +244,11 @@
                     &.sortable-ghost { visibility: hidden; }
                     &.sortable-drag { opacity: 0.9 !important; }
 
+                    .flatpickr-calendar.inline {
+                        box-shadow: unset;
+                        border: 1px solid @cryptpad_text_col;
+                    }
+
                     .cp-form-block-question {
                         margin-bottom: 5px;
                     }

From b022fe573a6c9855ab88e627626fa2c2c809b231 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 15:18:12 +0200
Subject: [PATCH 12/30] Fix character count in form textareas

---
 www/form/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 9d4f87b79..d5d62b8f0 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -959,7 +959,7 @@ define([
                     evOnChange.fire();
                 }, 500);
 
-                $text.on('change keypress', function () {
+                $text.on('change keypress keyup keydown', function () {
                     setTimeout(updateChar);
                     evChange();
                 });

From 360204df30947d83cd27904056c1c12b749c74ae Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 15:42:20 +0200
Subject: [PATCH 13/30] Fix character count when restoring form data

---
 www/form/inner.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index d5d62b8f0..f3c880afc 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -968,7 +968,10 @@ define([
                 return {
                     tag: tag,
                     getValue: function () { return $text.val().slice(0, opts.maxLength); },
-                    setValue: function (val) { $text.val(val); },
+                    setValue: function (val) {
+                        $text.val(val);
+                        updateChar();
+                    },
                     edit: function (cb, tmp) {
                         var v = Util.clone(opts);
                         return editTextOptions(v, setCursorGetter, cb, tmp);

From fc38d8fef82eeeae49a6b7de75ccb2ccca1d4a6e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 16:47:21 +0200
Subject: [PATCH 14/30] Fix form polls UI with lots of answers

---
 www/form/app-form.less | 29 +++++++++++++++++++++++++++++
 www/form/inner.js      |  7 +++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 8f1ad2483..f1e0c3dd0 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -509,6 +509,14 @@
         & > div {
             display: flex;
         }
+        .cp-form-poll-body {
+            flex-flow: column;
+            max-height: 200px;
+            overflow: auto;
+            & > div {
+                display: flex;
+            }
+        }
         .cp-poll-cell {
             width: 100px;
             height: 40px;
@@ -523,6 +531,15 @@
             }
         }
         .cp-poll-answer-name {
+            padding: 0 5px;
+            display: flex;
+            :last-child {
+                flex: 1;
+                min-width: 0;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+            }
             .cp-avatar {
                 .avatar_main(30px);
                 margin-right: 10px;
@@ -536,8 +553,20 @@
         }
         &.cp-form-poll-switch {
             flex-flow: row;
+            .cp-avatar {
+                .avatar_main(20px);
+            }
             & > div {
                 flex-flow: column;
+                &.cp-form-poll-body {
+                    flex-flow: row;
+                    max-width: 500px;
+                    max-height: unset;
+                    scroll-snap-type: x mandatory;
+                    & > div {
+                        flex-flow: column;
+                    }
+                }
             }
             .cp-poll-cell:not(.cp-poll-switch) {
                 &:first-child {
diff --git a/www/form/inner.js b/www/form/inner.js
index f3c880afc..a0385442b 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -704,6 +704,7 @@ define([
         }
 
         // Add answers
+        var bodyEls = [];
         if (Array.isArray(answers)) {
             answers.forEach(function (answerObj) {
                 var answer = answerObj.results;
@@ -724,9 +725,11 @@ define([
                     avatar,
                     h('span', name)
                 ]));
-                lines.push(h('div', els));
+                bodyEls.push(h('div', els));
             });
         }
+        var body = h('div.cp-form-poll-body', bodyEls);
+        lines.push(body);
 
         var $s = $(switchAxis).click(function () {
             $s.closest('.cp-form-type-poll').toggleClass('cp-form-poll-switch');
@@ -1438,7 +1441,7 @@ define([
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
-                var tag = h('div.cp-form-type-poll', lines);
+                var tag = h('div', h('div.cp-form-type-poll', lines));
                 var $tag = $(tag);
 
                 var cursorGetter;

From ec84377d2ee31ef3550d4a0beea1de69faf29e54 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 16:51:44 +0200
Subject: [PATCH 15/30] Fix previous commit

---
 www/form/app-form.less | 3 +++
 www/form/inner.js      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index f1e0c3dd0..343894af9 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -503,6 +503,9 @@
         }
     }
 
+    .cp-form-type-poll-container {
+        overflow: auto;
+    }
     .cp-form-type-poll {
         display: inline-flex;
         flex-flow: column;
diff --git a/www/form/inner.js b/www/form/inner.js
index a0385442b..290c98007 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1441,7 +1441,7 @@ define([
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
-                var tag = h('div', h('div.cp-form-type-poll', lines));
+                var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
                 var $tag = $(tag);
 
                 var cursorGetter;

From 1a60ff01d093ea7c3ac241e947aac72913af0113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 8 Jun 2021 15:56:40 +0100
Subject: [PATCH 16/30] Improve Poll UI

---
 .../src/less2/include/colortheme-dark.less        | 11 ++++++-----
 customize.dist/src/less2/include/colortheme.less  |  6 +++---
 www/form/app-form.less                            | 15 +++++++++------
 www/form/inner.js                                 | 11 +++++++++--
 www/form/main.js                                  |  2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index ba80b2d64..a16f9b5ca 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -64,7 +64,8 @@
 @cryptpad_color_light_green: #c5ffa8;
 @cryptpad_color_light_green_fade: fade(@cryptpad_color_light_green, 20%);
 @cryptpad_color_light_yellow: #FFE69C;
-@cryptpad_color_yellow_fade: fade(#FFE69C, 15%);
+@cryptpad_color_yellow_fade: fade(@cryptpad_color_light_yellow, 50%);
+@cryptpad_color_yellow_fader: fade(#FFE69C, 15%); // not in light theme
 @cryptpad_color_lighter_blue: #d2e1f2;
 
 @cryptpad_color_link:@cryptpad_color_brand_300;
@@ -115,7 +116,7 @@
 @cp_forms-disabled: @cryptpad_color_grey_500;
 
 // Bootstrap alerts
-@cp_alerts-warning-bg: @cryptpad_color_yellow_fade;
+@cp_alerts-warning-bg: @cryptpad_color_yellow_fader;
 @cp_alerts-warning-fg: @cryptpad_color_light_yellow;
 @cp_alerts-warning-text: @cryptpad_color_light_yellow;
 @cp_alerts-danger-bg: @cryptpad_color_red_fader;
@@ -432,8 +433,8 @@
 @cp_form-bg2: @cryptpad_color_grey_900;
 @cp_form-border: @cryptpad_color_grey_800;
 @cp_form-poll-color: @cryptpad_color_grey_800;
-@cp_form-poll-no: @cryptpad_color_light_red;
-@cp_form-poll-yes: @cryptpad_color_light_green;
-@cp_form-poll-maybe: @cryptpad_color_light_yellow;
+@cp_form-poll-no: fade(@cryptpad_color_red, 25%);
+@cp_form-poll-yes: fade(@cryptpad_color_green, 25%);
+@cp_form-poll-maybe: @cryptpad_color_grey_700;
 @cp_form-poll-yes-color: @cryptpad_color_green;
 @cp_form-invalid: @cryptpad_color_red;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 1102f6074..a7b103797 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -432,8 +432,8 @@
 @cp_form-bg2: @cryptpad_color_grey_100;
 @cp_form-border: @cryptpad_color_grey_200;
 @cp_form-poll-color: @cryptpad_color_grey_800;
-@cp_form-poll-no: @cryptpad_color_light_red;
-@cp_form-poll-yes: @cryptpad_color_light_green;
-@cp_form-poll-maybe: @cryptpad_color_light_yellow;
+@cp_form-poll-no: fade(@cryptpad_color_light_red, 75%);
+@cp_form-poll-yes: fade(@cryptpad_color_light_green, 75%);
+@cp_form-poll-maybe: @cryptpad_color_grey_300;
 @cp_form-poll-yes-color: @cryptpad_color_green;
 @cp_form-invalid: @cryptpad_color_red;
diff --git a/www/form/app-form.less b/www/form/app-form.less
index 952b85722..e4c308674 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -337,6 +337,12 @@
                                 margin-left: 10px;
                             }
                         }
+                        .cp-form-multiple-picker {
+                            margin: 10px 0px 0px 0px;
+                            button {
+                                margin: 10px 10px 0px 0px;
+                            }
+                        }
                     }
                 }
                 .cp-form-edit-max-options {
@@ -568,9 +574,7 @@
         }
         .cp-poll-time-day {
             flex-basis: 100px;
-            border-right: 1px solid @cryptpad_text_col;
-            border-left: 1px solid @cryptpad_text_col;
-            border-top: 1px solid @cryptpad_text_col;
+            border-bottom: 1px solid @cryptpad_text_col;
         }
         &.cp-form-poll-switch {
             flex-flow: row;
@@ -600,9 +604,8 @@
             .cp-poll-time-day {
                 flex-basis: 40px;
                 border-right: none;
-                border-bottom: 1px solid @cryptpad_text_col;
-                border-left: 1px solid @cryptpad_text_col;
-                border-top: 1px solid @cryptpad_text_col;
+                border-right: 1px solid @cryptpad_text_col;
+                border-bottom: 0px;
             }
         }
         .cp-form-poll-choice, .cp-form-poll-answer {
diff --git a/www/form/inner.js b/www/form/inner.js
index 5f006fb44..d14c1da08 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -163,6 +163,7 @@ define([
     Messages.form_add_option = "Add option";
     Messages.form_add_item = "Add item";
     Messages.form_addMultiple = "Add all";
+    Messages.form_addMultipleHint = "Add multiple dates and times"
     Messages.form_clear = "Clear";
 
     Messages.form_page_prev = "Previous";
@@ -443,13 +444,13 @@ define([
 
         // Calendar time
         if (v.type) {
-            var multipleInput = h('input');
+            var multipleInput = h('input', {placeholder: Messages.form_addMultipleHint});
             var multipleClearButton = h('button.btn', Messages.form_clear);
             var addMultipleButton = h('button.btn', [
                 h('i.fa.fa-plus'),
                 h('span', Messages.form_addMultiple)
             ]);
-            addMultiple = h('div', { style: "display: none;" }, [
+            addMultiple = h('div.cp-form-multiple-picker', { style: "display: none;" }, [
                 multipleInput,
                 addMultipleButton,
                 multipleClearButton
@@ -708,6 +709,12 @@ define([
         // Add answers
         var bodyEls = [];
         if (Array.isArray(answers)) {
+            for(var i = 0; i< 20; i++) { // XXX
+                answers.push({
+                    user: { name: 'User '+i },
+                    results: { values: {} }
+                });
+            }
             answers.forEach(function (answerObj) {
                 var answer = answerObj.results;
                 if (!answer || !answer.values) { return; }
diff --git a/www/form/main.js b/www/form/main.js
index 344c5bb0c..0d288dbe3 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -230,7 +230,7 @@ define([
                         results[senderCurve] = {
                             msg: parsed,
                             hash: hash,
-                            time: cfg.time
+                            time: cfg && cfg.time
                         };
                     };
                     CPNetflux.start(config);

From f8ca1389f3013bb35d433efdb2a5126d97adbdc2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 8 Jun 2021 18:18:36 +0200
Subject: [PATCH 17/30] Add poll total row

---
 www/form/app-form.less | 31 +++++++++++++++++---
 www/form/inner.js      | 66 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index e4c308674..b87c47190 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -530,19 +530,21 @@
         }
         .cp-form-poll-body {
             flex-flow: column;
-            max-height: 200px;
+            max-height: 225px;
             overflow: auto;
+
             & > div {
                 display: flex;
             }
         }
         .cp-poll-cell {
             width: 100px;
-            height: 40px;
+            height: 35px;
             display: inline-flex;
             align-items: center;
             justify-content: center;
-            margin:5px;
+            margin-top:5px;
+            margin-left:5px;
             &:first-child {
                 width: 200px;
             }
@@ -556,6 +558,12 @@
                     transform: rotate(-45deg);
                 }
             }
+            .cp-form-total-yes {
+                margin-right: 5px;
+            }
+            &.cp-poll-best {
+                font-weight: bold;
+            }
         }
         .cp-poll-answer-name {
             padding: 0 5px;
@@ -576,7 +584,22 @@
             flex-basis: 100px;
             border-bottom: 1px solid @cryptpad_text_col;
         }
+        &:not(.cp-form-poll-switch) {
+            & > div {
+                &:last-child {
+                    margin-bottom: 5px;
+                }
+            }
+            .cp-form-poll-body {
+                &::-webkit-scrollbar {
+                  display: none;
+                }
+                -ms-overflow-style: none;  /* IE and Edge */
+                scrollbar-width: none;  /* Firefox */
+            }
+        }
         &.cp-form-poll-switch {
+            display: flex;
             flex-flow: row;
             .cp-avatar {
                 .avatar_main(20px);
@@ -585,7 +608,7 @@
                 flex-flow: column;
                 &.cp-form-poll-body {
                     flex-flow: row;
-                    max-width: 500px;
+                    max-width: 550px;
                     max-height: unset;
                     scroll-snap-type: x mandatory;
                     & > div {
diff --git a/www/form/inner.js b/www/form/inner.js
index d14c1da08..065df1998 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -87,6 +87,7 @@ define([
     Messages.form_poll_day = "Day";
     Messages.form_poll_time = "Time";
     Messages.form_poll_switch = "Switch axes" // XXX DB
+    Messages.form_pollTotal = "Total";
 
     Messages.form_pollYourAnswers = "Your answers";
 
@@ -678,7 +679,9 @@ define([
                 var _dateT = new Date(data);
                 data = Flatpickr.formatDate(_dateT, timeFormat);
             }
-            return h('div.cp-poll-cell.cp-form-poll-option', data);
+            return h('div.cp-poll-cell.cp-form-poll-option', {
+                title: Util.fixHTML(data)
+            }, data);
         });
         // Insert axis switch button
         var switchAxis = h('button.btn.btn-default', [
@@ -730,7 +733,9 @@ define([
                     }, v);
                     return cell;
                 });
-                els.unshift(h('div.cp-poll-cell.cp-poll-answer-name', [
+                els.unshift(h('div.cp-poll-cell.cp-poll-answer-name', {
+                    title: Util.fixHTML(name)
+                }, [
                     avatar,
                     h('span', name)
                 ]));
@@ -746,6 +751,56 @@ define([
 
         return lines;
     };
+    var makePollTotal = function (answers, opts) {
+        if (!Array.isArray(answers)) { return; }
+        var totals = {};
+        var totalEls = opts.values.map(function (data) {
+            var y = 0; // Yes
+            var m = 0; // Maybe
+            answers.forEach(function (answerObj) {
+                var answer = answerObj.results;
+                if (!answer || !answer.values) { return; }
+                var values = answer.values || {};
+                var res = Number(values[data]) || 0;
+                if (res === 1) { y++; }
+                else if (res === 2) { m++; }
+            });
+            totals[data] = {
+                y: y,
+                m: m
+            };
+
+            return h('div.cp-poll-cell', {
+                'data-id': data
+            }, [
+                h('span.cp-form-total-yes', y),
+                h('span.cp-form-total-maybe', '('+m+')'),
+            ]);
+        });
+
+        var totalMax = {
+            value: 0,
+            data: []
+        };
+        Object.keys(totals).forEach(function (k) {
+            var obj = totals[k];
+            if (obj.y === totalMax.value) {
+                totalMax.data.push(k);
+            } else if (obj.y > totalMax.value) {
+                totalMax.value = obj.y;
+                totalMax.data = [k];
+            }
+        });
+        totalEls.unshift(h('div.cp-poll-cell', Messages.form_pollTotal));
+        var total = h('div.cp-poll-total', totalEls);
+        if (totalMax.value) {
+            totalMax.data.forEach(function (k) {
+                $(total).find('[data-id="'+k+'"]').addClass('cp-poll-best');
+            });
+        }
+
+        return total;
+    };
 
     var getEmpty = function (empty) {
         if (empty) {
@@ -1450,6 +1505,9 @@ define([
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
+                var total = makePollTotal(answers, opts);
+                if (total) { lines.push(h('div', total)); }
+
                 var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
                 var $tag = $(tag);
 
@@ -1491,6 +1549,10 @@ define([
             printResults: function (answers, uid, form) {
                 var _answers = getBlockAnswers(answers, uid);
                 var lines = makePollTable(_answers, form[uid].opts);
+
+                var total = makePollTotal(_answers, form[uid].opts);
+                if (total) { lines.push(h('div', total)); }
+
                 return h('div.cp-form-type-poll', lines);
             },
             icon: h('i.cptools.cptools-form-poll')

From 13db08f728c986cdf04dc45fb0e8c6d7f09f758f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 9 Jun 2021 15:19:26 +0200
Subject: [PATCH 18/30] Fix type error in forms

---
 www/form/inner.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 065df1998..cb7f5de3e 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1214,6 +1214,7 @@ define([
             printResults: function (answers, uid, form) {
                 var structure = form[uid];
                 if (!structure) { return; }
+                var opts = structure.opts || TYPES.multiradio.defaultOpts;
                 var results = [];
                 var empty = 0;
                 var count = {};
@@ -1231,7 +1232,6 @@ define([
                     });
                 });
                 Object.keys(count).forEach(function (q_uid) {
-                    var opts = structure.opts || TYPES.multiradio.defaultOpts;
                     var q = findItem(opts.items, q_uid);
                     var c = count[q_uid];
                     var values = Object.keys(c).map(function (res) {
@@ -1427,6 +1427,7 @@ define([
             printResults: function (answers, uid, form) {
                 var structure = form[uid];
                 if (!structure) { return; }
+                var opts = structure.opts || TYPES.multicheck.defaultOpts;
                 var results = [];
                 var empty = 0;
                 var count = {};
@@ -1445,7 +1446,7 @@ define([
                     });
                 });
                 Object.keys(count).forEach(function (q_uid) {
-                    var q = findItem(structure.opts.items, q_uid);
+                    var q = findItem(opts.items, q_uid);
                     var c = count[q_uid];
                     var values = Object.keys(c).map(function (res) {
                         return h('div.cp-form-results-type-radio-data', [
@@ -1547,10 +1548,11 @@ define([
 
             },
             printResults: function (answers, uid, form) {
+                var opts = form[uid].opts || TYPES.poll.defaultOpts;
                 var _answers = getBlockAnswers(answers, uid);
-                var lines = makePollTable(_answers, form[uid].opts);
+                var lines = makePollTable(_answers, opts);
 
-                var total = makePollTotal(_answers, form[uid].opts);
+                var total = makePollTotal(_answers, opts);
                 if (total) { lines.push(h('div', total)); }
 
                 return h('div.cp-form-type-poll', lines);
@@ -1564,7 +1566,7 @@ define([
                 })
             },
             get: function (opts, a, n, evOnChange) {
-                if (!opts) { opts = TYPES.radio.defaultOpts; }
+                if (!opts) { opts = TYPES.sort.defaultOpts; }
                 if (!Array.isArray(opts.values)) { return; }
                 var map = {};
                 var invMap = {};
@@ -1638,7 +1640,7 @@ define([
 
             },
             printResults: function (answers, uid, form) {
-                var opts = form[uid].opts || TYPES.radio.defaultOpts;
+                var opts = form[uid].opts || TYPES.sort.defaultOpts;
                 var l = (opts.values || []).length;
                 var results = [];
                 var empty = 0;

From 5b2445789e91ec418015a8caba3e9878da3a07da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 9 Jun 2021 14:53:53 +0100
Subject: [PATCH 19/30] Fix style of text paragraph answers on results page

---
 www/form/app-form.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index b87c47190..fb4dc7c4e 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -440,9 +440,9 @@
             }
             .cp-form-results-type-textarea-data {
                 white-space: pre-wrap;
-                font-size: 14px;
-                border: 1px solid @cp_profile-hint;
-                padding: 0 5px;
+                padding: 5px 10px;
+                background: @cp_form-bg2;
+                &:not(:last-child) { margin-bottom: 1px; }
             }
             .cp-form-results-type-radio {
                 display: table;

From c6b867f93fd958d21b8107e7f0e276abd8111b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 9 Jun 2021 14:58:52 +0100
Subject: [PATCH 20/30] Change order of question types

---
 www/form/inner.js | 188 +++++++++++++++++++++++-----------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index cb7f5de3e..5d1ee5763 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1465,100 +1465,6 @@ define([
             },
             icon: h('i.cptools.cptools-form-grid-check')
         },
-        poll: {
-            defaultOpts: {
-                type: 'text', // Text or Days or Time
-                values: [1, 2, 3].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
-                })
-            },
-            get: function (opts, answers, username, evOnChange) {
-                if (!opts) { opts = TYPES.poll.defaultOpts; }
-                if (!Array.isArray(opts.values)) { return; }
-
-                var lines = makePollTable(answers, opts);
-
-                // Add form
-                var addLine = opts.values.map(function (data) {
-                    var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
-                        h('i.fa.fa-times.cp-no'),
-                        h('i.fa.fa-check.cp-yes'),
-                        h('i.fa.fa-question.cp-maybe'),
-                    ]);
-                    var $c = $(cell);
-                    $c.data('option', data);
-                    var val = 0;
-                    $c.attr('data-value', val);
-                    $c.click(function () {
-                        val = (val+1)%3;
-                        $c.attr('data-value', val);
-                        evOnChange.fire();
-                    });
-                    cell._setValue = function (v) {
-                        val = v;
-                        $c.attr('data-value', val);
-                    };
-                    return cell;
-                });
-                // Name input
-                //var nameInput = h('input', { value: username || Messages.anonymous });
-                var nameInput = h('span.cp-poll-your-answers', Messages.form_pollYourAnswers)
-                addLine.unshift(h('div.cp-poll-cell', nameInput));
-                lines.push(h('div', addLine));
-
-                var total = makePollTotal(answers, opts);
-                if (total) { lines.push(h('div', total)); }
-
-                var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
-                var $tag = $(tag);
-
-                var cursorGetter;
-                var setCursorGetter = function (f) { cursorGetter = f; };
-                return {
-                    tag: tag,
-                    getValue: function () {
-                        var res = {};
-                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
-                            var $el = $(el);
-                            res[$el.data('option')] = $el.attr('data-value');
-                        });
-                        return {
-                            values: res
-                        };
-                    },
-                    reset: function () {
-                        $tag.find('.cp-form-poll-choice').attr('data-value', 0);
-                    },
-                    edit: function (cb, tmp) {
-                        var v = Util.clone(opts);
-                        return editOptions(v, setCursorGetter, cb, tmp);
-                    },
-                    getCursor: function () { return cursorGetter(); },
-                    setValue: function (res) {
-                        this.reset();
-                        if (!res || !res.values) { return; }
-                        var val = res.values;
-                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
-                            if (!el._setValue) { return; }
-                            var $el = $(el);
-                            el._setValue(val[$el.data('option')] || 0);
-                        });
-                    }
-                };
-
-            },
-            printResults: function (answers, uid, form) {
-                var opts = form[uid].opts || TYPES.poll.defaultOpts;
-                var _answers = getBlockAnswers(answers, uid);
-                var lines = makePollTable(_answers, opts);
-
-                var total = makePollTotal(_answers, opts);
-                if (total) { lines.push(h('div', total)); }
-
-                return h('div.cp-form-type-poll', lines);
-            },
-            icon: h('i.cptools.cptools-form-poll')
-        },
         sort: {
             defaultOpts: {
                 values: [1,2].map(function (i) {
@@ -1669,6 +1575,100 @@ define([
             },
             icon: h('i.cptools.cptools-form-list-ordered')
         },
+        poll: {
+            defaultOpts: {
+                type: 'text', // Text or Days or Time
+                values: [1, 2, 3].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, answers, username, evOnChange) {
+                if (!opts) { opts = TYPES.poll.defaultOpts; }
+                if (!Array.isArray(opts.values)) { return; }
+
+                var lines = makePollTable(answers, opts);
+
+                // Add form
+                var addLine = opts.values.map(function (data) {
+                    var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
+                        h('i.fa.fa-times.cp-no'),
+                        h('i.fa.fa-check.cp-yes'),
+                        h('i.fa.fa-question.cp-maybe'),
+                    ]);
+                    var $c = $(cell);
+                    $c.data('option', data);
+                    var val = 0;
+                    $c.attr('data-value', val);
+                    $c.click(function () {
+                        val = (val+1)%3;
+                        $c.attr('data-value', val);
+                        evOnChange.fire();
+                    });
+                    cell._setValue = function (v) {
+                        val = v;
+                        $c.attr('data-value', val);
+                    };
+                    return cell;
+                });
+                // Name input
+                //var nameInput = h('input', { value: username || Messages.anonymous });
+                var nameInput = h('span.cp-poll-your-answers', Messages.form_pollYourAnswers)
+                addLine.unshift(h('div.cp-poll-cell', nameInput));
+                lines.push(h('div', addLine));
+
+                var total = makePollTotal(answers, opts);
+                if (total) { lines.push(h('div', total)); }
+
+                var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
+                var $tag = $(tag);
+
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res = {};
+                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
+                            var $el = $(el);
+                            res[$el.data('option')] = $el.attr('data-value');
+                        });
+                        return {
+                            values: res
+                        };
+                    },
+                    reset: function () {
+                        $tag.find('.cp-form-poll-choice').attr('data-value', 0);
+                    },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (res) {
+                        this.reset();
+                        if (!res || !res.values) { return; }
+                        var val = res.values;
+                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
+                            if (!el._setValue) { return; }
+                            var $el = $(el);
+                            el._setValue(val[$el.data('option')] || 0);
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid, form) {
+                var opts = form[uid].opts || TYPES.poll.defaultOpts;
+                var _answers = getBlockAnswers(answers, uid);
+                var lines = makePollTable(_answers, opts);
+
+                var total = makePollTotal(_answers, opts);
+                if (total) { lines.push(h('div', total)); }
+
+                return h('div.cp-form-type-poll', lines);
+            },
+            icon: h('i.cptools.cptools-form-poll')
+        },
     };
 
     var renderResults = function (content, answers) {

From 4dfe8ac0d056c1a31c95cc1c1030e5d8eb14aa74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 9 Jun 2021 15:47:01 +0100
Subject: [PATCH 21/30] Add hover style and hint to ordered list questions

---
 www/form/app-form.less | 14 ++++++++++++--
 www/form/inner.js      |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index fb4dc7c4e..b8d5785ca 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -506,17 +506,27 @@
             }
         }
     }
+    .cp-form-sort-hint {
+        margin-bottom: 10px;
+    }
     .cp-form-type-sort {
         cursor: grab;
-        padding: 2px;
+        padding: 5px;
         .cp-form-handle {
             margin-right: 5px;
         }
         .cp-form-sort-order {
-            border: 1px solid @cp_profile-hint;
+            border: 1px solid @cryptpad_text_col;
             padding: 0 5px;
             margin-right: 5px;
         }
+        &:hover {
+            background-color: @cp_app-bg;
+            color: @cryptpad_color_link;
+            .cp-form-sort-order {
+                border-color: @cryptpad_color_link;
+            }
+        }
     }
 
     .cp-form-type-poll-container {
diff --git a/www/form/inner.js b/www/form/inner.js
index 5d1ee5763..162e63441 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -106,6 +106,7 @@ define([
     Messages.form_type_multicheck = "Multiline Checkbox"; // XXX
     Messages.form_type_poll = "Poll"; // XXX
     Messages.form_type_sort = "Ordered list"; // XXX
+    Messages.form_sort_hint = "Please sort these items from most (1) to least (n) preferred.";
 
     Messages.form_type_md = "Description"; // XXX
     Messages.form_type_page = "Page break"; // XXX
@@ -1491,7 +1492,7 @@ define([
                     $(div).data('val', data);
                     return div;
                 });
-                var tag = h('div.cp-form-type-sort-container', els);
+                var tag = h('div.cp-form-type-sort-container', [h('div.cp-form-sort-hint', Messages.form_sort_hint), els]);
                 var $tag = $(tag);
                 var reorder = function () {
                     $tag.find('.cp-form-type-sort').each(function (i, el) {

From bf3804afdfca90680a71aa358503be7fe4ae017f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 9 Jun 2021 15:54:45 +0100
Subject: [PATCH 22/30] Add temporary translation keys

---
 www/form/inner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 162e63441..8cff3bf83 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -106,7 +106,7 @@ define([
     Messages.form_type_multicheck = "Multiline Checkbox"; // XXX
     Messages.form_type_poll = "Poll"; // XXX
     Messages.form_type_sort = "Ordered list"; // XXX
-    Messages.form_sort_hint = "Please sort these items from most (1) to least (n) preferred.";
+    Messages.form_sort_hint = "Please drag these items from most (1) to least (n) preferred.";
 
     Messages.form_type_md = "Description"; // XXX
     Messages.form_type_page = "Page break"; // XXX
@@ -127,6 +127,7 @@ define([
     Messages.form_answered = "You already answered this form";
 
     Messages.form_results = "Responses";
+    Messages.form_results_empty = "There are no responses";
     Messages.form_editor = "Editor";
     Messages.form_form = "Form";
     Messages.form_viewResults = "Go to responses";

From d77b9c4ffdc53bf530a4ae319d348288c62ec464 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 9 Jun 2021 17:03:22 +0200
Subject: [PATCH 23/30] Form sorted list hint

---
 www/form/inner.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 162e63441..359f678df 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1492,7 +1492,10 @@ define([
                     $(div).data('val', data);
                     return div;
                 });
-                var tag = h('div.cp-form-type-sort-container', [h('div.cp-form-sort-hint', Messages.form_sort_hint), els]);
+                var tag = h('div.cp-form-type-sort-container', [
+                    h('div.cp-form-sort-hint', Messages._getKey('form_sort_hint', [els.length])),
+                    els
+                ]);
                 var $tag = $(tag);
                 var reorder = function () {
                     $tag.find('.cp-form-type-sort').each(function (i, el) {

From 78722307ecb6d4f911cae41b0605b15bff03597c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 9 Jun 2021 16:04:58 +0100
Subject: [PATCH 24/30] Change temporary translation key

---
 www/form/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 8cff3bf83..f2d5fbe37 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -106,7 +106,7 @@ define([
     Messages.form_type_multicheck = "Multiline Checkbox"; // XXX
     Messages.form_type_poll = "Poll"; // XXX
     Messages.form_type_sort = "Ordered list"; // XXX
-    Messages.form_sort_hint = "Please drag these items from most (1) to least (n) preferred.";
+    Messages.form_sort_hint = "Please drag these items from most (1) to least ({0}) preferred.";
 
     Messages.form_type_md = "Description"; // XXX
     Messages.form_type_page = "Page break"; // XXX

From bb232776b32af9423e7ba60af03424c6041b1ec6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 10 Jun 2021 12:26:44 +0200
Subject: [PATCH 25/30] Add warning message when invalid answers in the form

---
 www/form/app-form.less | 16 ++++++++-
 www/form/inner.js      | 79 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index b8d5785ca..25fac542c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -205,6 +205,15 @@
                             margin-right: 10px;
                         }
                     }
+                    .cp-form-invalid-warning {
+                        color: @cp_form-invalid;
+                        ul {
+                            list-style-type: disclosure-closed;
+                        }
+                        li {
+                            text-align: left;
+                        }
+                    }
                 }
 
                 .cp-form-page-container {
@@ -261,6 +270,10 @@
 
                     .cp-form-block-question {
                         margin-bottom: 5px;
+                        .cp-form-block-question-number {
+                            font-weight: bold;
+                            margin-right: 10px;
+                        }
                     }
                     .cp-form-block-content {
                         overflow-x: auto;
@@ -278,7 +291,8 @@
                             justify-content: space-between;
                         }
                         input:invalid {
-                            border: 1px solid @cp_form-invalid;
+                            border: 2px solid @cp_form-invalid;
+                            color: @cp_form-invalid;
                         }
                         media-tag {
                             & > * {
diff --git a/www/form/inner.js b/www/form/inner.js
index d160c4b51..00c469d58 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -96,6 +96,8 @@ define([
     Messages.form_text_url = "URL";
     Messages.form_text_email = "Email";
     Messages.form_text_number = "Number";
+    Messages.form_input_ph_url = "Enter a URL here";
+    Messages.form_input_ph_email = "Email address";
 
     Messages.form_default = "Your question here?";
     Messages.form_type_input = "Text"; // XXX
@@ -119,9 +121,13 @@ define([
 
     Messages.form_submit = "Submit";
     Messages.form_update = "Update";
+    Messages.form_submitWarning = "Submit anyway";
+    Messages.form_updateWarning  = "Update anyway";
     Messages.form_reset = "Reset";
     Messages.form_sent = "Sent";
     Messages.form_delete = "Delete";
+    Messages.form_invalidWarning = "There are errors in some answers:";
+    Messages.form_invalidQuestion = "Question {0}";
 
     Messages.form_cantFindAnswers = "Unable to retrieve your existing answers for this form.";
     Messages.form_answered = "You already answered this form";
@@ -169,9 +175,7 @@ define([
     Messages.form_addMultipleHint = "Add multiple dates and times"
     Messages.form_clear = "Clear";
 
-    Messages.form_page_prev = "Previous";
     Messages.form_page = "Page {0}/{1}";
-    Messages.form_page_next = "Next";
 
     Messages.form_anonymousBox = "Answer anonymously";
 
@@ -607,12 +611,13 @@ define([
                             val = +f.selectedDates[0];
                         }
                     }
-                    if (values.indexOf(val) === -1) { values.push(val); }
+                    if (val && values.indexOf(val) === -1) { values.push(val); }
                     else { duplicates = true; }
                 });
             }
+            values = values.filter(Boolean); // Block empty or undeinfed options
             if (!values.length) {
-                return void UI.warn(Messages.error); // XXX error message: no values
+                return void UI.warn(Messages.error);
             }
             var res = { values: values };
 
@@ -959,7 +964,8 @@ define([
             get: function (opts, a, n, evOnChange) {
                 if (!opts) { opts = TYPES.input.defaultOpts; }
                 var tag = h('input', {
-                    type: opts.type
+                    type: opts.type,
+                    placeholder: Messages['form_input_ph_'+opts.type] || ''
                 });
                 var $tag = $(tag);
                 $tag.on('change keypress', Util.throttle(function () {
@@ -1833,7 +1839,7 @@ define([
         });
         return results;
     };
-    var makeFormControls = function (framework, content, update) {
+    var makeFormControls = function (framework, content, update, evOnChange) {
         var loggedIn = framework._.sfCommon.isLoggedIn();
         var metadataMgr = framework._.cpNfInner.metadataMgr;
 
@@ -1886,6 +1892,7 @@ define([
                     console.error(err || data.error);
                     return void UI.warn(Messages.error);
                 }
+                window.onbeforeunload = undefined;
                 if (!update) {
                     // Add results button
                     addResultsButton(framework, content);
@@ -1901,7 +1908,57 @@ define([
             reset = undefined;
         }
 
+        var invalid = h('div.cp-form-invalid-warning');
+        var $invalid = $(invalid);
+        if (evOnChange) {
+            var origin, priv;
+            if (APP.common) {
+                var metadataMgr = APP.common.getMetadataMgr();
+                priv = metadataMgr.getPrivateData();
+                origin = priv.origin;
+            }
+            evOnChange.reg(function () {
+                var $container = $('div.cp-form-creator-content');
+                var $inputs = $container.find('input:invalid');
+                if (!$inputs.length) {
+                    $send.text(update ? Messages.form_update : Messages.form_submit);
+                    return void $invalid.empty();
+                }
+                $send.text(update ? Messages.form_updateWarning : Messages.form_submitWarning);
+                var lis = [];
+                $inputs.each(function (i, el) {
+                    var $el = $(el).closest('.cp-form-block');
+                    var number = $el.find('.cp-form-block-question-number').text();
+                    var a = h('a', {
+                        href: origin + '#' + Messages._getKey('form_invalidQuestion', [number])
+                    }, Messages._getKey('form_invalidQuestion', [number]));
+                    $(a).click(function (e) {
+                        e.preventDefault();
+                        if (!$el.is(':visible')) {
+                            var pages = $el.closest('.cp-form-page').index();
+                            console.error($el, $el.prevAll());
+                            if (APP.refreshPage) {
+                                APP.refreshPage(pages + 1);
+                            }
+                            // XXX find page number
+                        }
+                        $el[0].scrollIntoView();
+                    });
+                    var li = h('li', a);
+                    lis.push(li);
+                });
+                var list = h('ul', lis);
+                var content = [
+                    h('span', Messages.form_invalidWarning),
+                    list
+                ];
+                $invalid.empty().append(content);
+            });
+            evOnChange.fire();
+        }
+
         return h('div.cp-form-send-container', [
+            invalid,
             cbox ? h('div', cbox) : undefined,
             send, reset
         ]);
@@ -2002,6 +2059,7 @@ define([
 
 
         var elements = [];
+        var n = 1; // Question number
         content.order.forEach(function (uid) {
             var block = form[uid];
             var type = block.type;
@@ -2031,7 +2089,10 @@ define([
 
 
             var dragHandle;
-            var q = h('div.cp-form-block-question', block.q || Messages.form_default);
+            var q = h('div.cp-form-block-question', [
+                h('span.cp-form-block-question-number', (n++)+'.'),
+                h('span', block.q || Messages.form_default)
+            ]);
             var editButtons, editContainer;
 
             APP.formBlocks.push(data);
@@ -2203,7 +2264,7 @@ define([
                 var pageContainer = h('div.cp-form-page-container');
                 var $page = $(pageContainer);
                 _content.push(pageContainer);
-                var refreshPage = function (current) {
+                var refreshPage = APP.refreshPage = function (current) {
                     $page.empty();
                     if (!current || current < 1) { current = 1; }
                     if (current > pages) { current = pages; }
@@ -2257,7 +2318,7 @@ define([
         }
 
         // In view mode, add "Submit" and "reset" buttons
-        $container.append(makeFormControls(framework, content, Boolean(answers)));
+        $container.append(makeFormControls(framework, content, Boolean(answers), evOnChange));
     };
 
     var getTempFields = function () {

From 22e1eaed2450f554f7fa62e415a7dc3d841e71da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 10 Jun 2021 11:39:24 +0100
Subject: [PATCH 26/30] Remove testing code

---
 www/form/app-form.less | 2 +-
 www/form/inner.js      | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index b8d5785ca..93dad8b5c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -388,7 +388,7 @@
                         }
                     }
                     .cp-form-edit-block-input {
-                        margin-bottom: 5px; // XXX DB margin bug
+                        margin-bottom: 5px;
                         &.sortable-ghost { visibility: hidden; }
                         &.sortable-drag { opacity: 0.9 !important; }
                         display: flex;
diff --git a/www/form/inner.js b/www/form/inner.js
index d160c4b51..bef36c373 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -714,12 +714,6 @@ define([
         // Add answers
         var bodyEls = [];
         if (Array.isArray(answers)) {
-            for(var i = 0; i< 20; i++) { // XXX
-                answers.push({
-                    user: { name: 'User '+i },
-                    results: { values: {} }
-                });
-            }
             answers.forEach(function (answerObj) {
                 var answer = answerObj.results;
                 if (!answer || !answer.values) { return; }

From 10db351addff840b56145e548f4be42480fe11b3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 10 Jun 2021 13:03:15 +0200
Subject: [PATCH 27/30] Update total in form polls when the user is answering

---
 www/form/inner.js | 104 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 29 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 00c469d58..8940ce2a7 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -719,12 +719,6 @@ define([
         // Add answers
         var bodyEls = [];
         if (Array.isArray(answers)) {
-            for(var i = 0; i< 20; i++) { // XXX
-                answers.push({
-                    user: { name: 'User '+i },
-                    results: { values: {} }
-                });
-            }
             answers.forEach(function (answerObj) {
                 var answer = answerObj.results;
                 if (!answer || !answer.values) { return; }
@@ -758,9 +752,35 @@ define([
 
         return lines;
     };
-    var makePollTotal = function (answers, opts) {
+    var makePollTotal = function (answers, opts, myLine, evOnChange) {
         if (!Array.isArray(answers)) { return; }
         var totals = {};
+        var myTotals = {};
+        var updateMyTotals = function () {
+            if (!myLine) { return; }
+            opts.values.forEach(function (data) {
+                myLine.some(function (el) {
+                    if ($(el).data('option') !== data) { return; }
+                    var res = Number($(el).attr('data-value')) || 0;
+                    if (res === 1) {
+                        myTotals[data] = {
+                            y: 1,
+                            m: 0
+                        };
+                    }
+                    else if (res === 2) {
+                        myTotals[data] = {
+                            y: 0,
+                            m: 1
+                        };
+                    } else {
+                        delete myTotals[data];
+                    }
+                    return true;
+                });
+
+            });
+        };
         var totalEls = opts.values.map(function (data) {
             var y = 0; // Yes
             var m = 0; // Maybe
@@ -785,27 +805,56 @@ define([
             ]);
         });
 
-        var totalMax = {
-            value: 0,
-            data: []
-        };
-        Object.keys(totals).forEach(function (k) {
-            var obj = totals[k];
-            if (obj.y === totalMax.value) {
-                totalMax.data.push(k);
-            } else if (obj.y > totalMax.value) {
-                totalMax.value = obj.y;
-                totalMax.data = [k];
-            }
-        });
         totalEls.unshift(h('div.cp-poll-cell', Messages.form_pollTotal));
         var total = h('div.cp-poll-total', totalEls);
-        if (totalMax.value) {
-            totalMax.data.forEach(function (k) {
-                $(total).find('[data-id="'+k+'"]').addClass('cp-poll-best');
+        var $total = $(total);
+        var refreshBest = function () {
+            var totalMax = {
+                value: 0,
+                data: []
+            };
+            Object.keys(totals).forEach(function (k) {
+                var obj = Util.clone(totals[k]);
+                if (myTotals[k]) {
+                    obj.y += myTotals[k].y || 0;
+                    obj.m += myTotals[k].m || 0;
+                }
+                if (obj.y === totalMax.value) {
+                    totalMax.data.push(k);
+                } else if (obj.y > totalMax.value) {
+                    totalMax.value = obj.y;
+                    totalMax.data = [k];
+                }
+            });
+            if (totalMax.value) {
+                $total.find('[data-id]').removeClass('cp-poll-best');
+                totalMax.data.forEach(function (k) {
+                    $total.find('[data-id="'+k+'"]').addClass('cp-poll-best');
+                });
+            }
+        };
+        refreshBest();
+
+        if (myLine && evOnChange) {
+            var updateValues = function () {
+                totalEls.forEach(function (cell) {
+                    var $c = $(cell);
+                    var data = $c.attr('data-id');
+                    if (!data) { return; }
+                    var y = totals[data].y + ((myTotals[data] || {}).y || 0);
+                    var m = totals[data].m + ((myTotals[data] || {}).m || 0);
+                    $c.find('.cp-form-total-yes').text(y);
+                    $c.find('.cp-form-total-maybe').text('('+m+')');
+                });
+            };
+            evOnChange.reg(function () {
+                updateMyTotals();
+                updateValues();
+                refreshBest();
             });
         }
 
+
         return total;
     };
 
@@ -828,6 +877,7 @@ define([
     };
 
     var getBlockAnswers = function (answers, uid, filterCurve) {
+        if (!answers) { return; }
         return Object.keys(answers || {}).map(function (user) {
             if (filterCurve && user === filterCurve) { return; }
             try {
@@ -1627,7 +1677,7 @@ define([
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
-                var total = makePollTotal(answers, opts);
+                var total = makePollTotal(answers, opts, addLine, evOnChange);
                 if (total) { lines.push(h('div', total)); }
 
                 var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
@@ -1936,11 +1986,7 @@ define([
                         e.preventDefault();
                         if (!$el.is(':visible')) {
                             var pages = $el.closest('.cp-form-page').index();
-                            console.error($el, $el.prevAll());
-                            if (APP.refreshPage) {
-                                APP.refreshPage(pages + 1);
-                            }
-                            // XXX find page number
+                            if (APP.refreshPage) { APP.refreshPage(pages + 1); }
                         }
                         $el[0].scrollIntoView();
                     });

From 0dd8c7d25588c289f6050ea7c62252e9f1fa5a9f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 10 Jun 2021 13:26:09 +0200
Subject: [PATCH 28/30] Remove chat and userlist when answering a form

---
 www/common/sframe-app-framework.js |  4 +++-
 www/common/toolbar.js              | 11 +++++++++++
 www/form/inner.js                  |  8 ++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index e99cc4187..869f079d3 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -572,7 +572,9 @@ define([
                 if (!readOnly) { onLocal(); }
                 evOnReady.fire(newPad);
 
-                common.openPadChat(onLocal);
+                // In forms, only editors can see the chat
+                if (!readOnly || type !== 'form') { common.openPadChat(onLocal); }
+
                 if (!readOnly && cursorGetter) {
                     common.openCursorChannel(onLocal);
                     cursor = common.createCursor(onLocal);
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 26ff870f6..785d1bc7e 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -166,6 +166,7 @@ MessengerUI, Messages, Pages) {
     var showColors = false;
     var updateUserList = function (toolbar, config, forceOffline) {
         if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
+        if (toolbar.isAlone) { return; }
         // Make sure the elements are displayed
         var $userButtons = toolbar.userlist;
         var $userlistContent = toolbar.userlistContent;
@@ -1216,6 +1217,7 @@ MessengerUI, Messages, Pages) {
         if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
         var notify = function(type, name, oldname) {
+            if (toolbar.isAlone) { return; }
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
             if (typeof name === "undefined") { return; }
             name = name || Messages.anonymous;
@@ -1515,6 +1517,15 @@ MessengerUI, Messages, Pages) {
             }
         };
 
+        // disable notification, userlist and chat
+        toolbar.alone = function () {
+            toolbar.userlist.hide();
+            toolbar.chat.hide();
+            $('.cp-toolbar-userlist-drawer').remove();
+            $('.cp-toolbar-chat-drawer').remove();
+            toolbar.isAlone = true;
+        };
+
         // On log out, remove permanently the realtime elements of the toolbar
         Common.onLogout(function () {
             failed();
diff --git a/www/form/inner.js b/www/form/inner.js
index 8940ce2a7..fa62de74b 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2000,7 +2000,7 @@ define([
                 ];
                 $invalid.empty().append(content);
             });
-            evOnChange.fire();
+            evOnChange.fire(true);
         }
 
         return h('div.cp-form-send-container', [
@@ -2022,7 +2022,8 @@ define([
             var _answers = Util.clone(answers || {});
             delete _answers._proof;
             delete _answers._userdata;
-            evOnChange.reg(function () {
+            evOnChange.reg(function (noBeforeUnload) {
+                if (noBeforeUnload) { return; }
                 var results = getFormResults();
                 if (!answers || Sortify(_answers) !== Sortify(results)) {
                     window.onbeforeunload = function () {
@@ -2397,6 +2398,9 @@ define([
         var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']);
         $toolbarContainer.after(helpMenu.menu);
 
+        if (!APP.isEditor) {
+            framework._.toolbar.alone();
+        }
 
         var makeFormSettings = function () {
             // Private / public status

From c4f7f9d55ef7b113d17ff272816f637b04825e3a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 10 Jun 2021 13:28:29 +0200
Subject: [PATCH 29/30] Make results selactable

---
 www/form/app-form.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 01ff0cfdc..dcbe5758a 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -32,6 +32,9 @@
         div.cp-form-creator-results, .cp-app-form-button-creator {
             display: none !important;
         }
+        .cp-form-block {
+            .tools_unselectable();
+        }
     }
 
     #cp-app-form-container {
@@ -238,7 +241,6 @@
                     }
                 }
                 .cp-form-block {
-                    .tools_unselectable();
                     background: @cp_form-bg1;
                     padding: 10px;
                     &:not(:last-child) {

From c63e6a4f32886430571d7b2e5a04fcf1b5485602 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 10 Jun 2021 13:31:39 +0200
Subject: [PATCH 30/30] Info message when there are no responses

---
 www/form/inner.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index fa62de74b..fda6bbf38 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1734,11 +1734,18 @@ define([
 
     var renderResults = function (content, answers) {
         var $container = $('div.cp-form-creator-results').empty();
+
+        if (!Object.keys(answers || {}).length) {
+            $container.append(h('div.alert.alert-info', Messages.form_results_empty));
+            return;
+        }
+
         var controls = h('div.cp-form-creator-results-controls');
         var $controls = $(controls).appendTo($container);
         var results = h('div.cp-form-creator-results-content');
         var $results = $(results).appendTo($container);
 
+
         var summary = true;
         var form = content.form;