From 7dc7d5d95081cc2101026a92570b0c10ab4f979c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 9 Mar 2018 12:12:47 +0100
Subject: [PATCH 01/33] lint compliance

---
 customize.dist/src/less2/include/help.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less
index 7e22b713a..90f23119b 100644
--- a/customize.dist/src/less2/include/help.less
+++ b/customize.dist/src/less2/include/help.less
@@ -18,7 +18,7 @@
             margin: 0;
             padding: 15px;
             a {
-                color: darken(@colortheme_link-color, 30%);
+                //color: darken(@colortheme_link-color, 30%);
                 @spin: spin(lighten(@bg-color, 15%), 180);
                 color: contrast(lighten(@bg-color, 15%), lighten(@spin, 10%), darken(@spin, 10%));
                 //color: darken(spin(lighten(@bg-color, 15%), 180), 10%);

From b2df2ba341ceffdd876679188c1e355fcb1c014a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 12 Mar 2018 17:50:47 +0100
Subject: [PATCH 02/33] prototype owned file upload

---
 package.json |  1 +
 rpc.js       | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/package.json b/package.json
index 3ab228851..e94c51a14 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "chainpad-server": "^2.0.0",
     "express": "~4.16.0",
+    "mkdirp": "^0.5.1",
     "nthen": "~0.1.0",
     "pull-stream": "^3.6.1",
     "replify": "^1.2.0",
diff --git a/rpc.js b/rpc.js
index 465413fd1..3ad1a9a42 100644
--- a/rpc.js
+++ b/rpc.js
@@ -13,6 +13,7 @@ const Package = require('./package.json');
 const Pinned = require('./pinned');
 const Saferphore = require("saferphore");
 const nThen = require("nthen");
+const Mkdirp = require("mkdirp");
 
 var RPC = module.exports;
 
@@ -980,6 +981,93 @@ var upload_complete = function (Env, publicKey, cb) {
     tryRandomLocation(handleMove);
 };
 
+var owned_upload_complete = function (Env, safeKey, cb) {
+    var session = getSession(Env.Sessions, safeKey);
+
+    // the file has already been uploaded to the staging area
+    // close the pending writestream
+    if (session.blobstage && session.blobstage.close) {
+        session.blobstage.close();
+        delete session.blobstage;
+    }
+
+    var oldPath = makeFilePath(Env.paths.staging, safeKey);
+
+    // construct relevant paths
+    var root = Env.paths.staging;
+
+    //var safeKey = escapeKeyCharacters(safeKey);
+    var safeKeyPrefix = safeKey.slice(0, 2);
+
+    var blobId = createFileId();
+    var blobIdPrefix = blobId.slice(0, 2);
+
+    var plannedPath = Path.join(root, safeKeyPrefix, safeKey, blobIdPrefix);
+
+    var tries = 0;
+
+    var chooseSafeId = function (cb) {
+        if (tries >= 3) {
+            // you've already failed three times in a row
+            // give up and return an error
+            cb('E_REPEATED_FAILURE');
+        }
+
+        var path = Path.join(plannedPath, blobId);
+        Fs.access(path, Fs.constants.R_OK | Fs.constants.W_OK, function (e) {
+            if (!e) {
+                // generate a new id (with the same prefix) and recurse
+                blobId = blobIdPrefix + createFileId().slice(2);
+                return void chooseSafeId(cb);
+            } else if (e.code === 'ENOENT') {
+                // no entry, so it's safe for us to proceed
+                return void cb(void 0, path);
+            } else {
+                // it failed in an unexpected way. log it
+                // try again, but no more than a fixed number of times...
+                tries++;
+                chooseSafeId(cb);
+            }
+        });
+    };
+
+    // the user wants to move it into their own space
+    // /blob/safeKeyPrefix/safeKey/blobPrefix/blobID
+
+    var finalPath;
+    nThen(function (w) {
+        // make the requisite directory structure using Mkdirp
+        Mkdirp(plannedPath, w(function (e /*, path */) {
+            if (e) { // does not throw error if the directory already existed
+                w.abort();
+                return void cb(e); // XXX do we export Errors or strings?
+            }
+        }));
+    }).nThen(function (w) {
+        // produce an id which confirmably does not collide with another
+        chooseSafeId(w(function (e, path) {
+            if (e) {
+                w.abort();
+                return void cb(e);
+            }
+            finalPath = path; // this is where you'll put the new file
+        }));
+    }).nThen(function (w) {
+        // move the existing file to its new path
+        Fs.rename(oldPath /* XXX */, finalPath, w(function (e) {
+            if (e) {
+                w.abort();
+                return void cb(e.code);
+            }
+            // otherwise it worked...
+        }));
+    }).nThen(function () {
+        // clean up their session when you're done
+        // call back with the blob id...
+        cb(void 0, blobId);
+    });
+};
+
 var upload_status = function (Env, publicKey, filesize, cb) {
     var paths = Env.paths;
 
@@ -1054,6 +1142,7 @@ var isAuthenticatedCall = function (call) {
         'GET_LIMIT',
         'UPLOAD_STATUS',
         'UPLOAD_COMPLETE',
+        'OWNED_UPLOAD_COMPLETE',
         'UPLOAD_CANCEL',
         'EXPIRE_SESSION',
         'CLEAR_OWNED_CHANNEL',
@@ -1128,6 +1217,7 @@ RPC.create = function (
     var pinPath = paths.pin = keyOrDefaultString('pinPath', './pins');
     var blobPath = paths.blob = keyOrDefaultString('blobPath', './blob');
     var blobStagingPath = paths.staging = keyOrDefaultString('blobStagingPath', './blobstage');
+    console.log(blobStagingPath);
 
     var isUnauthenticateMessage = function (msg) {
         return msg && msg.length === 2 && isUnauthenticatedCall(msg[0]);
@@ -1375,6 +1465,12 @@ RPC.create = function (
                     WARN(e, hash);
                     Respond(e, hash);
                 });
+            case 'OWNED_UPLOAD_COMPLETE':
+                if (!privileged) { return deny(); }
+                return void owned_upload_complete(Env, safeKey, function (e, blobId) {
+                    WARN(e, blobId);
+                    Respond(e, blobId);
+                });
             case 'UPLOAD_CANCEL':
                 if (!privileged) { return deny(); }
                 return void upload_cancel(Env, safeKey, function (e) {

From c9ed6d6bf8a602e56768e686dcf78dcd55ae6027 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 13 Mar 2018 11:31:08 +0100
Subject: [PATCH 03/33] New pad creation screen

---
 customize.dist/pages.js                       |   7 +-
 .../src/less2/include/checkmark.less          |  67 ++++
 .../src/less2/include/colortheme.less         |   7 +
 .../src/less2/include/creation.less           | 288 ++++++++++------
 customize.dist/template.js                    |   2 +
 www/common/common-interface.js                |   5 +-
 www/common/common-thumbnail.js                |   3 +
 www/common/common-ui-elements.js              | 319 ++++++++++--------
 www/common/cryptpad-common.js                 |  18 +-
 www/common/outer/async-store.js               |   7 +
 www/common/outer/store-rpc.js                 |   6 +
 www/common/sframe-common-outer.js             |  69 +++-
 www/common/sframe-common.js                   |   4 +-
 www/common/sframe-protocol.js                 |   2 +
 14 files changed, 535 insertions(+), 269 deletions(-)
 create mode 100644 customize.dist/src/less2/include/checkmark.less

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index a08e40d3c..5178cac17 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -384,7 +384,8 @@ define([
                 var item = faq[c][q];
                 if (typeof item !== "object") { return; }
                 var answer = h('p.cp-faq-questions-a');
-                var question = h('p.cp-faq-questions-q');
+                var hash = c + '-' + q;
+                var question = h('p.cp-faq-questions-q#' + hash);
                 $(question).click(function () {
                     if ($(answer).is(':visible')) {
                         return void $(answer).slideUp();
@@ -401,6 +402,10 @@ define([
                 h('div.cp-faq-category-questions', questions)
             ]));
         });
+        var hash = window.location.hash;
+        if (hash) {
+            $(categories).find(hash).click();
+        }
         return h('div#cp-main', [
             infopageTopbar(),
             h('div.container.cp-container', [
diff --git a/customize.dist/src/less2/include/checkmark.less b/customize.dist/src/less2/include/checkmark.less
new file mode 100644
index 000000000..30c6e7d4a
--- /dev/null
+++ b/customize.dist/src/less2/include/checkmark.less
@@ -0,0 +1,67 @@
+@import (once) "./colortheme-all.less";
+
+.checkmark_main(@size) {
+
+    @width: round(@size / 8);
+    @dim1: round(@size / 3);
+    @dim2: round(2 * @size / 3);
+    @top: round(@size / 12);
+    // <label.cp-checkmark><input><span.cp-checkmark-mark></span>Text</label>
+    .cp-checkmark {
+        margin: 0;
+        display: flex;
+        align-items: center;
+        position: relative;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+
+        &.cp-checkmark-secondary {
+            .cp-checkmark-mark {
+                &:after {
+                    border-color: @colortheme_checkmark-col2;
+                }
+            }
+            input {
+                &:checked ~ .cp-checkmark-mark {
+                    background-color: @colortheme_checkmark-back2;
+                }
+            }
+        }
+        &:hover .cp-checkmark-mark {
+            background-color: @colortheme_checkmark-back0-active;
+        }
+
+        input {
+            display: none;
+            &:checked ~ .cp-checkmark-mark {
+                background-color: @colortheme_checkmark-back1;
+                &:after {
+                    display: block;
+                }
+            }
+        }
+
+        .cp-checkmark-mark {
+            margin-right: 10px;
+            position: relative;
+            height: @size;
+            width: @size;
+            background-color: @colortheme_checkmark-back0;
+            display: flex;
+            justify-content: center;
+            &:after {
+                content: "";
+                display: none;
+                margin-top: @top;
+                width: @dim1;
+                height: @dim2;
+                transform: rotate(45deg);
+                border: solid @colortheme_checkmark-col1;
+                border-width: 0 @width @width 0;
+            }
+        }
+
+    }
+}
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 1a2b143e5..1bdb69291 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -109,3 +109,10 @@
 @cryptpad_color_grey: #999999;
 @cryptpad_header_col: #1E1F1F;
 @cryptpad_text_col: #3F4141;
+
+@colortheme_checkmark-back0: #ffffff;
+@colortheme_checkmark-back0-active: #bbbbbb;
+@colortheme_checkmark-back1: #FF0073;
+@colortheme_checkmark-col1: #ffffff;
+@colortheme_checkmark-back2: #FFFFFF;
+@colortheme_checkmark-col2: #000000;
diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 16bce0637..6d7e6462c 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -1,5 +1,7 @@
 @import (once) "./colortheme-all.less";
 @import (once) "./tools.less";
+@import (once) "./checkmark.less";
+@import (once) './icon-colors.less';
 
 .creation_main() {
     .tippy-popper {
@@ -31,149 +33,211 @@
             max-width: 100%;
             margin: 40px auto;
             text-align: left;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: center;
-            align-items: center;
-            h2 {
-                width: 100%;
-                display: flex;
-                margin-bottom: 20px;
-                justify-content: space-between;
-                .cp-creation-help {
-                    display: none;
-                }
-            }
-            .cp-creation-help-container {
-                width: 100%;
-                display: flex;
-                justify-content: space-between;
-                p {
-                    padding: 0 20px;
-                    flex-grow: 0;
-                    flex-shrink: 0;
-                    flex-basis: 50%;
-                    text-align: justify;
-                }
-            }
-            @media screen and (max-width: 500px) {
-                width: ~"calc(100% - 30px)";
-            }
-            @media screen and (max-height: 800px), screen and (max-width: 500px) {
-                h2 .cp-creation-help {
-                    display: inline;
-                }
-                .cp-creation-help-container {
-                    display: none;
-                }
-            }
-            @media screen and (min-height: 601px) {
-                @media screen and (min-width: 501px) {
-                    p {
-                        display: block !important;
-                    }
-                }
-            }
         }
 
         .cp-creation-create, .cp-creation-settings {
+            @creation-button: #FF0073;
             button {
                 .tools_unselectable();
                 padding: 15px;
-                background: darken(@colortheme_loading-bg, 10%);
+                //background: @creation-button;
+                background: spin(@colortheme_loading-bg, 180);
+                background: #60ff6b;
+                background: #30b239;
                 color: @colortheme_loading-color;
+                color: spin(#60ff6b, 180);
+                color: #000;
+                color: #FFF;
+                font-weight: bold;
                 margin: 3px 10px;
                 border: none;
                 cursor: pointer;
                 outline: none;
                 &:hover {
-                    background: darken(@colortheme_loading-bg, 5%);
-                }
-                &.cp-creation-button-selected {
-                    color: darken(@colortheme_loading-bg, 10%);
-                    background: @colortheme_loading-color;
+                    background: darken(@creation-button, 5%);
                 }
             }
         }
+        .cp-creation-create {
+            text-align: center;
+        }
 
-        input[type="radio"] {
-            display: none;
-            &:checked {
-                & + label {
-                    font-weight: bold;
-                    background-color: lighten(@colortheme_loading-bg, 20%);
-                    cursor: default;
-                    border: 1px solid #c1158e;
-                    &:hover {
-                        background-color: lighten(@colortheme_loading-bg, 20%);
+        #cp-creation-form {
+            display: flex;
+            flex-flow: column;
+            align-items: center;
+            & > div {
+                width: 400px;
+                max-width: 100%;
+                display: flex;
+                align-items: center;
+                flex-wrap: wrap;
+                font-size: 16px;
+                margin: 10px 0;
+                label {
+                    flex: 1;
+                }
+                input[type="checkbox"] {
+                    &+ label {
+                        margin-bottom: 0;
+                        flex: 1;
+                        padding: 0 10px;
                     }
                 }
-            }
-        }
-        input[type="radio"] + label {
-            .tools_unselectable();
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-            width: 200px;
-            height: 50px;
-            padding: 5px;
-            margin: 0 20px;
-            border: 1px solid @colortheme_loading-color;
-            cursor: pointer;
-            &:hover {
-                background-color: lighten(@colortheme_loading-bg, 10%);
-            }
-        }
-        .cp-creation-expire {
-            #cp-creation-expire-true {
-                display: none;
-                &:checked {
-                    & + label {
-                        height: 100px;
-                        .cp-creation-expire-picker {
-                            display: inline;
-                        }
+                .cp-creation-help {
+                    font-size: 18px;
+                    color: white;
+                    &:hover {
+                        color: #AAA;
+                        text-decoration: none;
                     }
                 }
             }
-            label[for="cp-creation-expire-true"] {
-                flex-wrap: wrap;
+            .cp-creation-expire {
                 .cp-creation-expire-picker {
-                    display: none;
+                    display: block;
+                    overflow: hidden;
+                    max-height: 0px;
+                    transition: max-height 0.5s ease-in-out;
+                    width: 100%;
+                    text-align: center;
+                    margin-top: 10px;
+                    input {
+                        width: 100px;
+                    }
                 }
-                input {
-                    width: 70px;
+                .cp-creation-expire-picker.active {
+                    max-height: 40px;
                 }
-                select {
-                    width: 100px;
+            }
+            .cp-creation-settings {
+                button {
+                    margin: 0;
+                    padding: 0;
                 }
-                input, select {
-                    border: none;
-                    height: 30px;
-                    background: @colortheme_loading-bg;
-                    color: @colortheme_loading-color;
-                    border-radius: 3px;
+                .cp-filler { flex: 1; }
+            }
+
+            div.cp-creation-template {
+                width: 100%;
+                background-color: darken(@colortheme_modal-bg, 3%);
+                padding: 20px;
+                margin: 30px 0;
+            }
+            .cp-creation-template-container {
+                width: 100%;
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: center;
+                overflow-y: auto;
+                align-items: center;
+                .cp-creation-template-element {
+                    @darker: darken(@colortheme_modal-fg, 30%);
+
+                    width: 125px;
+                    padding: 10px;
+                    margin: 5px;
+                    display: inline-flex;
+                    flex-flow: column;
+
+                    box-sizing: content-box;
+
+                    text-align: left;
+                    line-height: 1em;
+                    cursor: pointer;
+
+                    background-color: #111;
+                    color: @darker;
+                    border: 1px solid transparent;
+
+                    &.cp-creation-template-selected {
+                        border: 1px solid white;
+                        background-color: #222;
+                    }
+
+                    transition: all 0.1s;
+
+                    &:hover {
+                        color: @colortheme_modal-fg;
+                    }
+
+                    align-items: center;
+
+                    img {
+                        max-width: 100px;
+                        max-height: 100px;
+                        background: #fff;
+                    }
+
+                    .cp-creation-template-element-name {
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        height: 20px;
+                        line-height: 20px;
+                        margin-top: 5px;
+                        max-width: 100%;
+                    }
+                    .fa {
+                        cursor: pointer;
+                        width: 100px;
+                        height: 100px;
+                        font-size: 70px;
+                        text-align: center;
+                        line-height: 100px;
+                    }
                 }
             }
         }
-        .cp-creation-settings {
-            justify-content: left;
-            a {
-                color: #0275d8;
-                &:hover {
-                    color: lighten(#0275d8, 10%);
-                }
+
+        .cp-creation-deleted-container {
+            text-align: center;
+            .cp-creation-deleted {
+                background: #111;
+                padding: 10px;
+                text-align: center;
+                font-weight: bold;
+                display: inline-block;
             }
-            &> span.fa {
-                margin-left: 15px;
+        }
+
+        .checkmark_main(30px);
+
+        @media screen and (max-width: @browser_media-narrow-screen) {
+            & > div {
+                width: 95%;
+                margin: 10px auto;
             }
         }
-        .cp-creation-deleted {
-            background: #111;
-            padding: 10px;
-            text-align: justify;
-            font-weight: bold;
+        @media screen and (max-width: @browser_media-medium-screen) {
+            #cp-creation-form {
+                div.cp-creation-template {
+                    margin: 0;
+                    padding: 5px;
+                    .cp-creation-template-container {
+                        .cp-creation-template-element {
+                            flex-flow: row;
+                            margin: 1px;
+                            padding: 5px;
+                            img {
+                                display: none;
+                            }
+                            .fa {
+                                font-size: 18px;
+                                width: 20px;
+                                height: 20px;
+                                line-height: 20px;
+                                display: inline !important;
+                            }
+                            .cp-creation-template-element-name {
+                                margin: 0;
+                                margin-left: 5px;
+                            }
+                        }
+                    }
+                }
+            }
         }
+
     }
 }
diff --git a/customize.dist/template.js b/customize.dist/template.js
index 2aed683ce..9285567ca 100644
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -108,6 +108,8 @@ $(function () {
             require([ '/customize/main.js', ], function () {});
         } else if (/invite/.test(pathname)) {
             require([ '/invite/main.js'], function () {});
+        } else if (/faq/.test(pathname)) {
+            window.location.hash = window.location.hash;
         } else {
             require([ '/customize/main.js', ], function () {});
         }
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index d10b289cd..c486df7cc 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -638,9 +638,10 @@ define([
         var $icon = UI.getIcon();
         if (!data) { return $icon; }
         var href = data.href;
-        if (!href) { return $icon; }
+        var type = data.type;
+        if (!href && !type) { return $icon; }
 
-        var type = Hash.parsePadUrl(href).type;
+        if (!type) { type = Hash.parsePadUrl(href).type; }
         $icon = UI.getIcon(type);
 
         return $icon;
diff --git a/www/common/common-thumbnail.js b/www/common/common-thumbnail.js
index f3864e6a3..455b095c9 100644
--- a/www/common/common-thumbnail.js
+++ b/www/common/common-thumbnail.js
@@ -237,6 +237,9 @@ define([
         $span.prepend(img);
         cb($(img));
     };
+    Thumb.addThumbnail = function(thumb, $span, cb) {
+        return addThumbnail(null, thumb, $span, cb);
+    };
     var getKey = function (href) {
         var parsed = Hash.parsePadUrl(href);
         return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3d6b33964..ce716640e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1792,6 +1792,7 @@ define([
 
     UIElements.setExpirationValue = function (val, $expire) {
         if (val && typeof (val) === "number") {
+            $expire.find('#cp-creation-expire').attr('checked', true).trigger('change');
             $expire.find('#cp-creation-expire-true').attr('checked', true);
             if (val % (3600 * 24 * 30) === 0) {
                 $expire.find('#cp-creation-expire-unit').val("month");
@@ -1828,16 +1829,21 @@ define([
         };
 
         // Title
-        $creation.append(h('h1.cp-creation-title', Messages['button_new'+type]));
+        $creation.append(h('h1.cp-creation-title', 'Create a new pad')); // XXX
 
         // Deleted pad warning
-        if (metadataMgr.getPrivateData().isDeleted) {
-            $creation.append(h('div.cp-creation-deleted', Messages.creation_404));
+        if (metadataMgr.getPrivateData().isDeleted || true) { // XXX
+            $creation.append(h('div.cp-creation-deleted-container',
+                h('div.cp-creation-deleted', Messages.creation_404)
+            ));
         }
 
-        var createHelper = function (text) {
-            var q = h('span.cp-creation-help.fa.fa-question', {
-                title: text
+        var origin = common.getMetadataMgr().getPrivateData().origin;
+        var createHelper = function (href, text) {
+            var q = h('a.cp-creation-help.fa.fa-question', {
+                title: text,
+                href: origin + href,
+                target: "_blank"
             });
             return q;
         };
@@ -1845,78 +1851,145 @@ define([
         // Owned pads
         // Default is Owned pad
         var owned = h('div.cp-creation-owned', [
-            h('h2', [
-                Messages.creation_ownedTitle,
-                createHelper(Messages.creation_owned1 + '\n' + Messages.creation_owned2)
-            ]),
-            h('div.cp-creation-help-container', [
-                setHTML(h('p'), Messages.creation_owned1),
-                setHTML(h('p'), Messages.creation_owned2)
-            ]),
-            h('input#cp-creation-owned-true.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 1,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
-            h('input#cp-creation-owned-false.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 0
-            }),
-            h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse)
+            h('label.cp-checkmark', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-owned',
+                    checked: 'checked'
+                }),
+                h('span.cp-checkmark-mark'),
+                'Owned pad'
+            ]), // XXX
+            createHelper('/faq.html#keywords-owned', Messages.creation_owned1)
         ]);
-        $creation.append(owned);
-
-        // If set to "open pad", check "open pad"
-        if (!cfg.owned && typeof cfg.owned !== "undefined") {
-            $creation.find('#cp-creation-owned-false').attr('checked', true);
-        }
 
         // Life time
         var expire = h('div.cp-creation-expire', [
-            h('h2', [
-                Messages.creation_expireTitle,
-                createHelper(Messages.creation_expire1, Messages.creation_expire2)
-            ]),
-            h('div.cp-creation-help-container', [
-                setHTML(h('p'), Messages.creation_expire1),
-                setHTML(h('p'), Messages.creation_expire2)
-            ]),
-            h('input#cp-creation-expire-false.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 0,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-expire-false' }, Messages.creation_expireFalse),
-            h('input#cp-creation-expire-true.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 1
-            }),
-            h('label', { 'for': 'cp-creation-expire-true' }, [
-                Messages.creation_expireTrue,
-                h('span.cp-creation-expire-picker', [
-                    h('input#cp-creation-expire-val', {
-                        type: "number",
-                        min: 1,
-                        max: 100,
-                        value: 3
-                    }),
-                    h('select#cp-creation-expire-unit', [
-                        h('option', { value: 'hour' }, Messages.creation_expireHours),
-                        h('option', { value: 'day' }, Messages.creation_expireDays),
-                        h('option', {
-                            value: 'month',
-                            selected: 'selected'
-                        }, Messages.creation_expireMonths)
-                    ])
+            //Messages.creation_ownedTitle,
+            h('label.cp-checkmark', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-expire'
+                }),
+                h('span.cp-checkmark-mark'),
+                'Expiring pad'
+            ]), // XXX
+            createHelper('faq.html#keywords-expiring', Messages.creation_expire1),
+            h('div.cp-creation-expire-picker', [
+                h('input#cp-creation-expire-val', {
+                    type: "number",
+                    min: 1,
+                    max: 100,
+                    value: 3
+                }),
+                h('select#cp-creation-expire-unit', [
+                    h('option', { value: 'hour' }, Messages.creation_expireHours),
+                    h('option', { value: 'day' }, Messages.creation_expireDays),
+                    h('option', {
+                        value: 'month',
+                        selected: 'selected'
+                    }, Messages.creation_expireMonths)
                 ])
             ])
         ]);
-        $creation.append(expire);
+
+        var templates = h('div.cp-creation-template', [
+            h('div.cp-creation-template-container', [
+                h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')
+            ])
+        ]);
+
+        var settings = h('div.cp-creation-remember', [
+            h('label.cp-checkmark.cp-checkmark-secondary', [
+                h('input', {
+                    type: 'checkbox',
+                    id: 'cp-creation-remember',
+                    checked: 'checked'
+                }),
+                h('span.cp-checkmark-mark'),
+                'Save settings'
+            ]), // XXX
+            createHelper('/settings/#creation', "View more settings")
+        ]);
+
+        $(h('div#cp-creation-form', [
+            owned,
+            expire,
+            templates,
+            settings
+        ])).appendTo($creation);
+
+        // Display templates
+        var selected = 0;
+        sframeChan.query("Q_CREATE_TEMPLATES", type, function (err, res) {
+            if (!res.data || !Array.isArray(res.data)) {
+                return void console.error("Error: get the templates list");
+            }
+            var data = res.data.slice().sort(function (a, b) {
+                if (a.name === b.name) { return 0; }
+                return a.name < b.name ? -1 : 1;
+            });
+            data.unshift({
+                name: "No template",
+                id: 0,
+                icon: h('span.fa.fa-times')
+            });
+            data.push({
+                name: "New template",
+                id: -1,
+                icon: h('span.fa.fa-plus')
+            });
+            var $container = $(templates).find('.cp-creation-template-container').html('');
+            data.forEach(function (obj, idx) {
+                var name = obj.name;
+                var $span = $('<span>', {
+                    'class': 'cp-creation-template-element',
+                    'title': name,
+                }).appendTo($container);
+                console.log(obj.id);
+                $span.data('id', obj.id);
+                if (idx === 0) { $span.addClass('cp-creation-template-selected') }
+                $span.append(obj.icon || UI.getFileIcon({type: type}));
+                $('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
+                    .appendTo($span);
+                $span.click(function () {
+                    $container.find('.cp-creation-template-selected')
+                        .removeClass('cp-creation-template-selected');
+                    $span.addClass('cp-creation-template-selected');
+                    selected = idx;
+                });
+
+                // Add thumbnail if it exists
+                if (obj.thumbnail) {
+                    common.addThumbnail(obj.thumbnail, $span, function () {});
+                }
+            });
+        });
+        // Change template selection when Tab is pressed
+        var next = function (revert) {
+            var max = $creation.find('.cp-creation-template-element').length;
+            selected = revert ?
+                        (--selected < 0 ? max-1 : selected) :
+                        ++selected % max;
+            $creation.find('.cp-creation-template-element')
+                .removeClass('cp-creation-template-selected');
+            $($creation.find('.cp-creation-template-element').get(selected))
+                .addClass('cp-creation-template-selected');
+        };
+
+
+        // Display expiration form when checkbox checked
+        $creation.find('#cp-creation-expire').on('change', function () {
+            if ($(this).is(':checked')) {
+                $creation.find('.cp-creation-expire-picker:not(.active)').addClass('active');
+                $creation.find('#cp-creation-expire-val').focus();
+                return;
+            }
+            $creation.find('.cp-creation-expire-picker').removeClass('active');
+            $creation.focus();
+        });
+
+        // Keyboard shortcuts
         $creation.find('#cp-creation-expire-val').keydown(function (e) {
             if (e.which === 9) {
                 e.stopPropagation();
@@ -1928,15 +2001,20 @@ define([
             }
         });
 
+
+        // Initial values
+        if (!cfg.owned && typeof cfg.owned !== "undefined") {
+            $creation.find('#cp-creation-owned').attr('checked', false);
+        }
         UIElements.setExpirationValue(cfg.expire, $creation);
 
         // Create the pad
         var getFormValues = function (template) {
             // Type of pad
-            var ownedVal = parseInt($('input[name="cp-creation-owned"]:checked').val());
+            var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
             // Life time
             var expireVal = 0;
-            if(parseInt($('input[name="cp-creation-expire"]:checked').val())) {
+            if($('#cp-creation-expire').is(':checked')) {
                 var unit = 0;
                 switch ($('#cp-creation-expire-unit').val()) {
                     case "hour" : unit = 3600;           break;
@@ -1947,62 +2025,45 @@ define([
                 expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
             }
 
+            var $template = $creation.find('.cp-creation-template-selected');
+            var template = $template.data('id') || undefined;
+
             return {
                 owned: ownedVal,
                 expire: expireVal,
-                template: template
+                templateId: template
             };
         };
-        var create = function (template) {
-            $creationContainer.remove();
+        var create = function () {
+            var val = getFormValues();
 
-            common.createPad(getFormValues(template), function () {
+            if ($('#cp-creation-remember').is(':checked')) {
+                common.setAttribute(['general', 'creation', 'owned'],
+                                    val.owned, function (e) {
+                    if (e) { return void console.error(e); }
+                });
+                common.setAttribute(['general', 'creation', 'expire'],
+                                    val.expire, function (e) {
+                    if (e) { return void console.error(e); }
+                });
+            }
+
+            $creationContainer.remove();
+            common.createPad(val, function () {
                 cb();
             });
         };
 
-        var $create = $(h('div.cp-creation-create', [
-            h('h2', Messages.creation_createTitle)
-        ])).appendTo($creation);
-        // Pick a template?
-        sframeChan.query("Q_TEMPLATE_EXIST", type, function (err, data) {
-            if (!data) { return; }
-            var $templateButton = $('<button>').text(Messages.creation_createFromTemplate)
-                                               .appendTo($create);
-
-            var pickerCfg = {
-                types: [type],
-                where: ['template'],
-                hidden: true
-            };
-            common.openFilePicker(pickerCfg);
-
-            $templateButton.click(function () {
-                // Show the template picker
-                delete pickerCfg.hidden;
-                common.openFilePicker(pickerCfg);
-                var first = true; // We can only pick a template once (for a new document)
-                var fileDialogCfg = {
-                    onSelect: function (data) {
-                        if (data.type === type && first) {
-                            create(data.href);
-                            first = false;
-                        }
-                    }
-                };
-                common.initFilePicker(fileDialogCfg);
-            });
-        });
+        var $create = $(h('div.cp-creation-create')).appendTo($creation);
 
-        var $button = $('<button>').text(Messages.creation_createFromScratch).appendTo($create);
+        var $button = $('<button>').text('Create').appendTo($create);
         $button.addClass('cp-creation-button-selected');
         $button.click(function () {
             create();
         });
 
-        // Settings button
-        var origin = common.getMetadataMgr().getPrivateData().origin;
-        var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
+        // Save settings button
+        /*var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
         var okTo;
         var $saveButton = $('<button>').text(Messages.creation_saveSettings).click(function () {
@@ -2025,35 +2086,29 @@ define([
                 }, 5000);
             });
         });
-        $(h('div.cp-creation-settings', [
-            $saveButton[0],
-            h('br'),
-            h('a', {
-                href: origin + '/settings/#creation',
-                target: '_blank'
-            }, Messages.creation_settings),
+
+        var settings = h('div.cp-creation-settings', [
+            h('button.cp-creation-settings-save', Messages.creation_saveSettings),
             $ok[0],
-            $spinner[0]
-        ])).appendTo($creation);
+            $spinner[0],
+            h('span.cp-filler'),
+            createHelper('/settings/#creation')
+            //h('a', {
+            //    href: origin + '/settings/#creation',
+            //    target: '_blank'
+            //}, Messages.creation_settings),
+        ]);*/
 
-        var selected = 0;
-        var next = function () {
-            selected = ++selected % $creation.find('button').length;
-            $creation.find('button').removeClass('cp-creation-button-selected');
-            $($creation.find('button').get(selected)).addClass('cp-creation-button-selected');
-        };
 
         $creation.keydown(function (e) {
             if (e.which === 9) {
                 e.preventDefault();
                 e.stopPropagation();
-                next();
+                next(e.shiftKey);
                 return;
             }
             if (e.which === 13) {
-                if ($creation.find('.cp-creation-button-selected').length === 1) {
-                    $creation.find('.cp-creation-button-selected').click();
-                }
+                $button.click();
                 return;
             }
         });
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 5bb00e6f3..10db8522a 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -75,13 +75,7 @@ define([
             cb();
         });
     };
-    // Settings and drive
-    common.getUserObject = function (cb) {
-        postMessage("GET", [], function (obj) {
-            cb(obj);
-        });
-    };
-    // Settings and auth
+    // Settings and drive and auth
     common.getUserObject = function (cb) {
         postMessage("GET", [], function (obj) {
             cb(obj);
@@ -468,6 +462,16 @@ define([
             cb(void 0, list);
         });
     };
+    // Get a template href from its id
+    common.getPadData = function (id, cb) {
+        postMessage("GET_PAD_DATA", id, function (data) {
+            cb(void 0, data);
+        });
+    };
+    // Set initial path when creating a pad from pad creation screen
+    common.setInitialPath = function (path) {
+        postMessage("SET_INITIAL_PATH", path);
+    };
 
     // Messaging (manage friends from the userlist)
     common.inviteFromUserlist = function (netfluxId, cb) {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index ae7d752b6..b16b6995a 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -678,6 +678,13 @@ define([
         });
         cb(list);
     };
+    Store.getPadData = function (id, cb) {
+        cb(store.userObject.getFileData(id));
+    };
+    Store.setInitialPath = function (path) {
+        if (!store.data) { return; }
+        store.data.initialPath = path;
+    };
 
     // Messaging (manage friends from the userlist)
     var getMessagingCfg = function () {
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index 9fe45556e..7c4bff116 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -117,6 +117,12 @@ define([
             case 'GET_SECURE_FILES_LIST': {
                 Store.getSecureFilesList(data, cb); break;
             }
+            case 'GET_PAD_DATA': {
+                Store.getPadData(data, cb); break;
+            }
+            case 'SET_INITIAL_PATH': {
+                Store.setInitialPath(data); break;
+            }
             case 'GET_STRONGER_HASH': {
                 Store.getStrongerHash(data, cb); break;
             }
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 10fd2e9f9..df933f1a5 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -469,6 +469,35 @@ define([
                     cb(templates.length > 0);
                 });
             });
+            var getKey = function (href) {
+                var parsed = Utils.Hash.parsePadUrl(href);
+                return 'thumbnail-' + parsed.type + '-' + parsed.hashData.channel;
+            };
+            sframeChan.on('Q_CREATE_TEMPLATES', function (type, cb) {
+                Cryptpad.getSecureFilesList({
+                    types: [type],
+                    where: ['template']
+                }, function (err, data) {
+                    // NOTE: Never return data directly!
+                    if (err) { return void cb({error: err}); }
+
+                    var res = [];
+                    nThen(function (waitFor) {
+                        Object.keys(data).map(function (el) {
+                            var k = getKey(data[el].href);
+                            Utils.LocalStore.getThumbnail(k, waitFor(function (e, thumb) {
+                                res.push({
+                                    id: el,
+                                    name: data[el].filename || data[el].title || '?',
+                                    thumbnail: thumb
+                                });
+                            }));
+                        });
+                    }).nThen(function () {
+                        cb({data: res});
+                    });
+                });
+            });
 
             sframeChan.on('EV_GOTO_URL', function (url) {
                 if (url) {
@@ -584,7 +613,7 @@ define([
                 var replaceHash = function (hash) {
                     if (window.history && window.history.replaceState) {
                         if (!/^#/.test(hash)) { hash = '#' + hash; }
-                        void window.history.replaceState({}, window.document.title, hash);
+                        window.history.replaceState({}, window.document.title, hash);
                         if (typeof(window.onhashchange) === 'function') {
                             window.onhashchange();
                         }
@@ -646,19 +675,31 @@ define([
                 if (data.expire) {
                     rtConfig.expire = data.expire;
                 }
-                if (data.template) {
-                    // Pass rtConfig to useTemplate because Cryptput will create the file and
-                    // we need to have the owners and expiration time in the first line on the
-                    // server
-                    Cryptpad.useTemplate(data.template, Cryptget, function () {
-                        startRealtime();
-                        cb();
-                    }, rtConfig);
-                    return;
-                }
-                // Start realtime outside the iframe and callback
-                startRealtime(rtConfig);
-                cb();
+                nThen(function(waitFor) {
+                    if (data.templateId) {
+                        if (data.templateId === -1) {
+                            Cryptpad.setInitialPath(['template']);
+                            return;
+                        }
+                        Cryptpad.getPadData(data.templateId, waitFor(function (err, d) {
+                            data.template = d.href;
+                        }));
+                    }
+                }).nThen(function () {
+                    if (data.template) {
+                        // Pass rtConfig to useTemplate because Cryptput will create the file and
+                        // we need to have the owners and expiration time in the first line on the
+                        // server
+                        Cryptpad.useTemplate(data.template, Cryptget, function () {
+                            startRealtime();
+                            cb();
+                        }, rtConfig);
+                        return;
+                    }
+                    // Start realtime outside the iframe and callback
+                    startRealtime(rtConfig);
+                    cb();
+                });
             });
 
             sframeChan.ready();
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index d8804349b..36f896d52 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -97,6 +97,7 @@ define([
 
     // Thumb
     funcs.displayThumbnail = callWithCommon(Thumb.displayThumbnail);
+    funcs.addThumbnail = Thumb.addThumbnail;
 
     // History
     funcs.getHistory = callWithCommon(History.create);
@@ -196,7 +197,8 @@ define([
         ctx.sframeChan.query("Q_CREATE_PAD", {
             owned: cfg.owned,
             expire: cfg.expire,
-            template: cfg.template
+            template: cfg.template,
+            templateId: cfg.templateId
         }, cb);
     };
 
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index b7fa01b28..f49b3ed11 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -220,6 +220,8 @@ define({
 
     // Pad creation screen: create a pad with the selected attributes (owned, expire)
     'Q_CREATE_PAD': true,
+    // Get the available templates
+    'Q_CREATE_TEMPLATES': true,
 
     // This is for sending data out of the iframe when we are in testing mode
     // The exact protocol is defined in common/test.js

From e56d7624091bc1406bd30b88807d30c004c7db82 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 13 Mar 2018 14:38:56 +0100
Subject: [PATCH 04/33] Catch chainpad errors and display it in the UI

---
 customize.dist/translations/messages.fr.js |  4 +++-
 customize.dist/translations/messages.js    |  4 +++-
 www/common/common-ui-elements.js           |  4 ++--
 www/common/sframe-app-framework.js         | 21 ++++++++++++++++++---
 www/common/toolbar3.js                     |  1 +
 www/whiteboard/inner.js                    | 11 ++++++++++-
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 24299e422..9dc0e21db 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -32,9 +32,11 @@ define(function () {
     out.padNotPinned = 'Ce pad va expirer après 3 mois d\'inactivité, {0}connectez-vous{1} ou {2}enregistrez-vous{3} pour le préserver.';
     out.anonymousStoreDisabled = "L'administrateur de cette instance de CryptPad a désactivé le drive pour les utilisateurs non enregistrés. Vous devez vous connecter pour pouvoir utiliser CryptDrive.";
     out.expiredError = "Ce pad a atteint sa date d'expiration est n'est donc plus disponible.";
-    out.expiredErrorCopy = ' Vous pouvez toujours copier son contenu ailleurs en appuyant sur <em>Échap</em>.<br> Dés que vous aurez quitté la page, il sera impossible de le récupérer.';
     out.deletedError = 'Ce pad a été supprimé par son propriétaire et n\'est donc plus disponible.';
     out.inactiveError = 'Ce pad a été supprimé en raison de son inactivité. Appuyez sur Échap pour créer un nouveau pad.';
+    out.chainpadError = 'Une erreur critique est survenue lors de la mise à jour du contenu. Le pad est désormais en mode lecture seule afin de s\'assurer que vous ne perdiez pas davantage de données.<br>' +
+                        'Appuyez sur <em>Échap</em> pour voir le pad ou rechargez la page pour pouvoir le modifier à nouveau.';
+    out.errorCopy = ' Vous pouvez toujours copier son contenu ailleurs en appuyant sur <em>Échap</em>.<br> Dés que vous aurez quitté la page, il sera impossible de le récupérer.';
 
     out.loading = "Chargement...";
     out.error = "Erreur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f0eeda3bc..ac90a1d3b 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -33,9 +33,11 @@ define(function () {
     out.padNotPinned = 'This pad will expire after 3 months of inactivity, {0}login{1} or {2}register{3} to preserve it.';
     out.anonymousStoreDisabled = "The webmaster of this CryptPad instance has disabled the store for anonymous users. You have to log in to be able to use CryptDrive.";
     out.expiredError = 'This pad has reached its expiration time and is no longer available.';
-    out.expiredErrorCopy = ' You can still copy the content to another location by pressing <em>Esc</em>.<br>Once you leave this page, it will disappear forever!';
     out.deletedError = 'This pad has been deleted by its owner and is no longer available.';
     out.inactiveError = 'This pad has been deleted due to inactivity. Press Esc to create a new pad.';
+    out.chainpadError = 'A critical error occurred when updating your content. This page is in read-only mode to make sure you won\'t lose your work.<br>' +
+                        'Hit <em>Esc</em> to continue to view this pad, or reload to try editing again.';
+    out.errorCopy = ' You can still copy the content to another location by pressing <em>Esc</em>.<br>Once you leave this page, it will disappear forever!';
 
     out.loading = "Loading...";
     out.error = "Error";
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3d6b33964..07ad3d98d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2066,12 +2066,12 @@ define([
         if (err.type === 'EEXPIRED') {
             msg = Messages.expiredError;
             if (err.loaded) {
-                msg += Messages.expiredErrorCopy;
+                msg += Messages.errorCopy;
             }
         } else if (err.type === 'EDELETED') {
             msg = Messages.deletedError;
             if (err.loaded) {
-                msg += Messages.expiredErrorCopy;
+                msg += Messages.errorCopy;
             }
         }
         if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index a095122d6..cbf31bb6e 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -45,6 +45,7 @@ define([
         FORGOTTEN: 'FORGOTTEN',
         DELETED: 'DELETED',
         INFINITE_SPINNER: 'INFINITE_SPINNER',
+        ERROR: 'ERROR',
         INITIALIZING: 'INITIALIZING',
         HISTORY_MODE: 'HISTORY_MODE',
         READY: 'READY'
@@ -118,9 +119,9 @@ define([
             return;
         };
 
-        var stateChange = function (newState) {
+        var stateChange = function (newState, text) {
             var wasEditable = (state === STATE.READY);
-            if (state === STATE.DELETED) { return; }
+            if (state === STATE.DELETED || state === STATE.ERROR) { return; }
             if (state === STATE.INFINITE_SPINNER && newState !== STATE.READY) { return; }
             if (newState === STATE.INFINITE_SPINNER || newState === STATE.DELETED) {
                 state = newState;
@@ -147,6 +148,14 @@ define([
                     evStart.reg(function () { toolbar.failed(); });
                     break;
                 }
+                case STATE.ERROR: {
+                    evStart.reg(function () {
+                        toolbar.errorState(true, text);
+                        var msg = Messages.chainpadError;
+                        UI.errorLoadingScreen(msg, true, true);
+                    });
+                    break;
+                }
                 case STATE.FORGOTTEN: {
                     evStart.reg(function () { toolbar.forgotten(); });
                     break;
@@ -249,7 +258,12 @@ define([
             }
 
             var contentStr = JSONSortify(content);
-            cpNfInner.chainpad.contentUpdate(contentStr);
+            try {
+                cpNfInner.chainpad.contentUpdate(contentStr);
+            } catch (e) {
+                stateChange(STATE.ERROR, e.message);
+                console.error(e);
+            }
             if (cpNfInner.chainpad.getUserDoc() !== contentStr) {
                 console.error("realtime.getUserDoc() !== shjson");
             }
@@ -463,6 +477,7 @@ define([
             window.setInterval(function () {
                 if (state === STATE.DISCONNECTED) { return; }
                 if (state === STATE.DELETED) { return; }
+                if (state === STATE.ERROR) { return; }
                 var l;
                 try {
                     l = cpNfInner.chainpad.getLag();
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 0c9d3c8f3..652047615 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -1061,6 +1061,7 @@ define([
 
         toolbar.errorState = function (state, error) {
             toolbar.isErrorState = state;
+            if (state) { toolbar.connected = false; }
             if (toolbar.spinner) {
                 if (!state) {
                     return void kickSpinner(toolbar, config);
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index 7e132ae18..489637e10 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -346,7 +346,16 @@ define([
 
             var content = stringifyInner(canvas.toDatalessJSON());
 
-            APP.realtime.contentUpdate(content);
+            try {
+                APP.realtime.contentUpdate(content);
+            } catch (e) {
+                APP.unrecoverable = true;
+                setEditable(false);
+                APP.toolbar.errorState(true, e.message);
+                var msg = Messages.chainpadError;
+                UI.errorLoadingScreen(msg, true, true);
+                console.error(e);
+            }
         };
 
         var addImageToCanvas = function (img) {

From 645e47bd7260ac7b004fec01bdf1176f3285761a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 13 Mar 2018 15:10:33 +0100
Subject: [PATCH 05/33] Catch chainpad errors in polls

---
 www/poll/inner.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/www/poll/inner.js b/www/poll/inner.js
index a6e9b8bd8..9222d90a0 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -1106,6 +1106,25 @@ define([
         }
     };
 
+    var onError = function (info) {
+        if (info && info.type) {
+            if (info.type === 'CHAINPAD') {
+                APP.unrecoverable = true;
+                setEditable(false);
+                APP.toolbar.errorState(true, info.error);
+                var msg = Messages.chainpadError;
+                UI.errorLoadingScreen(msg, true, true);
+                console.error(info.error);
+                return;
+            }
+            // Server error
+            return void common.onServerError(info, APP.toolbar, function () {
+                APP.unrecoverable = true;
+                setEditable(false);
+            });
+        }
+    };
+
     // Manage disconnections because of network or error
     var onDisconnect = function (info) {
         if (APP.unrecoverable) { return; }
@@ -1318,7 +1337,8 @@ define([
                     });
                  })
                  .on('disconnect', onDisconnect)
-                 .on('reconnect', onReconnect);
+                 .on('reconnect', onReconnect)
+                 .on('error', onError);
         });
     };
     main();

From b1d5beca6fa87522d63e17b3538b920b67cdd2e4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 11:37:49 +0100
Subject: [PATCH 06/33] Translations + UI for pad creation screen v2

---
 customize.dist/translations/messages.fr.js | 12 ++++++----
 customize.dist/translations/messages.js    | 14 ++++++-----
 www/common/common-ui-elements.js           | 28 +++++++++++-----------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 24299e422..5d22021ae 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -1060,11 +1060,13 @@ define(function () {
     // Creation page
     out.creation_404 = "Ce pad n'existe plus. Vous pouvez créer un nouveau pad en utilisant le formulaire suivant.";
     out.creation_ownedTitle = "Type de pad";
+    out.creation_owned = "Être propriétaire de ce pad";
     out.creation_ownedTrue = "Pad possédé";
     out.creation_ownedFalse = "Pad ouvert";
     out.creation_owned1 = "Un pad <b>possédé</b> peut être supprimé du serveur à tout moment quand son propriétaire le souhaite. Une fois supprimé, il disparaît du CryptDrive des autres utilisateurs.";
     out.creation_owned2 = "Un pad <b>ouvert</b> n'a pas de propriétaire et ne peut donc pas être supprimé du serveur à moins d'avoir dépassé sa date d'expiration.";
     out.creation_expireTitle = "Durée de vie";
+    out.creation_expire = "Ajouter une durée de vie";
     out.creation_expireTrue = "Ajouter durée de vie";
     out.creation_expireFalse = "Illimité";
     out.creation_expireHours = "Heure(s)";
@@ -1072,11 +1074,11 @@ define(function () {
     out.creation_expireMonths = "Mois";
     out.creation_expire1 = "Un pad <b>illimité</b> ne sera pas supprimé du serveur à moins que son propriétaire ne le décide.";
     out.creation_expire2 = "Un pad <b>expirant</b> a une durée de vie définie, après laquelle il sera supprimé automatiquement du serveur et du CryptDrive des utilisateurs.";
-    out.creation_createTitle = "Créer un pad";
-    out.creation_createFromTemplate = "Depuis un modèle";
-    out.creation_createFromScratch = "Nouveau pad vide";
-    out.creation_settings = "Préférences des nouveaux pads";
-    out.creation_saveSettings = "Sauver les préférences";
+    out.creation_noTemplate = "Pas de modèle";
+    out.creation_newTemplate = "Nouveau modèle";
+    out.creation_create = "Créer";
+    out.creation_saveSettings = "Se souvenir de ces paramètres";
+    out.creation_settings = "Voir davantage de préférences";
     // Properties about creation data
     out.creation_owners = "Propriétaires";
     out.creation_ownedByOther = "Possédé par un autre utilisateur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f0eeda3bc..a80616a2f 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1107,11 +1107,13 @@ define(function () {
     // Creation page
     out.creation_404 = "This pad not longer exists. Use the following form to create a new pad.";
     out.creation_ownedTitle = "Type of pad";
-    out.creation_ownedTrue = "Owned pad";
+    out.creation_owned = "Owned pad"; // Creation page
+    out.creation_ownedTrue = "Owned pad"; // Settings
     out.creation_ownedFalse = "Open pad";
     out.creation_owned1 = "An <b>owned</b> pad can be deleted from the server whenever the owner wants. Deleting an owned pad removes it from other users' CryptDrives.";
     out.creation_owned2 = "An <b>open</b> pad doesn't have any owner and thus, it can't be deleted from the server unless it has reached its expiration time.";
     out.creation_expireTitle = "Life time";
+    out.creation_expire = "Expiring pad";
     out.creation_expireTrue = "Add a life time";
     out.creation_expireFalse = "Unlimited";
     out.creation_expireHours = "Hour(s)";
@@ -1119,11 +1121,11 @@ define(function () {
     out.creation_expireMonths = "Month(s)";
     out.creation_expire1 = "An <b>unlimited</b> pad will not be removed from the server until its owner deletes it.";
     out.creation_expire2 = "An <b>expiring</b> pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives.";
-    out.creation_createTitle = "Create a pad";
-    out.creation_createFromTemplate = "From template";
-    out.creation_createFromScratch = "From scratch";
-    out.creation_settings = "New Pad settings";
-    out.creation_saveSettings = "Save settings";
+    out.creation_noTemplate = "No template";
+    out.creation_newTemplate = "New template";
+    out.creation_create = "Create";
+    out.creation_saveSettings = "Remember these settings";
+    out.creation_settings = "View more settings";
     // Properties about creation data
     out.creation_owners = "Owners";
     out.creation_ownedByOther = "Owned by another user";
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ce716640e..feb8de684 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1829,10 +1829,11 @@ define([
         };
 
         // Title
-        $creation.append(h('h1.cp-creation-title', 'Create a new pad')); // XXX
+        var colorClass = 'cp-icon-color-'+type;
+        $creation.append(h('h1.cp-creation-title.'+colorClass, Messages['button_new'+type]));
 
         // Deleted pad warning
-        if (metadataMgr.getPrivateData().isDeleted || true) { // XXX
+        if (metadataMgr.getPrivateData().isDeleted) {
             $creation.append(h('div.cp-creation-deleted-container',
                 h('div.cp-creation-deleted', Messages.creation_404)
             ));
@@ -1858,23 +1859,22 @@ define([
                     checked: 'checked'
                 }),
                 h('span.cp-checkmark-mark'),
-                'Owned pad'
-            ]), // XXX
+                Messages.creation_owned
+            ]),
             createHelper('/faq.html#keywords-owned', Messages.creation_owned1)
         ]);
 
         // Life time
         var expire = h('div.cp-creation-expire', [
-            //Messages.creation_ownedTitle,
             h('label.cp-checkmark', [
                 h('input', {
                     type: 'checkbox',
                     id: 'cp-creation-expire'
                 }),
                 h('span.cp-checkmark-mark'),
-                'Expiring pad'
-            ]), // XXX
-            createHelper('faq.html#keywords-expiring', Messages.creation_expire1),
+                Messages.creation_expire
+            ]),
+            createHelper('faq.html#keywords-expiring', Messages.creation_expire2),
             h('div.cp-creation-expire-picker', [
                 h('input#cp-creation-expire-val', {
                     type: "number",
@@ -1907,9 +1907,9 @@ define([
                     checked: 'checked'
                 }),
                 h('span.cp-checkmark-mark'),
-                'Save settings'
-            ]), // XXX
-            createHelper('/settings/#creation', "View more settings")
+                Messages.creation_saveSettings
+            ]),
+            createHelper('/settings/#creation', Messages.creation_settings)
         ]);
 
         $(h('div#cp-creation-form', [
@@ -1930,12 +1930,12 @@ define([
                 return a.name < b.name ? -1 : 1;
             });
             data.unshift({
-                name: "No template",
+                name: Messages.creation_noTemplate,
                 id: 0,
                 icon: h('span.fa.fa-times')
             });
             data.push({
-                name: "New template",
+                name: Messages.creation_newTemplate,
                 id: -1,
                 icon: h('span.fa.fa-plus')
             });
@@ -2056,7 +2056,7 @@ define([
 
         var $create = $(h('div.cp-creation-create')).appendTo($creation);
 
-        var $button = $('<button>').text('Create').appendTo($create);
+        var $button = $('<button>').text(Messages.creation_create).appendTo($create);
         $button.addClass('cp-creation-button-selected');
         $button.click(function () {
             create();

From e977b14c1b33da840ae28c4e2ddbc38ecaea87e3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 11:50:17 +0100
Subject: [PATCH 07/33] Update French translation

---
 customize.dist/translations/messages.fr.js | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 9dc0e21db..e1e8c59ba 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -363,7 +363,7 @@ define(function () {
     out.fm_templateName = "Modèles";
     out.fm_searchName = "Recherche";
     out.fm_recentPadsName = "Pads récents";
-    out.fm_ownedPadsName = "Pads possédés";
+    out.fm_ownedPadsName = "Pads en votre possession";
     out.fm_searchPlaceholder = "Rechercher...";
     out.fm_newButton = "Nouveau";
     out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant";
@@ -771,13 +771,13 @@ define(function () {
                'Il désigne un document que vous pouvez modifier dans votre navigateur et, en général, vous pouvez voir les modifications effectuées par les autres utilisateurs de manière quasiment instantanée.'
         },
         owned: {
-            q: "Qu'est-ce qu'un pad possédé ?",
-            a: "Un <em>pad possédé</em> est un pad créé avec un <em>propriétaire</em> explicite, identifié sur le serveur par sa <em>clé de signature publique</em>.<br>" +
+            q: "Qu'est-ce qu'un pad avec propriétaire ?",
+            a: "Être <em>propriétaire</em> d'un pad signifie que vous êtes identifié comme tel par le serveur avec à votre <em>clé de signature publique</em>.<br>" +
                "Le propriétaire d'un pad peut décider de supprimer ce pad du serveur de manière permanente, afin de le rendre inaccessible aux autres collaborateurs même s'ils possédent le lien dans leur CryptDrive."
         },
         expiring: {
-            q: "Qu'est-ce qu'un pad expirant ?",
-            a: "Un <em>pad expirant</em> est un pad créé avec une date définie à partir de laquelle il sera supprimé automatiquement du serveur. Les pads expirants peuvent être configurés pour avoir une durée de vie comprise entre une heure et cent mois. Le pad et tout son historique sera alors inaccessible, de manière permanente, même s'il est en cours d'édition à sa date d'expiration.<br>" +
+            q: "Qu'est-ce qu'un pad à durée de vie ?",
+            a: "Un <em>pad à durée de vie</em> est un pad créé avec une date définie à partir de laquelle il sera supprimé automatiquement du serveur. Ils peuvent être configurés pour avoir une durée de vie comprise entre une heure et cent mois. Le pad et tout son historique sera alors inaccessible, de manière permanente, même s'il est en cours d'édition à sa date d'expiration.<br>" +
                "Si un pad possède une date d'expiration, vous pouvez la vérifier en regardant les <em>propriétés</em> du pad, soit avec un clic-droit sur le pad dans votre CryptDrive, ou soit en cliquant sur Propriétés dans le sous-menu de la barre d'outils de l'application."
         },
         tag: {
@@ -871,9 +871,9 @@ define(function () {
         },
         remove: {
             q: "J'ai supprimé un pad ou un fichier de mon CryptDrive, mais le contenu est encore disponible. Comment le supprimer ?",
-            a: "Seuls les <em>pads possédés</em> (introduits en février 2018) peuvent être supprimés du serveur. Ils ne peuvent d'ailleurs être supprimés du serveur que par leur <em>propriétaire</em> (l'utilisateur ayant créé le pad).<br>" +
+            a: "Seuls les <em>pads avec propriétaire</em> (introduits en février 2018) peuvent être supprimés du serveur. Ils ne peuvent d'ailleurs être supprimés du serveur que par leur <em>propriétaire</em> (l'utilisateur ayant créé le pad).<br>" +
                "Si vous n'êtes pas le créateur du pad, vous devrez demander au propriétaire de le supprimer pour vous.<br>" +
-               "Pour les pads que vous possédez, vous pouvez effectuer un <b>clic-droit sur le pad dans votre CryptDrive</b>, et sélectionner <b>Supprimer du serveur</b>."
+               "Pour les pads dont vous êtes le propriétaire, vous pouvez effectuer un <b>clic-droit sur le pad dans votre CryptDrive</b>, et sélectionner <b>Supprimer du serveur</b>."
         },
         forget: {
             q: "Que faire si j'oublie mon mot de passe ?",
@@ -1062,10 +1062,10 @@ define(function () {
     // Creation page
     out.creation_404 = "Ce pad n'existe plus. Vous pouvez créer un nouveau pad en utilisant le formulaire suivant.";
     out.creation_ownedTitle = "Type de pad";
-    out.creation_ownedTrue = "Pad possédé";
-    out.creation_ownedFalse = "Pad ouvert";
-    out.creation_owned1 = "Un pad <b>possédé</b> peut être supprimé du serveur à tout moment quand son propriétaire le souhaite. Une fois supprimé, il disparaît du CryptDrive des autres utilisateurs.";
-    out.creation_owned2 = "Un pad <b>ouvert</b> n'a pas de propriétaire et ne peut donc pas être supprimé du serveur à moins d'avoir dépassé sa date d'expiration.";
+    out.creation_ownedTrue = "Être propriétaire";
+    out.creation_ownedFalse = "Pas de propriétaire";
+    out.creation_owned1 = "Être <b>propriétaire</b> d'un pad signifie que vous pouvez le supprimer du serveur à tout moment. Une fois supprimé, il disparaît du CryptDrive des autres utilisateurs.";
+    out.creation_owned2 = "Un pad <b>sans propriétaire</b> ne peut pas être supprimé du serveur à moins d'avoir dépassé son éventuelle date d'expiration.";
     out.creation_expireTitle = "Durée de vie";
     out.creation_expireTrue = "Ajouter durée de vie";
     out.creation_expireFalse = "Illimité";
@@ -1073,21 +1073,21 @@ define(function () {
     out.creation_expireDays = "Jour(s)";
     out.creation_expireMonths = "Mois";
     out.creation_expire1 = "Un pad <b>illimité</b> ne sera pas supprimé du serveur à moins que son propriétaire ne le décide.";
-    out.creation_expire2 = "Un pad <b>expirant</b> a une durée de vie définie, après laquelle il sera supprimé automatiquement du serveur et du CryptDrive des utilisateurs.";
+    out.creation_expire2 = "Un pad <b>à durée de vie</b> sera supprimé automatiquement du serveur et du CryptDrive des utilisateurs lorsque cette durée sera dépassée.";
     out.creation_createTitle = "Créer un pad";
-    out.creation_createFromTemplate = "Depuis un modèle";
-    out.creation_createFromScratch = "Nouveau pad vide";
+    out.creation_createFromTemplate = "Utiliser un modèle";
+    out.creation_createFromScratch = "Créer un pad vide";
     out.creation_settings = "Préférences des nouveaux pads";
     out.creation_saveSettings = "Sauver les préférences";
     // Properties about creation data
     out.creation_owners = "Propriétaires";
-    out.creation_ownedByOther = "Possédé par un autre utilisateur";
+    out.creation_ownedByOther = "Appartient à un autre utilisateur";
     out.creation_noOwner = "Pas de propriétaire";
     out.creation_expiration = "Date d'expiration";
     out.creation_propertiesTitle = "Disponibilité";
     out.creation_appMenuName = "Mode avancé (Ctrl + E)";
     out.creation_newPadModalDescription = "Cliquez sur un type de pad pour le créer. Vous pouvez aussi appuyer sur <b>Tab</b> pour sélectionner un type et appuyer sur <b>Entrée</b> pour valider.";
-    out.creation_newPadModalDescriptionAdvanced = "Cochez la case si vous souhaitez voir l'écran de création de pads (pour les pads possédés ou à date d'expiration). Vous pouvez appuyer sur <b>Espace</b> pour changer sa valeur.";
+    out.creation_newPadModalDescriptionAdvanced = "Cochez la case si vous souhaitez voir l'écran de création de pads (pour les pads avec propriétaire ou à durée de vie). Vous pouvez appuyer sur <b>Espace</b> pour changer sa valeur.";
     out.creation_newPadModalAdvanced = "Afficher l'écran de création de pads";
 
     // New share modal

From 03bcd2f00da0a30d8993bfe81d90d54991d4dca3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 12:12:24 +0100
Subject: [PATCH 08/33] Lint compliance

---
 customize.dist/src/less2/include/creation.less |  6 ------
 www/common/common-ui-elements.js               | 13 ++++---------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 6d7e6462c..c07fcc849 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -40,13 +40,7 @@
             button {
                 .tools_unselectable();
                 padding: 15px;
-                //background: @creation-button;
-                background: spin(@colortheme_loading-bg, 180);
-                background: #60ff6b;
                 background: #30b239;
-                color: @colortheme_loading-color;
-                color: spin(#60ff6b, 180);
-                color: #000;
                 color: #FFF;
                 font-weight: bold;
                 margin: 3px 10px;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b1e0d0c52..ba7779eca 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1823,11 +1823,6 @@ define([
         var $creationContainer = $('<div>', { id: 'cp-creation-container' }).appendTo($body);
         var $creation = $('<div>', { id: 'cp-creation', tabindex: 1 }).appendTo($creationContainer);
 
-        var setHTML = function (e, html) {
-            e.innerHTML = html;
-            return e;
-        };
-
         // Title
         var colorClass = 'cp-icon-color-'+type;
         $creation.append(h('h1.cp-creation-title.'+colorClass, Messages['button_new'+type]));
@@ -1948,7 +1943,7 @@ define([
                 }).appendTo($container);
                 console.log(obj.id);
                 $span.data('id', obj.id);
-                if (idx === 0) { $span.addClass('cp-creation-template-selected') }
+                if (idx === 0) { $span.addClass('cp-creation-template-selected'); }
                 $span.append(obj.icon || UI.getFileIcon({type: type}));
                 $('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
                     .appendTo($span);
@@ -2009,7 +2004,7 @@ define([
         UIElements.setExpirationValue(cfg.expire, $creation);
 
         // Create the pad
-        var getFormValues = function (template) {
+        var getFormValues = function () {
             // Type of pad
             var ownedVal = $('#cp-creation-owned').is(':checked') ? 1 : 0;
             // Life time
@@ -2026,12 +2021,12 @@ define([
             }
 
             var $template = $creation.find('.cp-creation-template-selected');
-            var template = $template.data('id') || undefined;
+            var templateId = $template.data('id') || undefined;
 
             return {
                 owned: ownedVal,
                 expire: expireVal,
-                templateId: template
+                templateId: templateId
             };
         };
         var create = function () {

From ebef99e5cf00de2dea385dcc3e692785a9190f79 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 16:32:17 +0100
Subject: [PATCH 09/33] Owned drive

---
 customize.dist/login.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/login.js b/customize.dist/login.js
index fde218d21..1f8cebab5 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -75,6 +75,7 @@ define([
             logLevel: 1,
             classic: true,
             ChainPad: ChainPad,
+            owners: [opt.edPublic]
         };
 
         var rt = opt.rt = Listmap.create(config);

From d6228a39bd5593910b272f402b65498cb1295795 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 16:34:44 +0100
Subject: [PATCH 10/33] Fix userlist notifications missing for join events

---
 www/common/outer/async-store.js | 2 +-
 www/common/toolbar3.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index ae7d752b6..92c32cbb2 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -372,7 +372,7 @@ define([
         var metadata = {
             // "user" is shared with everybody via the userlist
             user: {
-                name: store.proxy[Constants.displayNameKey],
+                name: store.proxy[Constants.displayNameKey] || "",
                 uid: store.proxy.uid,
                 avatar: Util.find(store.proxy, ['profile', 'avatar']),
                 profile: Util.find(store.proxy, ['profile', 'view']),
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 652047615..1fd87294d 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -885,7 +885,6 @@ define([
         var oldUserData;
         if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
-        var userNetfluxId = metadataMgr.getNetfluxId();
         var notify = function(type, name, oldname) {
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
             if (typeof name === "undefined") { return; }
@@ -929,6 +928,7 @@ define([
         metadataMgr.onChange(function () {
             var newdata = metadataMgr.getMetadata().users;
             var netfluxIds = Object.keys(newdata);
+            var userNetfluxId = metadataMgr.getNetfluxId();
             // Notify for disconnected users
             if (typeof oldUserData !== "undefined") {
                 for (var u in oldUserData) {

From de97c5a3ff8861e0f430bab6bb423cbffbd05ce6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 17:02:41 +0100
Subject: [PATCH 11/33] Fix mobile detection when hiding the userlist

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

diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 652047615..8eb184a79 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,7 @@ define([
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || $(window).height() < 800) { return void hide(); }
+            if (val === false || $(window).width() < 800) { return void hide(); }
             show();
         });
 

From 1dabc76bb9f200c5e031b1c120143a31d7ec23ad Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Mar 2018 17:03:50 +0100
Subject: [PATCH 12/33] Fix sframe-boot version

---
 www/contacts/inner.html | 2 +-
 www/profile/inner.html  | 2 +-
 www/settings/inner.html | 2 +-
 www/todo/inner.html     | 2 +-
 www/worker/inner.html   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/contacts/inner.html b/www/contacts/inner.html
index dc67d4390..b99bbc5b4 100644
--- a/www/contacts/inner.html
+++ b/www/contacts/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/contacts/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/contacts/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
     </style>
diff --git a/www/profile/inner.html b/www/profile/inner.html
index 48f0531f9..1decad2c7 100644
--- a/www/profile/inner.html
+++ b/www/profile/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/profile/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/profile/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
     </style>
diff --git a/www/settings/inner.html b/www/settings/inner.html
index a63627771..c228a9aaa 100644
--- a/www/settings/inner.html
+++ b/www/settings/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/settings/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/settings/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
     </style>
diff --git a/www/todo/inner.html b/www/todo/inner.html
index 111a61b07..85b676a17 100644
--- a/www/todo/inner.html
+++ b/www/todo/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/todo/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/todo/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
     </style>
diff --git a/www/worker/inner.html b/www/worker/inner.html
index e01d19558..6ee87fa8f 100644
--- a/www/worker/inner.html
+++ b/www/worker/inner.html
@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/worker/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/worker/inner.js" data-main="/common/sframe-boot.js?ver=1.6" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
     </style>

From 5b21911341744a5cdef9743f754f049adaef03af Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 16 Mar 2018 12:26:39 +0100
Subject: [PATCH 13/33] pass flow tests

---
 rpc.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rpc.js b/rpc.js
index 3ad1a9a42..9cdb440f3 100644
--- a/rpc.js
+++ b/rpc.js
@@ -992,6 +992,9 @@ var owned_upload_complete = function (Env, safeKey, cb) {
     }
 
     var oldPath = makeFilePath(Env.paths.staging, safeKey);
+    if (typeof(oldPath) !== 'string') {
+        return void cb('EINVAL_CONFIG');
+    }
 
     // construct relevant paths
     var root = Env.paths.staging;
@@ -1054,6 +1057,9 @@ var owned_upload_complete = function (Env, safeKey, cb) {
         }));
     }).nThen(function (w) {
         // move the existing file to its new path
+
+        // flow is dumb and I need to guard against this which will never happen
+        /*:: if (typeof(oldPath) === 'object') { throw new Error('should never happen'); } */
         Fs.rename(oldPath /* XXX */, finalPath, w(function (e) {
             if (e) {
                 w.abort();
@@ -1217,7 +1223,6 @@ RPC.create = function (
     var pinPath = paths.pin = keyOrDefaultString('pinPath', './pins');
     var blobPath = paths.blob = keyOrDefaultString('blobPath', './blob');
     var blobStagingPath = paths.staging = keyOrDefaultString('blobStagingPath', './blobstage');
-    console.log(blobStagingPath);
 
     var isUnauthenticateMessage = function (msg) {
         return msg && msg.length === 2 && isUnauthenticatedCall(msg[0]);

From f1107ae6e53357c6b647a958db23d7aacd7eb77c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 16 Mar 2018 18:13:33 +0100
Subject: [PATCH 14/33] Don't count other people's owned pads against your
 limit

---
 www/common/outer/async-store.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 4f1431e32..ffd31f1b6 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -69,8 +69,16 @@ define([
         var userChannel = userParsedHash && userParsedHash.channel;
         if (!userChannel) { return null; }
 
-        var list = store.userObject.getFiles([store.userObject.FILES_DATA]).map(function (id) {
-                return Hash.hrefToHexChannelId(store.userObject.getFileData(id).href);
+        // Get the list of pads' channel ID in your drive
+        // This list is filtered so that it doesn't include pad owned by other users (you should
+        // not pin these pads)
+        var files = store.userObject.getFiles([store.userObject.FILES_DATA]);
+        var edPublic = store.proxy.edPublic;
+        var list = files.map(function (id) {
+                var d = store.userObject.getFileData(id);
+                if (d.owners && d.owners.length && edPublic &&
+                    d.owners.indexOf(edPublic) === -1) { return; }
+                return Hash.hrefToHexChannelId(d.href);
             })
             .filter(function (x) { return x; });
 

From c1358936389ccf0d7f672435615a38cc932f3845 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 16 Mar 2018 18:14:21 +0100
Subject: [PATCH 15/33] Improve UI for polls on mobiles

---
 www/poll/app-poll.less | 46 ++++++++++++++++++++++++++++++++++--------
 www/poll/inner.js      | 11 ++++------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 0a5d5ca59..c86653a6c 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -111,11 +111,9 @@ table#cp-app-poll-table {
 }
 #cp-app-poll-table-container {
     position: relative;
-    padding: 30px 0;
-    width: ~"calc(100% - 30px)";
+    margin: 20px;
 }
 #cp-app-poll-table-container button {
-    //display: none;
     border-radius: 0;
     border: 0;
 }
@@ -148,8 +146,8 @@ table#cp-app-poll-table {
 #cp-app-poll-table-scroll {
     overflow-y: hidden;
     overflow-x: auto;
-    margin-left: ~"calc(25% + 30px)";
-    max-width: ~"calc(75% - 30px - 100px - 100px)";
+    margin-left: 25%;
+    max-width: ~"calc(75% - 100px - 100px)";
     width: auto;
     display: inline-block;
 }
@@ -227,7 +225,6 @@ table {
     margin: 20px;
 }
 tbody {
-    //border: 1px solid @poll-border-color;
     * {
         box-sizing: border-box;
     }
@@ -298,7 +295,7 @@ div.cp-app-poll-realtime {
             /* Options */
             td:first-child {
                 position:absolute;
-                left: 30px;
+                left: 0;
                 top: auto;
                 width: 25%;
             }
@@ -454,7 +451,6 @@ div.cp-app-poll-realtime {
                 &:nth-last-child(2) {
                     border-right: 1px solid @poll-border-color;
                 }
-                //text-align: center;
                 &.cp-app-poll-table-own {
                     background: @poll-th-user-bg;
                     .cp-app-poll-table-lock {
@@ -631,8 +627,42 @@ div.cp-app-poll-realtime {
             }
         }
     }
+
+    @media screen and (max-width: 500px) {
+        #cp-app-poll-table-scroll {
+            max-width: 100%;
+            padding: 0;
+            margin: 0;
+            table {
+                tr {
+                    td {
+                        &:first-child {
+                            position: unset;
+                            min-width: 100px;
+                            &:hover:not(:empty) {
+                                position: absolute;
+                                min-width: 100px;
+                                width: auto;
+                                z-index: 100;
+                            }
+                        }
+                        &:nth-last-child(2) {
+                            position: unset;
+                        }
+                        &:last-child {
+                            position: unset;
+                        }
+                    }
+                }
+            }
+        }
+        #cp-app-poll-comments {
+            min-width: 90%;
+        }
+    }
 }
 
+
 .btn {
     display: inline-flex;
     align-items: center;
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 9222d90a0..1a0c14f8c 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -163,11 +163,10 @@ define([
     var sortColumns = function (order, firstcol) {
         var colsOrder = order.slice();
         // Never put at the first position an uncommitted column
-        if (APP.proxy.content.colsOrder.indexOf(firstcol) === -1) { return colsOrder; }
-        colsOrder.sort(function (a, b) {
-            return (a === firstcol) ? -1 :
-                        ((b === firstcol) ? 1 : 0);
-        });
+        var idx = APP.proxy.content.colsOrder.indexOf(firstcol);
+        if (!firstcol || idx === -1) { return colsOrder; }
+        colsOrder.splice(idx, 1);
+        colsOrder.unshift(firstcol);
         return colsOrder;
     };
 
@@ -618,7 +617,6 @@ define([
             // If readOnly, always put the app in published mode
             bool = true;
         }
-        console.log(bool);
         $(APP.$mediaTagButton).toggle(!bool);
         setTablePublished(bool);
         /*['textarea'].forEach(function (sel) {
@@ -1270,7 +1268,6 @@ define([
         }).nThen(function (waitFor) {
             common.handleNewFile(waitFor);
         }).nThen(function (/* waitFor */) {
-            console.log('here');
             Test.registerInner(common.getSframeChannel());
             var metadataMgr = common.getMetadataMgr();
             APP.locked = APP.readOnly = metadataMgr.getPrivateData().readOnly;

From 07e361b88da959e86fca40bee82a8c412bfa1f2c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 14:04:44 +0100
Subject: [PATCH 16/33] Account deletion button

---
 www/common/cryptpad-common.js   |  4 +++
 www/common/outer/async-store.js | 20 ++++++++++++++-
 www/common/outer/store-rpc.js   |  5 +++-
 www/common/sframe-protocol.js   |  1 +
 www/settings/app-settings.less  |  4 +++
 www/settings/inner.js           | 45 ++++++++++++++++++++++++++++++++-
 www/settings/main.js            |  3 +++
 7 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 10db8522a..e2968aa94 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -88,6 +88,10 @@ define([
         };
         postMessage("MIGRATE_ANON_DRIVE", data, cb);
     };
+    // Settings
+    common.deleteAccount = function (cb) {
+        postMessage("DELETE_ACCOUNT", null, cb);
+    };
     // Drive
     common.userObjectCommand = function (data, cb) {
         postMessage("DRIVE_USEROBJECT", data, cb);
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index ffd31f1b6..6790f2ed1 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1,4 +1,5 @@
 define([
+    'json.sortify',
     '/common/userObject.js',
     '/common/migrate-user-object.js',
     '/common/common-hash.js',
@@ -15,7 +16,7 @@ define([
     '/bower_components/chainpad-crypto/crypto.js?v=0.1.5',
     '/bower_components/chainpad/chainpad.dist.js',
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
-], function (UserObject, Migrate, Hash, Util, Constants, Feedback, Realtime, Messaging, Messenger,
+], function (Sortify, UserObject, Migrate, Hash, Util, Constants, Feedback, Realtime, Messaging, Messenger,
              CpNfWorker, NetConfig, AppConfig,
              Crypto, ChainPad, Listmap) {
     var Store = {};
@@ -420,6 +421,23 @@ define([
         });
     };
 
+    Store.deleteAccount = function (data, cb) {
+        var toSign = {
+            intent: 'Please delete my account.'
+        };
+        var secret = Hash.getSecrets('drive', storeHash);
+        toSign.drive = secret.channel;
+        toSign.edPublic = store.proxy.edPublic;
+        var signKey = Crypto.Nacl.util.decodeBase64(secret.keys.signKey);
+        console.log(Sortify(toSign));
+        var proof = Crypto.Nacl.sign.detached(Crypto.Nacl.util.decodeUTF8(Sortify(toSign)), signKey);
+        var proofTxt = Crypto.Nacl.util.encodeBase64(proof);
+        cb({
+            proof: proofTxt,
+            toSign: JSON.parse(Sortify(toSign))
+        });
+    };
+
     /**
      * add a "What is CryptPad?" pad in the drive
      * data
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index 7c4bff116..1043f9dcf 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -172,7 +172,10 @@ define([
             case 'DRIVE_USEROBJECT': {
                 Store.userObjectCommand(data, cb); break;
             }
-
+            // Settings
+            case 'DELETE_ACCOUNT': {
+                Store.deleteAccount(data, cb); break;
+            }
             case 'IS_NEW_CHANNEL': {
                 Store.isNewChannel(data, cb); break;
             }
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index f49b3ed11..4c3046ad9 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -193,6 +193,7 @@ define({
     'Q_SETTINGS_LOGOUT': true,
     // Import pads from this computer's anon session into the current user account
     'Q_SETTINGS_IMPORT_LOCAL': true,
+    'Q_SETTINGS_DELETE_ACCOUNT': true,
 
     // Store the language selected in the iframe into localStorage outside
     'Q_LANGUAGE_SET': true,
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 187b75da8..bb033c6dc 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -138,5 +138,9 @@
             }
         }
     }
+
+    .cp-app-settings-delete-alert {
+        pre { color: inherit; }
+    }
 }
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 86870d950..43967c3e4 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -47,7 +47,8 @@ define([
             'cp-settings-logout-everywhere',
             'cp-settings-resettips',
             'cp-settings-thumbnails',
-            'cp-settings-userfeedback'
+            'cp-settings-userfeedback',
+            'cp-settings-delete'
         ],
         'creation': [
             'cp-settings-creation-owned',
@@ -317,6 +318,48 @@ define([
         return $div;
     };
 
+    create['delete'] = function () {
+        var $div = $('<div>', { 'class': 'cp-settings-delete cp-sidebarlayout-element'});
+
+        $('<span>', {'class': 'label'}).text('DELETE ACCOUNT').appendTo($div); // XXX
+
+        $('<span>', {'class': 'cp-sidebarlayout-description'})
+            .append('DELETE ACCOUNT DESCRIPTION').appendTo($div); // XXX
+
+        //var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
+        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
+
+        var $button = $('<button>', {'id': 'cp-settings-delete', 'class': 'btn btn-primary'})
+            .text('DELETE MY ACCOUNT PERMANENTLY').appendTo($div); // XXX
+
+        $button.click(function () {
+            $spinner.show();
+            sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function (err, data) {
+                var msg = h('div.cp-app-settings-delete-alert', [
+                    h('p', 'SEND US THE FOLLOWING DATA'),
+                    h('pre', JSON.stringify(data, 0, 2))
+                ]);
+                UI.alert(msg);
+                $spinner.hide();
+            });
+            // TODO
+            /*
+            UI.confirm("Are you sure?", function (yes) {
+                // Logout everywhere
+                // Disconnect other tabs
+                // Remove owned pads
+                // Remove owned drive
+                // Remove pinstore
+                // Alert: "Account deleted", press OK to be redirected to the home page
+                $spinner.hide();
+            });*/
+        });
+
+        $spinner.hide().appendTo($div);
+
+        return $div;
+    };
+
     // Pad Creation settings
 
     var setHTML = function (e, html) {
diff --git a/www/settings/main.js b/www/settings/main.js
index 6b4dd8b8b..6820ff1ca 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -65,6 +65,9 @@ define([
             sframeChan.on('Q_SETTINGS_IMPORT_LOCAL', function (data, cb) {
                 Cryptpad.mergeAnonDrive(cb);
             });
+            sframeChan.on('Q_SETTINGS_DELETE_ACCOUNT', function (data, cb) {
+                Cryptpad.deleteAccount(cb);
+            });
         };
         var category;
         if (window.location.hash) {

From 4f2a91b82d661cdec58c3ee4ba4aa2e5fb05c6e6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 16:17:19 +0100
Subject: [PATCH 17/33] Pad creation screen UI improvements

---
 .../src/less2/include/creation.less           | 37 +++++++----
 customize.dist/translations/messages.fr.js    |  3 +-
 customize.dist/translations/messages.js       |  3 +-
 www/common/common-ui-elements.js              | 62 +++++++++++++------
 4 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index c07fcc849..9b7c865f6 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -36,6 +36,7 @@
         }
 
         .cp-creation-create, .cp-creation-settings {
+            margin-top: 0px;
             @creation-button: #FF0073;
             button {
                 .tools_unselectable();
@@ -47,6 +48,7 @@
                 border: none;
                 cursor: pointer;
                 outline: none;
+                width: 100%;
                 &:hover {
                     background: darken(@creation-button, 5%);
                 }
@@ -87,22 +89,24 @@
                     }
                 }
             }
+            .cp-creation-slider {
+                display: block;
+                overflow: hidden;
+                max-height: 0px;
+                transition: max-height 0.5s ease-in-out;
+                width: 100%;
+                margin-top: 10px;
+                &.active {
+                    max-height: 40px;
+                }
+            }
             .cp-creation-expire {
                 .cp-creation-expire-picker {
-                    display: block;
-                    overflow: hidden;
-                    max-height: 0px;
-                    transition: max-height 0.5s ease-in-out;
-                    width: 100%;
                     text-align: center;
-                    margin-top: 10px;
                     input {
                         width: 100px;
                     }
                 }
-                .cp-creation-expire-picker.active {
-                    max-height: 40px;
-                }
             }
             .cp-creation-settings {
                 button {
@@ -112,11 +116,20 @@
                 .cp-filler { flex: 1; }
             }
 
+            div.cp-creation-remember {
+                margin-top: 30px;
+                .cp-creation-remember-help {
+                    font-style: italic;
+                }
+            }
             div.cp-creation-template {
                 width: 100%;
                 background-color: darken(@colortheme_modal-bg, 3%);
                 padding: 20px;
                 margin: 30px 0;
+                .cp-creation-title {
+                    padding: 0 0 10px 10px;
+                }
             }
             .cp-creation-template-container {
                 width: 100%;
@@ -128,8 +141,8 @@
                 .cp-creation-template-element {
                     @darker: darken(@colortheme_modal-fg, 30%);
 
-                    width: 125px;
-                    padding: 10px;
+                    width: 135px;
+                    padding: 5px;
                     margin: 5px;
                     display: inline-flex;
                     flex-flow: column;
@@ -164,6 +177,7 @@
                     }
 
                     .cp-creation-template-element-name {
+                        flex: 1;
                         overflow: hidden;
                         text-overflow: ellipsis;
                         white-space: nowrap;
@@ -213,6 +227,7 @@
                             flex-flow: row;
                             margin: 1px;
                             padding: 5px;
+                            width: 155px;
                             img {
                                 display: none;
                             }
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index b238fc22b..d195a5202 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -1079,8 +1079,9 @@ define(function () {
     out.creation_noTemplate = "Pas de modèle";
     out.creation_newTemplate = "Nouveau modèle";
     out.creation_create = "Créer";
-    out.creation_saveSettings = "Se souvenir de ces paramètres";
+    out.creation_saveSettings = "Ne plus me demander";
     out.creation_settings = "Voir davantage de préférences";
+    out.creation_rememberHelp = "Ouvrez votre page de Préférences pour annuler cette fonctionnalité";
     // Properties about creation data
     out.creation_owners = "Propriétaires";
     out.creation_ownedByOther = "Appartient à un autre utilisateur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 884b4bb62..118334c86 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1126,8 +1126,9 @@ define(function () {
     out.creation_noTemplate = "No template";
     out.creation_newTemplate = "New template";
     out.creation_create = "Create";
-    out.creation_saveSettings = "Remember these settings";
+    out.creation_saveSettings = "Don't show this again";
     out.creation_settings = "View more settings";
+    out.creation_rememberHelp = "Visit your Settings page to reset this preference";
     // Properties about creation data
     out.creation_owners = "Owners";
     out.creation_ownedByOther = "Owned by another user";
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ba7779eca..fdcf17682 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1825,7 +1825,8 @@ define([
 
         // Title
         var colorClass = 'cp-icon-color-'+type;
-        $creation.append(h('h1.cp-creation-title.'+colorClass, Messages['button_new'+type]));
+        $creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
+        //$creation.append(h('h2.cp-creation-title.'+colorClass, Messages.newButtonTitle));
 
         // Deleted pad warning
         if (metadataMgr.getPrivateData().isDeleted) {
@@ -1870,7 +1871,7 @@ define([
                 Messages.creation_expire
             ]),
             createHelper('faq.html#keywords-expiring', Messages.creation_expire2),
-            h('div.cp-creation-expire-picker', [
+            h('div.cp-creation-expire-picker.cp-creation-slider', [
                 h('input#cp-creation-expire-val', {
                     type: "number",
                     min: 1,
@@ -1889,29 +1890,34 @@ define([
         ]);
 
         var templates = h('div.cp-creation-template', [
+            h('h3.cp-creation-title.'+colorClass, Messages['button_new'+type]),
             h('div.cp-creation-template-container', [
                 h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')
             ])
         ]);
 
         var settings = h('div.cp-creation-remember', [
-            h('label.cp-checkmark.cp-checkmark-secondary', [
+            h('label.cp-checkmark', [
                 h('input', {
                     type: 'checkbox',
-                    id: 'cp-creation-remember',
-                    checked: 'checked'
+                    id: 'cp-creation-remember'
                 }),
                 h('span.cp-checkmark-mark'),
                 Messages.creation_saveSettings
             ]),
-            createHelper('/settings/#creation', Messages.creation_settings)
+            createHelper('/settings/#creation', Messages.creation_settings),
+            h('div.cp-creation-remember-help.cp-creation-slider', Messages.creation_rememberHelp)
         ]);
 
+        var createDiv = h('div.cp-creation-create');
+        var $create = $(createDiv);
+
         $(h('div#cp-creation-form', [
             owned,
             expire,
+            settings,
             templates,
-            settings
+            createDiv
         ])).appendTo($creation);
 
         // Display templates
@@ -1927,12 +1933,12 @@ define([
             data.unshift({
                 name: Messages.creation_noTemplate,
                 id: 0,
-                icon: h('span.fa.fa-times')
+                icon: h('span.fa.fa-file')
             });
             data.push({
                 name: Messages.creation_newTemplate,
                 id: -1,
-                icon: h('span.fa.fa-plus')
+                icon: h('span.fa.fa-bookmark')
             });
             var $container = $(templates).find('.cp-creation-template-container').html('');
             data.forEach(function (obj, idx) {
@@ -1984,6 +1990,16 @@ define([
             $creation.focus();
         });
 
+        // Display settings help when checkbox checked
+        $creation.find('#cp-creation-remember').on('change', function () {
+            if ($(this).is(':checked')) {
+                $creation.find('.cp-creation-remember-help:not(.active)').addClass('active');
+                return;
+            }
+            $creation.find('.cp-creation-remember-help').removeClass('active');
+            $creation.focus();
+        });
+
         // Keyboard shortcuts
         $creation.find('#cp-creation-expire-val').keydown(function (e) {
             if (e.which === 9) {
@@ -2001,6 +2017,9 @@ define([
         if (!cfg.owned && typeof cfg.owned !== "undefined") {
             $creation.find('#cp-creation-owned').attr('checked', false);
         }
+        if (cfg.skip) {
+            $creation.find('#cp-creation-remember').attr('checked', 'checked');
+        }
         UIElements.setExpirationValue(cfg.expire, $creation);
 
         // Create the pad
@@ -2032,16 +2051,20 @@ define([
         var create = function () {
             var val = getFormValues();
 
-            if ($('#cp-creation-remember').is(':checked')) {
-                common.setAttribute(['general', 'creation', 'owned'],
-                                    val.owned, function (e) {
-                    if (e) { return void console.error(e); }
-                });
-                common.setAttribute(['general', 'creation', 'expire'],
-                                    val.expire, function (e) {
-                    if (e) { return void console.error(e); }
-                });
-            }
+            var skip = $('#cp-creation-remember').is(':checked');
+            common.setAttribute(['general', 'creation', 'skip'], skip, function (e) {
+                if (e) { return void console.error(e); }
+            });
+            common.setAttribute(['general', 'creation', 'noTemplate'], skip, function (e) {
+                if (e) { return void console.error(e); }
+            });
+
+            common.setAttribute(['general', 'creation', 'owned'], val.owned, function (e) {
+                if (e) { return void console.error(e); }
+            });
+            common.setAttribute(['general', 'creation', 'expire'], val.expire, function (e) {
+                if (e) { return void console.error(e); }
+            });
 
             $creationContainer.remove();
             common.createPad(val, function () {
@@ -2049,7 +2072,6 @@ define([
             });
         };
 
-        var $create = $(h('div.cp-creation-create')).appendTo($creation);
 
         var $button = $('<button>').text(Messages.creation_create).appendTo($create);
         $button.addClass('cp-creation-button-selected');

From 91b3ef45f387546101dbe62f9863e4369a0301d6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 16:27:33 +0100
Subject: [PATCH 18/33] Fix mobile detection

---
 www/common/common-ui-elements.js | 6 +++---
 www/common/toolbar3.js           | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fdcf17682..877bea596 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -852,7 +852,7 @@ define([
         var tbState = true;
         common.getAttribute(['general', 'markdown-help'], function (e, data) {
             if (e) { return void console.error(e); }
-            if ($(window).height() < 800) { return; }
+            if ($(window).height() < 800 && $(window).width() < 800) { return; }
             if (data === true && $toolbarButton.length && tbState) {
                 $toolbarButton.click();
             }
@@ -869,7 +869,7 @@ define([
             }
             common.getAttribute(['general', 'markdown-help'], function (e, data) {
                 if (e) { return void console.error(e); }
-                if ($(window).height() < 800) { return; }
+                if ($(window).height() < 800 && $(window).width() < 800) { return; }
                 if (data === true && $toolbarButton) {
                     // Show the toolbar using the button to make sure the icon in the button is
                     // correct (caret-down / caret-up)
@@ -964,7 +964,7 @@ define([
         });
 
         common.getAttribute(['hideHelp', type], function (err, val) {
-            if ($(window).height() < 800) { return void toggleHelp(true); }
+            if ($(window).height() < 800 && $(window).width() < 800) { return void toggleHelp(true); }
             if (val === true) { toggleHelp(true); }
         });
 
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 22e9d5bf3..905551d77 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -400,7 +400,9 @@ define([
         });
         show();
         Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
-            if (val === false || $(window).width() < 800) { return void hide(); }
+            if (val === false || ($(window).height() < 800 && $(window).width() < 800)) {
+                return void hide();
+            }
             show();
         });
 

From bc26f67edbc739964c1aa3ab96b56e8a4f73122a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 16:45:36 +0100
Subject: [PATCH 19/33] Use stable bootstrap

---
 bower.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 7bf775e64..f9ee60c20 100644
--- a/bower.json
+++ b/bower.json
@@ -38,7 +38,7 @@
     "scrypt-async": "1.2.0",
     "require-css": "0.1.10",
     "less": "^2.7.2",
-    "bootstrap": "#v4.0.0-alpha.6",
+    "bootstrap": "^v4.0.0",
     "diff-dom": "2.1.1",
     "nthen": "^0.1.5",
     "open-sans-fontface": "^1.4.2",
@@ -49,6 +49,6 @@
     "sortablejs": "#^1.6.0"
   },
   "resolutions": {
-    "bootstrap": "v4.0.0-alpha.6"
+    "bootstrap": "^v4.0.0"
   }
 }

From 96a63a3b7bf6c61d5c2110d2db73c8cb76fa80b8 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 19 Mar 2018 16:56:09 +0100
Subject: [PATCH 20/33] fix weird checkbox logic in share menu

---
 www/common/common-ui-elements.js | 18 +++++++++---------
 www/common/common-util.js        |  7 +++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 07ad3d98d..02a929ad1 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -241,7 +241,6 @@ define([
                 type: 'radio',
                 name: 'cp-share-editable',
                 value: 1,
-                checked: 'checked'
             }),
             h('label', { 'for': 'cp-share-editable-true' }, Messages.share_linkEdit),
             h('input#cp-share-editable-false.cp-share-editable-value', {
@@ -271,12 +270,12 @@ define([
         ]);
         if (!hashes.editHash) {
             $(link).find('#cp-share-editable-false').attr('checked', true);
-            $(link).find('#cp-share-editable-true').attr('disabled', true);
+            $(link).find('#cp-share-editable-true').removeAttr('checked').attr('disabled', true);
         }
         var saveValue = function () {
-            var edit = $(link).find('#cp-share-editable-true').is(':checked');
-            var embed = $(link).find('#cp-share-embed').is(':checked');
-            var present = $(link).find('#cp-share-present').is(':checked');
+            var edit = Util.isChecked($(link).find('#cp-share-editable-true'));
+            var embed = Util.isChecked($(link).find('#cp-share-embed'));
+            var present = Util.isChecked($(link).find('#cp-share-present'));
             common.setAttribute(['general', 'share'], {
                 edit: edit,
                 embed: embed,
@@ -285,9 +284,9 @@ define([
         };
         var getLinkValue = function (initValue) {
             var val = initValue || {};
-            var edit = initValue ? val.edit : $(link).find('#cp-share-editable-true').is(':checked');
-            var embed = initValue ? val.embed : $(link).find('#cp-share-embed').is(':checked');
-            var present = initValue ? val.present : $(link).find('#cp-share-present').is(':checked');
+            var edit = initValue ? val.edit : Util.isChecked($(link).find('#cp-share-editable-true'));
+            var embed = initValue ? val.embed : Util.isChecked($(link).find('#cp-share-embed'));
+            var present = initValue ? val.present : Util.isChecked($(link).find('#cp-share-present'));
 
             var hash = (edit && hashes.editHash) ? hashes.editHash : hashes.viewHash;
             var href = origin + pathname + '#' + hash;
@@ -374,6 +373,7 @@ define([
             if (val.edit === false) {
                 $(link).find('#cp-share-editable-false').attr('checked', true);
             }
+            else { $(link).find('#cp-share-editable-true').attr('checked', true); }
             if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); }
             if (val.present) { $(link).find('#cp-share-present').attr('checked', true); }
             $(link).find('#cp-share-link-preview').val(getLinkValue(val));
@@ -1681,7 +1681,7 @@ define([
             $element.attr('data-type', p);
             $element.click(function () {
                 $modal.hide();
-                if ($advanced && $advanced.is(':checked')) {
+                if ($advanced && Util.isChecked($advanced)) {
                     common.sessionStorage.put(Constants.displayPadCreationScreen, true, function (){
                         common.openURL('/' + p + '/');
                     });
diff --git a/www/common/common-util.js b/www/common/common-util.js
index 98eda7373..c16a2cdfd 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -246,6 +246,13 @@ define([], function () {
         }
     };
 
+    Util.isChecked = function (el) {
+        // could be nothing...
+        if (!el) { return false; }
+        // jquery or dom elements should both be fine with this
+        return Boolean($(el).prop('checked'));
+    };
+
     return Util;
 });
 }(self));

From bd6b6dcb49fb399d49b531897b5009c9c29e5e52 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 19 Mar 2018 17:13:44 +0100
Subject: [PATCH 21/33] actually fix weird checkbox logic, and lint compliance

---
 www/common/common-ui-elements.js |  8 ++++----
 www/common/common-util.js        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index bffc6e2d5..50e532204 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -371,11 +371,11 @@ define([
         common.getAttribute(['general', 'share'], function (err, val) {
             val = val || {};
             if (val.edit === false) {
-                $(link).find('#cp-share-editable-false').attr('checked', true);
+                $(link).find('#cp-share-editable-false').prop('checked', true);
             }
-            else { $(link).find('#cp-share-editable-true').attr('checked', true); }
-            if (val.embed) { $(link).find('#cp-share-embed').attr('checked', true); }
-            if (val.present) { $(link).find('#cp-share-present').attr('checked', true); }
+            else { $(link).find('#cp-share-editable-true').prop('checked', true); }
+            if (val.embed) { $(link).find('#cp-share-embed').prop('checked', true); }
+            if (val.present) { $(link).find('#cp-share-present').prop('checked', true); }
             $(link).find('#cp-share-link-preview').val(getLinkValue(val));
         });
         common.getMetadataMgr().onChange(function () {
diff --git a/www/common/common-util.js b/www/common/common-util.js
index c16a2cdfd..a67ba6673 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -249,8 +249,16 @@ define([], function () {
     Util.isChecked = function (el) {
         // could be nothing...
         if (!el) { return false; }
-        // jquery or dom elements should both be fine with this
-        return Boolean($(el).prop('checked'));
+        // check if it's a dom element
+        if (typeof(el.tagName) !== 'undefined') {
+            return Boolean(el.checked);
+        }
+        // sketchy test to see if it's jquery
+        if (typeof(el.prop) === 'function') {
+            return Boolean(el.prop('checked'));
+        }
+        // else just say it's not checked
+        return false;
     };
 
     return Util;

From 67cdb6bd13b0aa09dfd8b51438bacaa7cdb6c270 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 17:25:31 +0100
Subject: [PATCH 22/33] Fix initial values in the pad creation screen

---
 www/common/common-ui-elements.js | 43 ++------------------------------
 www/common/sframe-common.js      |  1 -
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 877bea596..bb285e3dc 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1947,7 +1947,6 @@ define([
                     'class': 'cp-creation-template-element',
                     'title': name,
                 }).appendTo($container);
-                console.log(obj.id);
                 $span.data('id', obj.id);
                 if (idx === 0) { $span.addClass('cp-creation-template-selected'); }
                 $span.append(obj.icon || UI.getFileIcon({type: type}));
@@ -2015,10 +2014,10 @@ define([
 
         // Initial values
         if (!cfg.owned && typeof cfg.owned !== "undefined") {
-            $creation.find('#cp-creation-owned').attr('checked', false);
+            $creation.find('#cp-creation-owned').prop('checked', false);
         }
         if (cfg.skip) {
-            $creation.find('#cp-creation-remember').attr('checked', 'checked');
+            $creation.find('#cp-creation-remember').prop('checked', true).trigger('change');
         }
         UIElements.setExpirationValue(cfg.expire, $creation);
 
@@ -2079,44 +2078,6 @@ define([
             create();
         });
 
-        // Save settings button
-        /*var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
-        var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
-        var okTo;
-        var $saveButton = $('<button>').text(Messages.creation_saveSettings).click(function () {
-            if (okTo) { clearTimeout(okTo); }
-            $ok.hide();
-            $spinner.show();
-            var val = getFormValues();
-            NThen(function (waitFor) {
-                common.setAttribute(['general', 'creation', 'owned'], val.owned, waitFor(function (e) {
-                    if (e) { return void console.error(e); }
-                }));
-                common.setAttribute(['general', 'creation', 'expire'], val.expire, waitFor(function (e) {
-                    if (e) { return void console.error(e); }
-                }));
-            }).nThen(function () {
-                $spinner.hide();
-                $ok.show();
-                okTo = setTimeout(function () {
-                    $ok.hide();
-                }, 5000);
-            });
-        });
-
-        var settings = h('div.cp-creation-settings', [
-            h('button.cp-creation-settings-save', Messages.creation_saveSettings),
-            $ok[0],
-            $spinner[0],
-            h('span.cp-filler'),
-            createHelper('/settings/#creation')
-            //h('a', {
-            //    href: origin + '/settings/#creation',
-            //    target: '_blank'
-            //}, Messages.creation_settings),
-        ]);*/
-
-
         $creation.keydown(function (e) {
             if (e.which === 9) {
                 e.preventDefault();
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 36f896d52..7433fa2f0 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -189,7 +189,6 @@ define([
                 return void funcs.createPad(c, waitFor());
             }
             // If we display the pad creation screen, it will handle deleted pads directly
-            console.log('here');
             funcs.getPadCreationScreen(c, waitFor());
         }
     };

From 8970bae647d7e93d4e4cc3e89c9a5927ca17940c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 17:30:01 +0100
Subject: [PATCH 23/33] Center pad type in the creation screen

---
 customize.dist/src/less2/include/creation.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 9b7c865f6..5525196bd 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -129,6 +129,7 @@
                 margin: 30px 0;
                 .cp-creation-title {
                     padding: 0 0 10px 10px;
+                    margin: auto;
                 }
             }
             .cp-creation-template-container {

From 2704ee1ed712dbc0b535fc4343e37dbd7dfc2aa5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Mar 2018 18:13:57 +0100
Subject: [PATCH 24/33] Account deletion translations

---
 customize.dist/translations/messages.fr.js |  7 ++++++-
 customize.dist/translations/messages.js    |  5 +++++
 www/settings/inner.js                      | 10 +++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index d195a5202..3da5fb202 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -542,6 +542,11 @@ define(function () {
     out.settings_userFeedbackHint2 = "Le contenu de vos pads et les clés de déchiffrement ne seront jamais partagés avec le serveur.";
     out.settings_userFeedback = "Activer l'envoi de retours d'expérience";
 
+    out.settings_deleteTitle = "Suppression du compte";
+    out.settings_deleteHint = "La suppression de votre compte utilisateur est permanente. Votre CryptDrive et votre liste de pads seront supprimés du serveur. Le reste de vos pads sera supprimé après 90 jours d'inactivité si personne ne les a stockés dans leur CryptDrive.";
+    out.settings_deleteButton = "Supprimer votre compte";
+    out.settings_deleteModal = "Veuillez envoyer les informations suivantes à votre administrateur CryptPad afin que vos données soient supprimées du serveur.";
+
     out.settings_anonymous = "Vous n'êtes pas connectés. Ces préférences seront utilisées pour ce navigateur.";
     out.settings_publicSigningKey = "Clé publique de signature";
 
@@ -1081,7 +1086,7 @@ define(function () {
     out.creation_create = "Créer";
     out.creation_saveSettings = "Ne plus me demander";
     out.creation_settings = "Voir davantage de préférences";
-    out.creation_rememberHelp = "Ouvrez votre page de Préférences pour annuler cette fonctionnalité";
+    out.creation_rememberHelp = "Ouvrez votre page de Préférences pour voir ce formulaire à nouveau.";
     // Properties about creation data
     out.creation_owners = "Propriétaires";
     out.creation_ownedByOther = "Appartient à un autre utilisateur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 118334c86..868d107cd 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -546,6 +546,11 @@ define(function () {
     out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server.";
     out.settings_userFeedback = "Enable user feedback";
 
+    out.settings_deleteTitle = "Account deletion";
+    out.settings_deleteHint = "Account deletion is permanent. Your CryptDrive and your list of pads will be deleted from the server. The rest of your pads will be deleted in 90 days if nobody else has stored them in their CryptDrive.";
+    out.settings_deleteButton = "Delete your account";
+    out.settings_deleteModal = "Share the following information with your CryptPad administrator in order to have your data removed from their server.";
+
     out.settings_anonymous = "You are not logged in. Settings here are specific to this browser.";
     out.settings_publicSigningKey = "Public Signing Key";
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 43967c3e4..2aa785981 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -321,22 +321,22 @@ define([
     create['delete'] = function () {
         var $div = $('<div>', { 'class': 'cp-settings-delete cp-sidebarlayout-element'});
 
-        $('<span>', {'class': 'label'}).text('DELETE ACCOUNT').appendTo($div); // XXX
+        $('<span>', {'class': 'label'}).text(Messages.settings_deleteTitle).appendTo($div);
 
         $('<span>', {'class': 'cp-sidebarlayout-description'})
-            .append('DELETE ACCOUNT DESCRIPTION').appendTo($div); // XXX
+            .append(Messages.settings_deleteHint).appendTo($div);
 
         //var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
         var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
 
-        var $button = $('<button>', {'id': 'cp-settings-delete', 'class': 'btn btn-primary'})
-            .text('DELETE MY ACCOUNT PERMANENTLY').appendTo($div); // XXX
+        var $button = $('<button>', {'id': 'cp-settings-delete', 'class': 'btn btn-danger'})
+            .text(Messages.settings_deleteButton).appendTo($div);
 
         $button.click(function () {
             $spinner.show();
             sframeChan.query("Q_SETTINGS_DELETE_ACCOUNT", null, function (err, data) {
                 var msg = h('div.cp-app-settings-delete-alert', [
-                    h('p', 'SEND US THE FOLLOWING DATA'),
+                    h('p', Messages.settings_deleteModal),
                     h('pre', JSON.stringify(data, 0, 2))
                 ]);
                 UI.alert(msg);

From 11b07817175bfadd39df86ec5994fd8a1dafca12 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Mar 2018 10:44:26 +0100
Subject: [PATCH 25/33] delete unused code

---
 customize.dist/template.js | 79 ++++----------------------------------
 1 file changed, 7 insertions(+), 72 deletions(-)

diff --git a/customize.dist/template.js b/customize.dist/template.js
index 9285567ca..ddfd1c1d8 100644
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -7,9 +7,6 @@ define([
 ], function ($, h, Pages) {
 $(function () {
     var $body = $('body');
-    var isMainApp = function () {
-        return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile|todo)\/$/.test(location.pathname);
-    };
 
     var infoPage = function () {
         return h('div#mainBlock.hidden', typeof(Pages[location.pathname]) === 'function'?
@@ -20,80 +17,18 @@ $(function () {
 
     var pathname = location.pathname;
 
-    if (isMainApp()) {
-        if (typeof(Pages[pathname]) === 'function') {
-            var $flash = $('body, #iframe-container, #pad-iframe, textarea');
-            $flash.css({
-                display: 'none',
-                opacity: 0,
-                overflow: 'hidden',
-            });
-            var ready = function () {
-                $flash.css({
-                    display: '',
-                    opacity: '',
-                    overflow: '',
-                });
-            };
-
-            require([
-                'less!/customize/src/less2/loading.less'
-            ], function () {
-                if (/whiteboard/.test(pathname)) {
-                    $('body').html(h('body', Pages[pathname]()).innerHTML);
-                    require(['/whiteboard/main.js'], ready);
-                } else if (/poll/.test(pathname)) {
-                    $('body').html(h('body', Pages[pathname]()).innerHTML);
-                    require(['/poll/main.js'], ready);
-                } else if (/drive/.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require(['/drive/main.js'], ready);
-                } else if (/\/file\//.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/file/main.js' ], ready);
-                } else if (/^\/contacts\/$/.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/contacts/main.js' ], ready);
-                } else if (/pad/.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/pad/main.js' ], ready);
-                } else if (/code/.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/code/main.js' ], ready);
-                } else if (/slide/.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/slide/main.js' ], ready);
-                } else if (/^\/settings\//.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/settings/main.js', ], ready);
-                } else if (/^\/profile\//.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/profile/main.js', ], ready);
-                } else if (/^\/todo\//.test(pathname)) {
-                    $('body').append(h('body', Pages[pathname]()).innerHTML);
-                    require([ '/todo/main.js', ], ready);
-                }
-            });
-
-            return;
-        }
-    } else {
-        // add class on info-pages
-        var css = location.pathname.replace(/(index)?\.html$/gi, "") // .html
-            .replace(/[^a-zA-Z]+/gi, '-') // any non-alpha character
-            .replace(/^-|-$/g, ''); // starting/trailing dashes
-        if (css === '')
-        {
-            css = 'index';
-        }
-        $('body').addClass('cp-page-' + css);
-    }
+    // add class on info-pages
+    var css = location.pathname.replace(/(index)?\.html$/gi, "") // .html
+        .replace(/[^a-zA-Z]+/gi, '-') // any non-alpha character
+        .replace(/^-|-$/g, ''); // starting/trailing dashes
+    if (css === '') { css = 'index'; }
+    $('body').addClass('cp-page-' + css);
 
     window.Tether = function () {};
     require([
         'less!/customize/src/less2/main.less',
         'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
-        '/bower_components/bootstrap/dist/js/bootstrap.min.js'
+        '/bower_components/bootstrap/dist/js/bootstrap.bundle.min.js'
     ], function () {
         $body.append($main);
 

From 44cd235f481da71a904283d22e54f9ca1b5a7f10 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Mar 2018 11:05:43 +0100
Subject: [PATCH 26/33] Fix CSS with Bootstrap 4

---
 customize.dist/pages.js                       | 45 ++++++++++---------
 .../src/less2/include/creation.less           | 14 ++++--
 .../src/less2/include/infopages.less          |  1 +
 customize.dist/translations/messages.fr.js    |  4 +-
 www/common/common-ui-elements.js              | 12 ++---
 5 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 5178cac17..e8f8c877c 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -92,20 +92,25 @@ define([
             ]);
         }
 
-        return h('nav.navbar.navbar-toggleable-md',
-                     h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
-                    [h('i.fa.fa-bars ')
-                    ]),
-                    h('a.navbar-brand', { href: '/index.html'}),
-                h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [  
-                    //h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), // Moved the FAQ
-                    h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
-                    h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
-                    h('a.nav-item.nav-link', { href: '/features.html'}, Msg.features),
-                    h('a.nav-item.nav-link', { href: '/privacy.html'}, Msg.privacy),
-                    h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
-                    h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
-                ].concat(rightLinks))
+        return h('nav.navbar.navbar-expand-lg',
+            h('a.navbar-brand', { href: '/index.html'}),
+            h('button.navbar-toggler', {
+                'type':'button',
+                'data-toggle':'collapse',
+                'data-target':'#menuCollapse',
+                'aria-controls': 'menuCollapse',
+                'aria-expanded':'false',
+                'aria-label':'Toggle navigation'
+            }, h('i.fa.fa-bars ')),
+            h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
+                //h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), // Moved the FAQ
+                h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
+                h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
+                h('a.nav-item.nav-link', { href: '/features.html'}, Msg.features),
+                h('a.nav-item.nav-link', { href: '/privacy.html'}, Msg.privacy),
+                h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
+                h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
+            ].concat(rightLinks))
         );
     };
 
@@ -144,10 +149,10 @@ define([
                     ]),
                 ]),
                 h('div.row.align-items-center',[
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6.cp-bio-avatar.cp-bio-avatar-right', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2.cp-bio-avatar.cp-bio-avatar-right', [
                             h('img.img-fluid', {'src': '/customize/images/AaronMacSween.jpg'})
                     ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6.cp-profile-det',[
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1.cp-profile-det',[
                         h('h3', "Aaron MacSween"),
                         h('hr'),
                         setHTML(h('div#bioAaron'), '<p>Aaron transitioned into distributed systems development from a background in jazz and live stage performance. <br/> He appreciates the elegance of biological systems and functional programming, and focused on both as a student at the University of Toronto, where he studied cognitive and computer sciences.<br/>He moved to Paris in 2015 to work as a research engineer at XWiki SAS, after having dedicated significant time to various cryptography-related software projects.<br/>He spends his spare time experimenting with guitars, photography, science fiction, and spicy food.</p>'),
@@ -195,10 +200,10 @@ define([
                     ]),
                 ]),
                 h('div.row.align-items-center',[
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6.cp-bio-avatar.cp-bio-avatar-right', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2.cp-bio-avatar.cp-bio-avatar-right', [
                             h('img.img-fluid', {'src': '/customize/images/Catalin.jpg'})
                     ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6.cp-profile-det',[
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1.cp-profile-det',[
                         h('h3', "Catalin Scripcariu"),
                         h('hr'),
                         setHTML(h('div#bioCatalin'), '<p> Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.<br/>At the beginning of 2017 he joined the XWiki, where he worked both on the business and the community side of XWiki, including the research team and CryptPad. </p>'),
@@ -504,13 +509,13 @@ define([
                     ]),
                 ]),
                 h('div.row.align-items-center', [
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-2', [
                         setHTML(h('h2'), Msg.whatis_zeroknowledge),
                         setHTML(h('p'), Msg.whatis_zeroknowledge_p1),
                         setHTML(h('p'), Msg.whatis_zeroknowledge_p2),
                         setHTML(h('p'), Msg.whatis_zeroknowledge_p3),
                     ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6', [
+                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-1', [
                         h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }),
                     ]),
                 ]),
diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 5525196bd..4fd0a5a1d 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -37,11 +37,11 @@
 
         .cp-creation-create, .cp-creation-settings {
             margin-top: 0px;
-            @creation-button: #FF0073;
+            @creation-button: #30B239;
             button {
                 .tools_unselectable();
                 padding: 15px;
-                background: #30b239;
+                background: @creation-button;
                 color: #FFF;
                 font-weight: bold;
                 margin: 3px 10px;
@@ -50,12 +50,20 @@
                 outline: none;
                 width: 100%;
                 &:hover {
-                    background: darken(@creation-button, 5%);
+                    //background: darken(@creation-button, 5%);
+                    background: lighten(@creation-button, 5%);
                 }
             }
         }
         .cp-creation-create {
             text-align: center;
+            margin: auto;
+            margin-top: 20px;
+            width: 400px;
+            max-width: 100%;
+            button {
+                margin: 0;
+            }
         }
 
         #cp-creation-form {
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index 3c3bdef5e..b07b90aa8 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -164,6 +164,7 @@
     }
     a {
         border: 2px solid transparent;
+        white-space: nowrap;
     }
     .nav-link {
         padding: 0.5em 0.7em;
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 3da5fb202..37e1cfb18 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -547,7 +547,7 @@ define(function () {
     out.settings_deleteButton = "Supprimer votre compte";
     out.settings_deleteModal = "Veuillez envoyer les informations suivantes à votre administrateur CryptPad afin que vos données soient supprimées du serveur.";
 
-    out.settings_anonymous = "Vous n'êtes pas connectés. Ces préférences seront utilisées pour ce navigateur.";
+    out.settings_anonymous = "Vous n'êtes pas connecté. Ces préférences seront utilisées pour ce navigateur.";
     out.settings_publicSigningKey = "Clé publique de signature";
 
     out.settings_usage = "Utilisation";
@@ -1033,7 +1033,7 @@ define(function () {
     out.readme_cat1 = "Découvrez votre CryptDrive";
     out.readme_cat1_l1 = "Créer un pad : Dans votre CryptDrive, cliquez sur {0} puis {1} et vous obtenez un nouveau pad."; // 0: New, 1: Rich Text
     out.readme_cat1_l2 = "Ouvrir des pads depuis votre CryptDrive : Double-cliquez sur l'icone d'un pad pour l'ouvrir.";
-    out.readme_cat1_l3 = "Organiser vos pads : Quand vous êtes connectés, tous les pads auquel vous accédez sont ajoutés dans la section {0} de votre CryptDrive."; // 0: Unsorted files
+    out.readme_cat1_l3 = "Organiser vos pads : Quand vous êtes connecté, tous les pads auquel vous accédez sont ajoutés dans la section {0} de votre CryptDrive."; // 0: Unsorted files
     out.readme_cat1_l3_l1 = "Vous pouvez cliquer et faire glisser des fichiers dans des dossiers dans la section {0} de votre CryptDrive, et créer de nouveaux dossiers."; // 0: Documents
     out.readme_cat1_l3_l2 = "N'hésitez pas à utiliser le clic droit sur les icones puisque des menus sont souvent disponibles.";
     out.readme_cat1_l4 = "Déplacer des pads vers la corbeille : Vous pouvez cliquer et faire glisser vos pads dans la {0} de la même manière que vous pouvez les déposer dans des dossiers."; // 0: Trash
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 778e7fb04..561d7af6a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1889,11 +1889,15 @@ define([
             ])
         ]);
 
+        var createDiv = h('div.cp-creation-create');
+        var $create = $(createDiv);
+
         var templates = h('div.cp-creation-template', [
             h('h3.cp-creation-title.'+colorClass, Messages['button_new'+type]),
             h('div.cp-creation-template-container', [
                 h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')
-            ])
+            ]),
+            createDiv
         ]);
 
         var settings = h('div.cp-creation-remember', [
@@ -1909,15 +1913,11 @@ define([
             h('div.cp-creation-remember-help.cp-creation-slider', Messages.creation_rememberHelp)
         ]);
 
-        var createDiv = h('div.cp-creation-create');
-        var $create = $(createDiv);
-
         $(h('div#cp-creation-form', [
             owned,
             expire,
             settings,
-            templates,
-            createDiv
+            templates
         ])).appendTo($creation);
 
         // Display templates

From bc3fe4f32cc9abf2e78c0010d0339e3e8add4a87 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Mar 2018 11:14:55 +0100
Subject: [PATCH 27/33] update version in footer and package.json

---
 customize.dist/pages.js | 2 +-
 package.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index e8f8c877c..4cd4f49f4 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -72,7 +72,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v1.27.0 (null)")
+            h('div.cp-version-footer', "CryptPad v1.28.0 (toString)")
         ]);
     };
 
diff --git a/package.json b/package.json
index e94c51a14..81814548c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.27.0",
+  "version": "1.28.0",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "chainpad-server": "^2.0.0",

From ed8f9e4e3f652596239364705472a69d6dee4b90 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Mar 2018 11:15:44 +0100
Subject: [PATCH 28/33] remove XXX after review

---
 rpc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpc.js b/rpc.js
index 9cdb440f3..163d745cf 100644
--- a/rpc.js
+++ b/rpc.js
@@ -1043,7 +1043,7 @@ var owned_upload_complete = function (Env, safeKey, cb) {
         Mkdirp(plannedPath, w(function (e /*, path */) {
             if (e) { // does not throw error if the directory already existed
                 w.abort();
-                return void cb(e); // XXX do we export Errors or strings?
+                return void cb(e);
             }
         }));
     }).nThen(function (w) {

From 7c072aeccb3f35c8280689f58397eb1d56dd60ab Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Mar 2018 11:16:18 +0100
Subject: [PATCH 29/33] add remove-pins rpc

---
 rpc.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/rpc.js b/rpc.js
index 163d745cf..ae4971ae0 100644
--- a/rpc.js
+++ b/rpc.js
@@ -837,6 +837,17 @@ var removeOwnedChannel = function (Env, channelId, unsafeKey, cb) {
     });
 };
 
+/*  Users should be able to clear their own pin log with an authenticated RPC
+*/
+var removePins = function (Env, safeKey, cb) {
+    if (typeof(Env.pinStore.removeChannel) !== 'function') {
+        return void cb("E_NOT_IMPLEMENTED");
+    }
+    Env.pinStore.removeChannel(safeKey, function (err) {
+        cb(err);
+    });
+};
+
 var upload = function (Env, publicKey, content, cb) {
     var paths = Env.paths;
     var dec;
@@ -1153,6 +1164,7 @@ var isAuthenticatedCall = function (call) {
         'EXPIRE_SESSION',
         'CLEAR_OWNED_CHANNEL',
         'REMOVE_OWNED_CHANNEL',
+        'REMOVE_PINS',
     ].indexOf(call) !== -1;
 };
 
@@ -1445,6 +1457,11 @@ RPC.create = function (
                     if (e) { return void Respond(e); }
                     Respond(void 0, "OK");
                 });
+            case 'REMOVE_PINS':
+                return void removePins(Env, safeKey, function (e, response) {
+                    if (e) { return void Respond(e); }
+                    Respond(void 0, response);
+                });
             // restricted to privileged users...
             case 'UPLOAD':
                 if (!privileged) { return deny(); }

From 8230c471cd194974609853981eee4835144486d1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Mar 2018 11:31:37 +0100
Subject: [PATCH 30/33] add npm dependency for sortify

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 81814548c..7f19ca955 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "pull-stream": "^3.6.1",
     "replify": "^1.2.0",
     "saferphore": "0.0.1",
+    "sortify": "^1.0.4",
     "stream-to-pull-stream": "^1.7.2",
     "tweetnacl": "~0.12.2",
     "ws": "^1.0.1"

From c3f7b74baf3f4d883096e086502c091ea02a1c82 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Mar 2018 15:07:20 +0100
Subject: [PATCH 31/33] Fix CkEditor's toolbar initial state

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

diff --git a/www/pad/inner.js b/www/pad/inner.js
index 3f8f5c995..17bd2df3a 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -280,7 +280,8 @@ define([
             framework._.sfCommon.setAttribute(['pad', 'showToolbar'], visible);
         };
         framework._.sfCommon.getAttribute(['pad', 'showToolbar'], function (err, data) {
-            if ($(window).height() >= 800 && (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); }
+            if (($(window).height() >= 800  || $(window).width >= 800) &&
+                (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); }
             else { $('.cke_toolbox_main').hide(); }
             var $collapse = framework._.sfCommon.createButton('toggle', true, cfg, onClick);
             framework._.toolbar.$rightside.append($collapse);

From 01dd6953b91cbc1d32d809a8edf714bf1a103148 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Mar 2018 15:13:00 +0100
Subject: [PATCH 32/33] Fix the previous fix...

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

diff --git a/www/pad/inner.js b/www/pad/inner.js
index 17bd2df3a..250a39765 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -280,7 +280,7 @@ define([
             framework._.sfCommon.setAttribute(['pad', 'showToolbar'], visible);
         };
         framework._.sfCommon.getAttribute(['pad', 'showToolbar'], function (err, data) {
-            if (($(window).height() >= 800  || $(window).width >= 800) &&
+            if (($(window).height() >= 800  || $(window).width() >= 800) &&
                 (typeof(data) === "undefined" || data)) { $('.cke_toolbox_main').show(); }
             else { $('.cke_toolbox_main').hide(); }
             var $collapse = framework._.sfCommon.createButton('toggle', true, cfg, onClick);

From faaff60f74db84b9277b7ae9cb2ba460ede48f3e Mon Sep 17 00:00:00 2001
From: sairim <35785003+sairim@users.noreply.github.com>
Date: Tue, 20 Mar 2018 18:16:29 +0200
Subject: [PATCH 33/33] Fix broken FAQ link

Add a forward slash before faq.html... for the expiring pads FAQ link.
---
 www/common/common-ui-elements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 561d7af6a..8b282813c 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1870,7 +1870,7 @@ define([
                 h('span.cp-checkmark-mark'),
                 Messages.creation_expire
             ]),
-            createHelper('faq.html#keywords-expiring', Messages.creation_expire2),
+            createHelper('/faq.html#keywords-expiring', Messages.creation_expire2),
             h('div.cp-creation-expire-picker.cp-creation-slider', [
                 h('input#cp-creation-expire-val', {
                     type: "number",