Merge branch 'staging' into responsiveContextmenu

2019-08-12 12:15:44 +02:00
parent 5e1426bee0 ecffe23c08
commit 6bcf9f13d3
98 changed files with 3150 additions and 757 deletions
--- a/customize.dist/fonts/cptools/fonts/cptools.svg
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -25,4 +25,5 @@
 <glyph unicode="&#xe90f;" glyph-name="code" d="M839.56 905.788h-655.119c-35.33 0-63.97-28.64-63.97-63.97v-787.637c0-35.33 28.64-63.97 63.97-63.97v0h655.119c35.33 0 63.97 28.64 63.97 63.97v0 787.637c0 35.33-28.64 63.97-63.97 63.97v0zM843.294 54.182c0-2.063-1.672-3.735-3.735-3.735v0h-655.119c-2.063 0-3.735 1.672-3.735 3.735v0 787.637c0 2.063 1.672 3.735 3.735 3.735v0h655.119c2.063 0 3.735-1.672 3.735-3.735v0zM445.741 514.259c0 0.036 0 0.078 0 0.121 0 5.928-2.817 11.198-7.185 14.545l-0.044 0.032c-3.983 2.691-8.892 4.295-14.175 4.295-4.094 0-7.962-0.963-11.392-2.675l0.148 0.067-184.2-86.618c-8.222-3.631-13.857-11.713-13.857-21.111 0-0.117 0.001-0.234 0.003-0.351v0.018c-0.012-0.283-0.019-0.616-0.019-0.95 0-9.595 5.609-17.881 13.727-21.756l0.145-0.062 182.874-86.618c3.48-1.929 7.624-3.084 12.033-3.132h0.015c0.048 0 0.104-0.001 0.16-0.001 5.069 0 9.747 1.674 13.511 4.5l-0.058-0.042c4.41 3.332 7.23 8.565 7.23 14.458 0 0.084-0.001 0.168-0.002 0.252v-0.013c-0.071 7.753-4.57 14.439-11.087 17.657l-0.116 0.052-159.021 75.174 159.503 75.174c6.763 2.889 11.483 9.349 11.805 16.947l0.001 0.039zM593.92 607.503c0.002 0.105 0.003 0.229 0.003 0.352 0 5.748-2.249 10.971-5.915 14.836l0.009-0.010c-3.681 4.147-9.026 6.747-14.977 6.747-0.029 0-0.057 0-0.086 0h0.004c-9.851-0.020-18.105-6.831-20.33-16l-0.029-0.143-101.798-317.32c-0.832-2.21-1.355-4.765-1.445-7.429l-0.001-0.040c0-0.049-0.001-0.106-0.001-0.164 0-5.808 2.246-11.091 5.916-15.028l-0.012 0.013c3.716-4.077 9.049-6.626 14.977-6.626 0.029 0 0.058 0 0.086 0h-0.004c4.647 0.168 8.845 1.966 12.066 4.836l-0.019-0.017c3.378 2.964 5.926 6.796 7.301 11.149l0.048 0.175 102.28 317.199c0.984 2.183 1.668 4.715 1.92 7.372l0.007 0.097zM795.106 444.024l-183.236 86.618c-3.456 2.029-7.611 3.228-12.047 3.228-5.294 0-10.189-1.707-14.164-4.601l0.069 0.048c-4.553-3.371-7.472-8.724-7.472-14.758 0-0.106 0.001-0.211 0.003-0.316v0.016c0.315-7.802 5.137-14.404 11.919-17.299l0.128-0.049 158.901-74.812-159.985-75.535c-6.524-3.171-10.945-9.741-10.963-17.345v-0.002c-0.001-0.071-0.002-0.155-0.002-0.24 0-5.892 2.82-11.126 7.184-14.425l0.045-0.033c3.706-2.784 8.384-4.458 13.453-4.458 0.056 0 0.113 0 0.169 0.001h-0.009c0.189-0.005 0.412-0.008 0.636-0.008 4.169 0 8.098 1.028 11.547 2.844l-0.136-0.065 183.959 86.98c8.264 3.938 13.873 12.223 13.873 21.819 0 0.334-0.007 0.667-0.020 0.998l0.002-0.047c0.002 0.099 0.002 0.216 0.002 0.333 0 9.398-5.634 17.48-13.71 21.053l-0.147 0.058z" />
 <glyph unicode="&#xe910;" glyph-name="new-template" d="M840.764 886.152h-655.119c-35.33 0-63.97-28.64-63.97-63.97v0-787.637c0-35.33 28.64-63.97 63.97-63.97v0h655.119c35.33 0 63.97 28.64 63.97 63.97v0 787.637c0 35.33-28.64 63.97-63.97 63.97v0zM844.499 34.545c0-2.063-1.672-3.735-3.735-3.735v0h-655.119c-2.063 0-3.735 1.672-3.735 3.735v0 787.637c0 2.063 1.672 3.735 3.735 3.735h655.119c2.063 0 3.735-1.672 3.735-3.735v0zM643.915 466.071h-93.365v93.003c0 10.313-8.36 18.673-18.673 18.673v0h-37.346c-0.036 0-0.078 0-0.121 0-10.246 0-18.552-8.306-18.552-18.552 0-0.042 0-0.085 0-0.127v0.006-93.003h-93.365c-0.036 0-0.078 0-0.121 0-10.246 0-18.552-8.306-18.552-18.552 0-0.042 0-0.085 0-0.127v0.006-37.346c0-10.313 8.36-18.673 18.673-18.673v0h93.365v-93.967c0-0.036 0-0.078 0-0.121 0-10.246 8.306-18.552 18.552-18.552 0.042 0 0.085 0 0.127 0h37.34c10.313 0 18.673 8.36 18.673 18.673v0 93.606h93.365c10.285 0.068 18.605 8.388 18.673 18.666v37.352c0.002 0.108 0.003 0.234 0.003 0.361 0 10.313-8.36 18.673-18.673 18.673-0.001 0-0.002 0-0.004 0v0z" />
 <glyph unicode="&#xe911;" glyph-name="palette" d="M408.6 950c-198.8-38.8-359-198.6-398.2-396.8-74-374 263.4-652.8 517.6-613.4 82.4 12.8 122.8 109.2 85 183.4-46.2 90.8 19.8 196.8 121.8 196.8h159.4c71.6 0 129.6 59.2 129.8 130.6-1 315.2-287.8 563.2-615.4 499.4zM192 320c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM256 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM512 704c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM768 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64z" />
