Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-06-22 15:52:31 +02:00
parent 13288ee18b 852c028822
commit a11befaa0f
44 changed files with 1095 additions and 1458 deletions
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -174,7 +174,7 @@ define([
                var titleCfg = { getHeadingText: CodeMirror.getHeadingText };
                Title = Cryptpad.createTitle(titleCfg, config.onLocal, Cryptpad);

-                Metadata = Cryptpad.createMetadata(UserList, Title);
+                Metadata = Cryptpad.createMetadata(UserList, Title, null, Cryptpad);

                var configTb = {
                    displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],
@@ -310,7 +310,8 @@ define([
                if(userDoc !== "") {
                    var hjson = JSON.parse(userDoc);

-                    if (typeof (hjson) !== 'object' || Array.isArray(hjson)) {
+                    if (typeof (hjson) !== 'object' || Array.isArray(hjson) ||
+                        (typeof(hjson.type) !== 'undefined' && hjson.type !== 'code')) {
                        var errorText = Messages.typeError;
                        Cryptpad.errorLoadingScreen(errorText);
                        throw new Error(errorText);
--- a/www/common/LessLoader.js
+++ b/www/common/LessLoader.js
@@ -0,0 +1,64 @@
+/*@flow*/
+/*:: const define = () => {}; */
+define([
+    '/api/config',
+    '/bower_components/less/dist/less.js'
+], function (Config, Less) { /*::});module.exports = (function() {
+    const Config = (undefined:any);
+    const Less = (undefined:any);
+    */
+
+    var module = { exports: {} };
+    var key = Config.requireConf.urlArgs;
+    var localStorage = window.localStorage || {};
+
+    var fixURL = function (url) {
+        var mark = (url.indexOf('?') !== -1) ? '&' : '?';
+        return url + mark + key;
+    };
+
+    var doXHR = Less.FileManager.prototype.doXHR;
+    Less.FileManager.prototype.doXHR = function (url, type, callback, errback) {
+        url = fixURL(url);
+        //console.log("xhr: " + url);
+        return doXHR(url, type, callback, errback);
+    };
+
+    var inject = function (cssText, url) {
+        var curStyle = document.createElement('style');
+        curStyle.setAttribute('data-original-src', url);
+        curStyle.type = 'text/css';
+        curStyle.appendChild(document.createTextNode(cssText));
+        if (!document.head) { throw new Error(); }
+        document.head.appendChild(curStyle);
+    };
+
+    var checkCache = function () {
+        if (localStorage['LESS_CACHE'] === key) { return; }
+        Object.keys(localStorage).forEach(function (k) {
+            if (k.indexOf('LESS_CACHE|') !== 0) { return; }
+            delete localStorage[k];
+        });
+        localStorage['LESS_CACHE'] = key;
+    };
+
+    module.exports.load = function (url /*:string*/, cb /*:()=>void*/) {
+        checkCache();
+        if (localStorage['LESS_CACHE|' + key + '|' + url]) {
+            inject(localStorage['LESS_CACHE|' + key + '|' + url], url);
+            cb();
+            return;
+        }
+        Less.render('@import (multiple) "' + url + '";', {}, function(err, css) {
+            if (err) {
+                console.log(err);
+                return;
+            }
+            localStorage['LESS_CACHE|' + key + '|' + url] = css.css;
+            inject(css.css, url);
+            cb();
+        }, window.less);
+    };
+
+    return module.exports;
+})/*::()*/;
--- a/www/common/RequireLess.js
+++ b/www/common/RequireLess.js
@@ -0,0 +1,12 @@
+define([
+    '/common/LessLoader.js'
+], function (LessLoader) {
+    var api = {};
+    api.normalize = function(name, normalize) {
+        return normalize(name);
+    };
+    api.load = function(cssId, req, load /*, config */) {
+        LessLoader.load(cssId, load);
+    };
+    return api;
+});
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -8,8 +8,14 @@ define([], function () {
            "jquery": "/bower_components/jquery/dist/jquery.min",
            // json.sortify same
            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify",
-            "pdfjs-dist/build/pdf": "/bower_components/pdfjs-dist/build/pdf",
-            "pdfjs-dist/build/pdf.worker": "/bower_components/pdfjs-dist/build/pdf.worker"
+            //"pdfjs-dist/build/pdf": "/bower_components/pdfjs-dist/build/pdf",
+            //"pdfjs-dist/build/pdf.worker": "/bower_components/pdfjs-dist/build/pdf.worker"
+        },
+        map: {
+            '*': {
+                'css': '/bower_components/require-css/css.js',
+                'less': '/common/RequireLess.js',
+            }
        }
    });

--- a/www/common/common-metadata.js
+++ b/www/common/common-metadata.js
@@ -1,7 +1,7 @@
 define(function () {
    var module = {};

-    module.create = function (UserList, Title, cfg) {
+    module.create = function (UserList, Title, cfg, Cryptpad) {
        var exp = {};

        exp.update = function (shjson) {
@@ -15,6 +15,14 @@ define(function () {
                metadata = json.metadata;
            }
            if (typeof metadata === "object") {
+                if (Cryptpad) {
+                    if (typeof(metadata.type) === 'undefined') {
+                        // initialize pad type by location.pathname
+                        metadata.type = Cryptpad.getAppType();
+                    }
+                } else {
+                    console.log("Cryptpad should exist but it does not");
+                }
                if (metadata.users) {
                    var userData = metadata.users;
                    // Update the local user data
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -139,5 +139,12 @@ define([], function () {
        return Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
    };

+    Util.getAppType = function () {
+        var parts = window.location.pathname.split('/')
+            .filter(function (x) { return x; });
+        if (!parts[0]) { return ''; }
+        return parts[0];
+    };
+
    return Util;
 });
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -83,6 +83,7 @@ define([
    common.fetch = Util.fetch;
    common.throttle = Util.throttle;
    common.createRandomInteger = Util.createRandomInteger;
+    common.getAppType = Util.getAppType;

    // import hash utilities for export
    var createRandomHash = common.createRandomHash = Hash.createRandomHash;
@@ -906,18 +907,12 @@ define([
        common.getPinnedUsage(todo);
    };

-    var getAppSuffix = function () {
-        var parts = window.location.pathname.split('/')
-            .filter(function (x) { return x; });
-
-        if (!parts[0]) { return ''; }
-        return '_' + parts[0].toUpperCase();
-    };
-
    var prepareFeedback = common.prepareFeedback = function (key) {
        if (typeof(key) !== 'string') { return $.noop; }
+
+        var type = common.getAppType();
        return function () {
-            feedback(key.toUpperCase() + getAppSuffix());
+            feedback((key + (type? '_' + type: '')).toUpperCase());
        };
    };

--- a/www/common/hyperscript.js
+++ b/www/common/hyperscript.js
@@ -0,0 +1,398 @@
+define([], function () {
+    var Hyperscript;
+
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+var split = require('browser-split')
+var ClassList = require('class-list')
+require('html-element')
+
+function context () {
+
+  var cleanupFuncs = []
+
+  function h() {
+    var args = [].slice.call(arguments), e = null
+    function item (l) {
+      var r
+      function parseClass (string) {
+        // Our minimal parser doesn’t understand escaping CSS special
+        // characters like `#`. Don’t use them. More reading:
+        // https://mathiasbynens.be/notes/css-escapes .
+
+        var m = split(string, /([\.#]?[^\s#.]+)/)
+        if(/^\.|#/.test(m[1]))
+          e = document.createElement('div')
+        forEach(m, function (v) {
+          var s = v.substring(1,v.length)
+          if(!v) return
+          if(!e)
+            e = document.createElement(v)
+          else if (v[0] === '.')
+            ClassList(e).add(s)
+          else if (v[0] === '#')
+            e.setAttribute('id', s)
+        })
+      }
+
+      if(l == null)
+        ;
+      else if('string' === typeof l) {
+        if(!e)
+          parseClass(l)
+        else
+          e.appendChild(r = document.createTextNode(l))
+      }
+      else if('number' === typeof l
+        || 'boolean' === typeof l
+        || l instanceof Date
+        || l instanceof RegExp ) {
+          e.appendChild(r = document.createTextNode(l.toString()))
+      }
+      //there might be a better way to handle this...
+      else if (isArray(l))
+        forEach(l, item)
+      else if(isNode(l))
+        e.appendChild(r = l)
+      else if(l instanceof Text)
+        e.appendChild(r = l)
+      else if ('object' === typeof l) {
+        for (var k in l) {
+          if (!l.hasOwnProperty(k)) { return; }
+          if('function' === typeof l[k]) {
+            if(/^on\w+/.test(k)) {
+              (function (k, l) { // capture k, l in the closure
+                if (e.addEventListener){
+                  e.addEventListener(k.substring(2), l[k], false)
+                  cleanupFuncs.push(function(){
+                    e.removeEventListener(k.substring(2), l[k], false)
+                  })
+                }else{
+                  e.attachEvent(k, l[k])
+                  cleanupFuncs.push(function(){
+                    e.detachEvent(k, l[k])
+                  })
+                }
+              })(k, l)
+            } else {
+              // observable
+              e[k] = l[k]()
+              cleanupFuncs.push(l[k](function (v) {
+                e[k] = v
+              }))
+            }
+          }
+          else if(k === 'style') {
+            if('string' === typeof l[k]) {
+              e.style.cssText = l[k]
+            }else{
+              for (var s in l[k]) (function(s, v) {
+                if('function' === typeof v) {
+                  // observable
+                  e.style.setProperty(s, v())
+                  cleanupFuncs.push(v(function (val) {
+                    e.style.setProperty(s, val)
+                  }))
+                } else
+                  e.style.setProperty(s, l[k][s])
+              })(s, l[k][s])
+            }
+          } else if (k.substr(0, 5) === "data-") {
+            e.setAttribute(k, l[k])
+          } else {
+            e[k] = l[k]
+          }
+        }
+      } else if ('function' === typeof l) {
+        //assume it's an observable!
+        var v = l()
+        e.appendChild(r = isNode(v) ? v : document.createTextNode(v))
+
+        cleanupFuncs.push(l(function (v) {
+          if(isNode(v) && r.parentElement)
+            r.parentElement.replaceChild(v, r), r = v
+          else
+            r.textContent = v
+        }))
+      }
+
+      return r
+    }
+    while(args.length)
+      item(args.shift())
+
+    return e
+  }
+
+  h.cleanup = function () {
+    for (var i = 0; i < cleanupFuncs.length; i++){
+      cleanupFuncs[i]()
+    }
+    cleanupFuncs.length = 0
+  }
+
+  return h
+}
+
+var h = module.exports = context()
+h.context = context
+
+Hyperscript = h;
+
+function isNode (el) {
+  return el && el.nodeName && el.nodeType
+}
+
+function forEach (arr, fn) {
+  if (arr.forEach) return arr.forEach(fn)
+  for (var i = 0; i < arr.length; i++) fn(arr[i], i)
+}
+
+function isArray (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]'
+}
+
+},{"browser-split":2,"class-list":3,"html-element":6}],2:[function(require,module,exports){
+/*!
+ * Cross-Browser Split 1.1.1
+ * Copyright 2007-2012 Steven Levithan <stevenlevithan.com>
+ * Available under the MIT License
+ * ECMAScript compliant, uniform cross-browser split method
+ */
+
+/**
+ * Splits a string into an array of strings using a regex or string separator. Matches of the
+ * separator are not included in the result array. However, if `separator` is a regex that contains
+ * capturing groups, backreferences are spliced into the result each time `separator` is matched.
+ * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably
+ * cross-browser.
+ * @param {String} str String to split.
+ * @param {RegExp|String} separator Regex or string to use for separating the string.
+ * @param {Number} [limit] Maximum number of items to include in the result array.
+ * @returns {Array} Array of substrings.
+ * @example
+ *
+ * // Basic use
+ * split('a b c d', ' ');
+ * // -> ['a', 'b', 'c', 'd']
+ *
+ * // With limit
+ * split('a b c d', ' ', 2);
+ * // -> ['a', 'b']
+ *
+ * // Backreferences in result array
+ * split('..word1 word2..', /([a-z]+)(\d+)/i);
+ * // -> ['..', 'word', '1', ' ', 'word', '2', '..']
+ */
+module.exports = (function split(undef) {
+
+  var nativeSplit = String.prototype.split,
+    compliantExecNpcg = /()??/.exec("")[1] === undef,
+    // NPCG: nonparticipating capturing group
+    self;
+
+  self = function(str, separator, limit) {
+    // If `separator` is not a regex, use `nativeSplit`
+    if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
+      return nativeSplit.call(str, separator, limit);
+    }
+    var output = [],
+      flags = (separator.ignoreCase ? "i" : "") + (separator.multiline ? "m" : "") + (separator.extended ? "x" : "") + // Proposed for ES6
+      (separator.sticky ? "y" : ""),
+      // Firefox 3+
+      lastLastIndex = 0,
+      // Make `global` and avoid `lastIndex` issues by working with a copy
+      separator = new RegExp(separator.source, flags + "g"),
+      separator2, match, lastIndex, lastLength;
+    str += ""; // Type-convert
+    if (!compliantExecNpcg) {
+      // Doesn't need flags gy, but they don't hurt
+      separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
+    }
+    /* Values for `limit`, per the spec:
+     * If undefined: 4294967295 // Math.pow(2, 32) - 1
+     * If 0, Infinity, or NaN: 0
+     * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
+     * If negative number: 4294967296 - Math.floor(Math.abs(limit))
+     * If other: Type-convert, then use the above rules
+     */
+    limit = limit === undef ? -1 >>> 0 : // Math.pow(2, 32) - 1
+    limit >>> 0; // ToUint32(limit)
+    while (match = separator.exec(str)) {
+      // `separator.lastIndex` is not reliable cross-browser
+      lastIndex = match.index + match[0].length;
+      if (lastIndex > lastLastIndex) {
+        output.push(str.slice(lastLastIndex, match.index));
+        // Fix browsers whose `exec` methods don't consistently return `undefined` for
+        // nonparticipating capturing groups
+        if (!compliantExecNpcg && match.length > 1) {
+          match[0].replace(separator2, function() {
+            for (var i = 1; i < arguments.length - 2; i++) {
+              if (arguments[i] === undef) {
+                match[i] = undef;
+              }
+            }
+          });
+        }
+        if (match.length > 1 && match.index < str.length) {
+          Array.prototype.push.apply(output, match.slice(1));
+        }
+        lastLength = match[0].length;
+        lastLastIndex = lastIndex;
+        if (output.length >= limit) {
+          break;
+        }
+      }
+      if (separator.lastIndex === match.index) {
+        separator.lastIndex++; // Avoid an infinite loop
+      }
+    }
+    if (lastLastIndex === str.length) {
+      if (lastLength || !separator.test("")) {
+        output.push("");
+      }
+    } else {
+      output.push(str.slice(lastLastIndex));
+    }
+    return output.length > limit ? output.slice(0, limit) : output;
+  };
+
+  return self;
+})();
+
+},{}],3:[function(require,module,exports){
+// contains, add, remove, toggle
+var indexof = require('indexof')
+
+module.exports = ClassList
+
+function ClassList(elem) {
+    var cl = elem.classList
+
+    if (cl) {
+        return cl
+    }
+
+    var classList = {
+        add: add
+        , remove: remove
+        , contains: contains
+        , toggle: toggle
+        , toString: $toString
+        , length: 0
+        , item: item
+    }
+
+    return classList
+
+    function add(token) {
+        var list = getTokens()
+        if (indexof(list, token) > -1) {
+            return
+        }
+        list.push(token)
+        setTokens(list)
+    }
+
+    function remove(token) {
+        var list = getTokens()
+            , index = indexof(list, token)
+
+        if (index === -1) {
+            return
+        }
+
+        list.splice(index, 1)
+        setTokens(list)
+    }
+
+    function contains(token) {
+        return indexof(getTokens(), token) > -1
+    }
+
+    function toggle(token) {
+        if (contains(token)) {
+            remove(token)
+            return false
+        } else {
+            add(token)
+            return true
+        }
+    }
+
+    function $toString() {
+        return elem.className
+    }
+
+    function item(index) {
+        var tokens = getTokens()
+        return tokens[index] || null
+    }
+
+    function getTokens() {
+        var className = elem.className
+
+        return filter(className.split(" "), isTruthy)
+    }
+
+    function setTokens(list) {
+        var length = list.length
+
+        elem.className = list.join(" ")
+        classList.length = length
+
+        for (var i = 0; i < list.length; i++) {
+            classList[i] = list[i]
+        }
+
+        delete list[length]
+    }
+}
+
+function filter (arr, fn) {
+    var ret = []
+    for (var i = 0; i < arr.length; i++) {
+        if (fn(arr[i])) ret.push(arr[i])
+    }
+    return ret
+}
+
+function isTruthy(value) {
+    return !!value
+}
+
+},{"indexof":4}],4:[function(require,module,exports){
+
+var indexOf = [].indexOf;
+
+module.exports = function(arr, obj){
+  if (indexOf) return arr.indexOf(obj);
+  for (var i = 0; i < arr.length; ++i) {
+    if (arr[i] === obj) return i;
+  }
+  return -1;
+};
+},{}],5:[function(require,module,exports){
+var h = require("./index.js");
+
+module.exports = h;
+
+/*
+$(function () {
+
+    var newDoc = h('p',
+
+        h('ul', 'bang bang bang'.split(/\s/).map(function (word) {
+            return h('li', word);
+        }))
+    );
+    $('body').html(newDoc.outerHTML);
+});
+
+*/
+
+},{"./index.js":1}],6:[function(require,module,exports){
+
+},{}]},{},[5]);
+
+    return Hyperscript;
+});
--- a/www/login/index.html
+++ b/www/login/index.html
@@ -1,76 +1,16 @@
 <!DOCTYPE html>
 <html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Log in</title>
+    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
-    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
-    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
 <body class="html">
-    <div id="cryptpadTopBar">
-    <span>
-        <a class="gotoMain" href="/">
-            <img src="/customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
-        </a>
-    </span>
-
-    <span id="user-menu" class="right dropdown-bar"></span>
-    <span id="language-selector" class="right dropdown-bar"></span>
-    <span class="right">
-        <a href="/about.html" data-localization="about">About</a>
-    </span>
-    <span class="right">
-        <a href="/privacy.html" data-localization="privacy">Privacy</a>
-    </span>
-    <span class="right">
-        <a href="/terms.html" data-localization="terms">ToS</a>
-    </span>
-    <span class="right">
-        <a href="/contact.html" data-localization="contact">Contact</a>
-    </span>
-</div>
    <noscript>
-        <div id="noscriptContainer">
-            <div class="mainOverlay"></div>
-            <div id="noscript">
-              <p>
-                <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-              </p>
-              <hr>
-              <p>
-                <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-              </p>
-            </div>
-        </div>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
    </noscript>
-
-    <div id="mainBlock" class="hidden">
-
-<div id="main">
-    <div class="mainOverlay"></div>
-    <div id="align-container">
-    <div id="main-container">
-        <div id="data" class="hidden">
-            <p class="left" data-localization="main_info"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
-        </div>
-
-        <div id="userForm" class="form-group hidden">
-            <input type="text" id="name" name="name" class="form-control" data-localization-placeholder="login_username" autofocus>
-            <input type="password" id="password" name="password" class="form-control" data-localization-placeholder="login_password">
-            <button class="btn btn-primary login first" data-localization="login_login"></button>
-            <div class="extra">
-                <p data-localization="login_notRegistered"></p>
-                <button id="register" class="btn btn-success register first" data-localization="login_register"></button>
-            </div>
-        </div>
-    </div>
-    </div>
-</div>
-    </div>
-
-</body>
 </html>
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -307,7 +307,8 @@ define([
                hjson[3] = {
                    metadata: {
                        users: UserList.userData,
-                        defaultTitle: Title.defaultTitle
+                        defaultTitle: Title.defaultTitle,
+                        type: 'pad'
                    }
                };
                if (!initializing) {
@@ -451,7 +452,7 @@ define([
                var titleCfg = { getHeadingText: getHeadingText };
                Title = Cryptpad.createTitle(titleCfg, realtimeOptions.onLocal, Cryptpad);

-                Metadata = Cryptpad.createMetadata(UserList, Title);
+                Metadata = Cryptpad.createMetadata(UserList, Title, null, Cryptpad);

                var configTb = {
                    displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -430,6 +430,7 @@ define([
        });

        proxy.version = 1;
+        proxy.type = 'poll';
    };

    /*
@@ -475,6 +476,16 @@ var ready = function (info, userid, readOnly) {
    var userDoc = JSON.stringify(proxy);
    if (userDoc === "" || userDoc === "{}") { isNew = true; }

+    if (!isNew && typeof(proxy.type) !== 'undefined' && proxy.type !== 'poll') {
+        var errorText = Messages.typeError;
+        Cryptpad.errorLoadingScreen(errorText);
+        throw new Error(errorText);
+    }
+
+    if (typeof(proxy.type) === 'undefined') {
+        proxy.type = 'poll';
+    }
+
    var uncommitted = APP.uncommitted = {};
    prepareProxy(proxy, copyObject(Render.Example));
    prepareProxy(uncommitted, copyObject(Render.Example));
--- a/www/register/index.html
+++ b/www/register/index.html
@@ -1,83 +1,16 @@
 <!DOCTYPE html>
 <html class="cp">
+<!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
+    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Cryptpad: login</title>
-    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
-    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
-    <link rel="stylesheet" href="/customize/main.css" />
-    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
 <body class="html">
-    <div id="cryptpadTopBar">
-    <span>
-        <a class="gotoMain" href="/">
-            <img src="/customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
-        </a>
-    </span>
-
-    <span id="user-menu" class="right dropdown-bar"></span>
-    <span id="language-selector" class="right dropdown-bar"></span>
-    <span class="right">
-        <a href="/about.html" data-localization="about">About</a>
-    </span>
-    <span class="right">
-        <a href="/privacy.html" data-localization="privacy">Privacy</a>
-    </span>
-    <span class="right">
-        <a href="/terms.html" data-localization="terms">ToS</a>
-    </span>
-    <span class="right">
-        <a href="/contact.html" data-localization="contact">Contact</a>
-    </span>
-</div>
    <noscript>
-        <div id="noscriptContainer">
-            <div class="mainOverlay"></div>
-            <div id="noscript">
-              <p>
-                <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-              </p>
-              <hr>
-              <p>
-                <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-              </p>
-            </div>
-        </div>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
    </noscript>
-
-    <div id="mainBlock" class="hidden">
-
-<div id="main">
-    <div class="mainOverlay"></div>
-    <div id="align-container">
-    <div id="main-container">
-        <div id="data" class="hidden">
-            <h1 data-localization="register_header"></h1><br />
-            <p class="left register-explanation" data-localization="register_explanation"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
-        </div>
-
-        <div id="userForm" class="form-group hidden">
-            <input class="form-control" id="username" type="text" autocomplete="off" autocorrect="off"
-                autocapitalize="off" spellcheck="false" data-localization-placeholder="login_username" autofocus/>
-            <input class="form-control" id="password" type="password" data-localization-placeholder="login_password"/>
-            <input class="form-control" id="password-confirm" type="password" data-localization-placeholder="login_confirm"/>
-
-
-            <!-- TODO translate labels -->
-                <input id="import-recent" type="checkbox" checked />
-                <label for="import-recent" data-localization="register_importRecent"></label><br />
-
-                <input id="accept-terms" type="checkbox" />
-                <label for="accept-terms" data-localization="register_acceptTerms"></label><br />
-
-                <button id="register" class="btn btn-primary" data-localization="login_register"></button>
-        </div>
-    </div>
-    </div>
-</div>
-    </div>
-
-</body>
 </html>
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -5,111 +5,12 @@
    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
-    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="main.css" />
-    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
-
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
 <body class="html">
-    <div id="cryptpadTopBar">
-    <span>
-        <a class="gotoMain" href="/">
-            <img src="/customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
-        </a>
-    </span>
-
-    <!--<span class="slogan" data-localization="main_slogan"></span>-->
-
-    <span id="user-menu" class="right dropdown-bar"></span>
-    <span id="language-selector" class="right dropdown-bar"></span>
-    <span class="link right">
-        <a href="/about.html" data-localization="about">About</a>
-    </span>
-    <span class="link right">
-        <a href="/privacy.html" data-localization="privacy">Privacy</a>
-    </span>
-    <span class="link right">
-        <a href="/terms.html" data-localization="terms">ToS</a>
-    </span>
-    <span class="link right">
-        <a href="/contact.html" data-localization="contact">Contact</a>
-    </span>
-    <span class="link right">
-        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
-    </span>
-    <span class="link right">
-        <button id="upgrade" class="upgrade btn buttonSuccess" style="display: none;"></button>
-    </span>
-</div>
-
-
    <noscript>
-    <div id="noscriptContainer">
-        <div class="mainOverlay"></div>
-        <div id="noscript">
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-          </p>
-        </div>
-    </div>
-</noscript>
-
-
-    <div id="mainBlock" class="hidden">
-        <div id="container"></div>
-
-    </div>
-
-        <footer>
-        <div class="container">
-            <div class="row">
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title">CryptPad</li>
-                            <li><a href="/about.html" data-localization="about"></a></li>
-                            <li><a href="/terms.html" data-localization="terms"></a></li>
-                            <li><a href="/privacy.html" data-localization="privacy"></a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_applications"><li>
-                            <li><a href="/pad/" data-localization="main_richText"></a></li>
-                            <li><a href="/code/" data-localization="main_code"></a></li>
-                            <li><a href="/slide/" data-localization="main_slide"></a></li>
-                            <li><a href="/poll/" data-localization="main_poll"></a></li>
-                            <li><a href="/drive/" data-localization="main_drive"></a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_aboutUs"><li>
-                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
-                            <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
-                            <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
-                            <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
-                            <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
-                            <li><a href="/contact.html">Email</a></li>
-                        </ul>
-                    </div>
-            </div>
-        </div>
-        <div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
-    </footer>
-
-</body>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -5,6 +5,11 @@ define([
    '/common/mergeDrive.js',
    '/bower_components/file-saver/FileSaver.min.js',
    '/customize/header.js',
+
+    'css!/customize/main.css',
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'css!/settings/main.css',
 ], function ($, Cryptpad, Crypt, Merge) {
    var saveAs = window.saveAs;

--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -344,7 +344,7 @@ define([
                };
                Title = Cryptpad.createTitle(titleCfg, config.onLocal, Cryptpad);

-                Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg);
+                Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg, Cryptpad);

                var configTb = {
                    displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],
@@ -559,7 +559,8 @@ define([
                    var hjson = JSON.parse(userDoc);
                    newDoc = hjson.content;

-                    if (typeof (hjson) !== 'object' || Array.isArray(hjson)) {
+                    if (typeof (hjson) !== 'object' || Array.isArray(hjson) ||
+                        (typeof(hjson.type) !== 'undefined' && hjson.type !== 'slide')) {
                        var errorText = Messages.typeError;
                        Cryptpad.errorLoadingScreen(errorText);
                        throw new Error(errorText);
--- a/www/user/index.html
+++ b/www/user/index.html
@@ -5,111 +5,12 @@
    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
-    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
-    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="main.css" />
-    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
-
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
 </head>
 <body class="html">
-    <div id="cryptpadTopBar">
-    <span>
-        <a class="gotoMain" href="/">
-            <img src="/customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
-        </a>
-    </span>
-
-    <!--<span class="slogan" data-localization="main_slogan"></span>-->
-
-    <span id="user-menu" class="right dropdown-bar"></span>
-    <span id="language-selector" class="right dropdown-bar"></span>
-    <span class="link right">
-        <a href="/about.html" data-localization="about">About</a>
-    </span>
-    <span class="link right">
-        <a href="/privacy.html" data-localization="privacy">Privacy</a>
-    </span>
-    <span class="link right">
-        <a href="/terms.html" data-localization="terms">ToS</a>
-    </span>
-    <span class="link right">
-        <a href="/contact.html" data-localization="contact">Contact</a>
-    </span>
-    <span class="link right">
-        <a href="https://blog.cryptpad.fr/" data-localization="blog">Blog</a>
-    </span>
-    <span class="link right">
-        <button id="upgrade" class="upgrade btn buttonSuccess" style="display: none;"></button>
-    </span>
-</div>
-
-
    <noscript>
-    <div id="noscriptContainer">
-        <div class="mainOverlay"></div>
-        <div id="noscript">
-          <p>
-            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
-          </p>
-          <hr>
-          <p>
-            <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
-          </p>
-        </div>
-    </div>
-</noscript>
-
-
-    <div id="mainBlock" class="hidden">
-        <div id="container"></div>
-
-    </div>
-
-        <footer>
-        <div class="container">
-            <div class="row">
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title">CryptPad</li>
-                            <li><a href="/about.html" data-localization="about"></a></li>
-                            <li><a href="/terms.html" data-localization="terms"></a></li>
-                            <li><a href="/privacy.html" data-localization="privacy"></a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_applications"><li>
-                            <li><a href="/pad/" data-localization="main_richText"></a></li>
-                            <li><a href="/code/" data-localization="main_code"></a></li>
-                            <li><a href="/slide/" data-localization="main_slide"></a></li>
-                            <li><a href="/poll/" data-localization="main_poll"></a></li>
-                            <li><a href="/drive/" data-localization="main_drive"></a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_aboutUs"><li>
-                            <li><a href="https://blog.cryptpad.fr" target="_blank" data-localization="blog" rel="noopener noreferrer">Blog</a></li>
-                            <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
-                            <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.open-paas.org/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
-                        </ul>
-                    </div>
-                    <div class="col">
-                        <ul class="list-unstyled">
-                            <li class="title" data-localization="footer_contact"><li>
-                            <li><a href="https://riot.im/app/#/room/#cryptpad:matrix.org" target="_blank" rel="noopener noreferrer">Chat</a></li>
-                            <li><a href="https://twitter.com/cryptpad" target="_blank" rel="noopener noreferrer">Twitter</a></li>
-                            <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
-                            <li><a href="/contact.html">Email</a></li>
-                        </ul>
-                    </div>
-            </div>
-        </div>
-        <div class="version-footer">CryptPad v1.9.0 (Jackelope)</div>
-    </footer>
-
-</body>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
 </html>
--- a/www/user/main.js
+++ b/www/user/main.js
@@ -1,6 +1,7 @@
 define([
    'jquery',
    '/common/cryptpad-common.js',
+    'css!/user/main.css',
 ], function ($, Cryptpad) {

    var APP = window.APP = {
--- a/www/whiteboard/main.js
+++ b/www/whiteboard/main.js
@@ -293,7 +293,7 @@ window.canvas = canvas;

            Title = Cryptpad.createTitle({}, config.onLocal, Cryptpad);

-            Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg);
+            Metadata = Cryptpad.createMetadata(UserList, Title, metadataCfg, Cryptpad);

            var configTb = {
                displayed: ['title', 'useradmin', 'spinner', 'lag', 'state', 'share', 'userlist', 'newpad', 'limit', 'upgrade'],
@@ -384,7 +384,8 @@ window.canvas = canvas;
                metadata: {
                    users: UserList.userData,
                    palette: palette,
-                    defaultTitle: Title.defaultTitle
+                    defaultTitle: Title.defaultTitle,
+                    type: 'whiteboard',
                }
            };
            if (!initializing) {
@@ -413,6 +414,14 @@ window.canvas = canvas;
            var isNew = false;
            var userDoc = module.realtime.getUserDoc();
            if (userDoc === "" || userDoc === "{}") { isNew = true; }
+            else {
+                var hjson = JSON.parse(userDoc);
+                if (typeof(hjson) !== 'object' || Array.isArray(hjson) ||
+                    (typeof(hjson.type) !== 'undefined' && hjson.type !== whiteboard)) {
+                    Cryptpad.errorLoadingScreen(Messages.typeError);
+                    throw new Error(Messages.typeError);
+                }
+            }

            Cryptpad.removeLoadingScreen();
            setEditable(true);