+<glyph unicode="&#xe912;" glyph-name="folder-upload" d="M829.44 727.251h-296.84l-47.104 62.886c-25.923 34.066-66.406 55.898-111.999 56.139h-178.938c-77.457-0.137-140.211-62.891-140.348-140.335v-515.868c0.137-77.457 62.891-140.211 140.335-140.348h634.893c77.457 0.137 140.211 62.891 140.348 140.335v396.482c0 0.036 0 0.078 0 0.121 0 77.561-62.807 140.452-140.335 140.589h-0.013zM911.119 190.072c-0.068-45.083-36.597-81.611-81.673-81.679h-634.887c-45.083 0.068-81.611 36.597-81.679 81.673v515.862c0.068 45.083 36.597 81.611 81.673 81.679h178.906c26.48-0.030 50.004-12.656 64.908-32.207l0.146-0.199 47.104-62.765 17.709-24.094h326.114c45.125-0.069 81.679-36.665 81.679-81.799 0 0 0 0 0 0v0zM562.838 166.883h-102.039v203.957h-72.523l123.723 214.076 123.723-214.076h-72.885v-203.957z" />
 </font></defs></svg>
--- a/customize.dist/fonts/cptools/fonts/cptools.ttf
+++ b/customize.dist/fonts/cptools/fonts/cptools.ttf
--- a/customize.dist/fonts/cptools/fonts/cptools.woff
+++ b/customize.dist/fonts/cptools/fonts/cptools.woff
--- a/customize.dist/fonts/cptools/style.css
+++ b/customize.dist/fonts/cptools/style.css
@@ -1,9 +1,9 @@
@font-face {
  font-family: 'cptools';
  src:
-    url('fonts/cptools.ttf?yr9e7c') format('truetype'),
-    url('fonts/cptools.woff?yr9e7c') format('woff'),
-    url('fonts/cptools.svg?yr9e7c#cptools') format('svg');
+    url('fonts/cptools.ttf?cljhos') format('truetype'),
+    url('fonts/cptools.woff?cljhos') format('woff'),
+    url('fonts/cptools.svg?cljhos#cptools') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@@ -24,6 +24,9 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.cptools-folder-upload:before {
+  content: "\e912";
+}
 .cptools-folder-no-color:before {
  content: "\e900";
 }
--- a/customize.dist/loading.js
+++ b/customize.dist/loading.js
@@ -169,6 +169,28 @@ define([], function () {
    height: 100%;
    background: #5cb85c;
 }
+
+@keyframes spin {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(1800deg);
+    }
+}
+
+.cp-spinner {
+    display: inline-block;
+    box-sizing: border-box;
+    width: 80px;
+    height: 80px;
+    border: 11px solid lightgrey;
+    border-radius: 50%;
+    border-top-color: transparent;
+    animation: spin infinite 3s;
+    animation-timing-function: cubic-bezier(.6,0.15,0.4,0.85);
+}
+
 */}).toString().slice(14, -3);
    var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
    var elem = document.createElement('div');
@@ -182,7 +204,7 @@ define([], function () {
        '</div>',
        '<div class="cp-loading-container">',
            '<div class="cp-loading-spinner-container">',
-                '<span class="fa fa-spinner fa-pulse fa-4x fa-fw"></span>',
+                '<span class="cp-spinner"></span>',
            '</div>',
            '<p id="cp-loading-message"></p>',
        '</div>'
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -3,8 +3,8 @@
 var map = {
    'ca': 'Català',
    'de': 'Deutsch',
-    'es': 'Español',
    'el': 'Ελληνικά',
+    'es': 'Español',
    'fr': 'Français',
    'it': 'Italiano',
    'nb': 'Norwegian Bokmål',
@@ -12,8 +12,8 @@ var map = {
    'pt-br': 'Português do Brasil',
    'ro': 'Română',
    'ru': 'Русский',
+    //'te': 'తెలుగు',
    'zh': '繁體中文',
-    'te': 'తెలుగు',
 };

 var messages = {};
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -103,7 +103,7 @@ define([
                    ])*/
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.23.0 (Xenops)")
+            h('div.cp-version-footer', "CryptPad v2.25.0 (Zebra)")
        ]);
    };

--- a/customize.dist/pages/about.js
+++ b/customize.dist/pages/about.js
@@ -21,22 +21,6 @@ define([
                            h('h2.text-center', Msg.about_core)
                        ]),
                    ]),
-                h('div.row.align-items-center', [
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [
-                        h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'})
-                            ]),
-                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [
-                        h('h3', "Caleb James Delisle"),
-                        h('hr'),
-                        Pages.setHTML(h('div#bioCaleb'), '<p>Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer.<br/>In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed.<br/>After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing.<br/>He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".</p>'),
-                        h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [
-                                h('i.fa.fa-twitter')
-                            ]),
-                        h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [
-                                h('i.fa.fa-github')
-                            ])
-                    ]),
-                ]),
                h('div.row.align-items-center',[
                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.order-lg-2.cp-bio-avatar.cp-bio-avatar-right', [
                            h('img.img-fluid', {'src': '/customize/images/AaronMacSween.jpg'})
@@ -74,16 +58,16 @@ define([
                    ]),
                h('div.row.align-items-center', [
                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [
-                        h('img.img-fluid', {'src': '/customize/images/Pierre-new.jpg'})
+                        h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'})
                            ]),
                    h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [
-                        h('h3', "Pierre Bondoerffer"),
+                        h('h3', "Caleb James Delisle"),
                        h('hr'),
-                        Pages.setHTML(h('div#bioPierre'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.<br/>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.<br/>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>'),
-                        h('a.cp-soc-media', { href : 'https://twitter.com/pbondoer'}, [
+                        Pages.setHTML(h('div#bioCaleb'), '<p>Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer.<br/>In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed.<br/>After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing.<br/>He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".</p>'),
+                        h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [
                                h('i.fa.fa-twitter')
                            ]),
-                        h('a.cp-soc-media', { href : 'https://github.com/pbondoer'}, [
+                        h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [
                                h('i.fa.fa-github')
                            ])
                    ]),
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -137,6 +137,15 @@
@colortheme_admin-color: #FFF;
@colortheme_admin-warn: #ffae00;

+@colortheme_notifications-bg: #4ae397;
+@colortheme_notifications-color: #000;
+@colortheme_notifications-warn: #e34a85;
+
+@colortheme_support-bg: #42d1f4;
+@colortheme_support-color: #000;
+@colortheme_support-warn: #9A37F7;
+
+
 // Sidebar layout (profile / settings)
@colortheme_sidebar-active: #fff;
@colortheme_sidebar-left-bg: #eee;
--- a/customize.dist/src/less2/include/contextmenu.less
+++ b/customize.dist/src/less2/include/contextmenu.less
@@ -23,7 +23,7 @@
                }
                .dropdown-toggle {
                    transform: rotate(270deg);
-                    margin-left: 10px;
+                    margin-left: 1rem;
                    float: right;
                }
                .dropdown-menu {
@@ -40,6 +40,7 @@
                .fa, .cptools {
                    margin-right: 1rem;
                    color: @colortheme_context-menu-icon-color;
+                    width: 16px;
                }
            }
        }
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -1,4 +1,5 @@
@import (reference) "./colortheme-all.less";
+@import (reference) "./avatar.less";

 .notifications_main() {
    --LessLoader_require: LessLoader_currentFile();
@@ -14,6 +15,7 @@
            display: flex;
            .cp-notification-content {
                flex: 1;
+                align-items: stretch;
                min-width: 0;
                p {
                    word-break: break-word;
@@ -28,8 +30,7 @@
            .cp-notification-dismiss {
                color: black;
                width: 25px;
-                height: 100%;
-                display: none;
+                display: flex;
                align-items: center;
                justify-content: center;
                cursor: pointer;
@@ -39,6 +40,33 @@
            }
        }
    }
+    hr {
+        margin: 0px !important;
+    }
+    .cp-notifications-gotoapp {
+        p {
+            padding: 10px 0 !important;
+            text-align: center !important;
+            font-weight: bold;
+            cursor: pointer;
+            &:hover {
+                background-color: rgba(0,0,0,0.1);
+            }
+        }
+    }
+    .cp-notifications-requestedit-verified {
+        display: flex;
+        align-items: center;
+        &> span.cp-avatar {
+            .avatar_main(30px);
+        }
+        &> span {
+            margin-right: 10px;
+        }
+        &> p {
+            margin: 0;
+        }
+    }
 }


--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -90,12 +90,21 @@
            button.btn {
                @button-bg: @colortheme_sidebar-button-bg;
                @button-red-bg: @colortheme_sidebar-button-red-bg;
+                @button-alt-bg: @colortheme_sidebar-button-alt-bg;
                background-color: @button-bg;
                border-color: darken(@button-bg, 10%);
                color: white;
                &:hover {
                    background-color: darken(@button-bg, 10%);
                }
+                &.btn-secondary {
+                    background-color: @button-alt-bg;
+                    border-color: darken(@button-alt-bg, 10%);
+                    color: black;
+                    &:hover {
+                        background-color: darken(@button-alt-bg, 10%);
+                    }
+                }
                &.btn-danger {
                    background-color: @button-red-bg;
                    border-color: darken(@button-red-bg, 10%);
--- a/customize.dist/src/less2/include/support.less
+++ b/customize.dist/src/less2/include/support.less
@@ -0,0 +1,86 @@
+@import (reference) "./colortheme-all.less";
+.support_main () {
+    @ticket-bg: #F7F7F7;
+    @msg-bg: #eee;
+    @fromme-bg: #ddd;
+    .cp-support-form-container {
+        [type="text"] {
+            width: @sidebar_button-width;
+            margin-bottom: 10px;
+        }
+        textarea {
+            width: 2*@sidebar_button-width;
+            max-width: 90%;
+            padding: 10px 15px;
+            height: 300px;
+        }
+    }
+    .cp-support-container {
+        .cp-support-list-ticket {
+            display: flex;
+            flex-flow: column;
+            background-color: @ticket-bg;
+            padding: 10px;
+            width: 1200px;
+            max-width: 90%;
+            margin: 5px auto;
+            .cp-support-list-message {
+                background-color: @msg-bg;
+                margin: 2px;
+                padding: 2px 5px;
+                .cp-support-fromme {
+                    background-color: @fromme-bg;
+                }
+                .cp-support-showdata {
+                    cursor: pointer;
+                    background-color: @fromme-bg;
+                    .cp-support-message-data {
+                        display: none;
+                        cursor: default;
+                    }
+                }
+                .cp-support-message-time {
+                    float: right;
+                }
+                pre {
+                    margin-bottom: 0;
+                    white-space: pre-wrap;
+                    &.cp-support-message-content {
+                        margin-top: 10px;
+                        margin-bottom: 10px;
+                    }
+                }
+            }
+            .cp-support-list-actions {
+                order: 3;
+                .cp-support-hide {
+                    display: none;
+                }
+            }
+            .cp-support-form-container {
+                order: 2;
+            }
+            &.cp-support-list-closed {
+                .cp-support-list-actions {
+                    display: block !important;
+                    .cp-support-answer, .cp-support-close {
+                        display: none;
+                    }
+                    .cp-support-hide {
+                        display: inline;
+                    }
+                }
+                .cp-support-form-container {
+                    display: none !important;
+                }
+            }
+            button {
+                margin-left: 2px;
+                margin-right: 5px;
+            }
+        }
+    }
+}
+
+
+