manual merge of staging

customize.dist/main.js

@@ -171,6 +171,10 @@ define([
             $('button.gotodrive').click(function () {
                 document.location.href = '/drive/';
             });
+
+            $('button#loggedInLogout').click(function () {
+                $('#user-menu .logout').click();
+            });
         };
 
         displayCreateButtons();

customize.dist/pages.js

@@ -444,7 +444,7 @@ define([
                 h('div#poll', [
                     h('div#howItWorks', [
                         h('h1', 'CryptPoll'),
-                        h('h2', Msg.poll_subtitle),
+                        setHTML(h('h2'), Msg.poll_subtitle),
                         h('p', Msg.poll_p_save),
                         h('p', Msg.poll_p_encryption)
                     ]),

customize.dist/src/less/cryptpad.less

@@ -112,17 +112,19 @@ h6 {
     padding-top: .65001rem;
 }
 
-a:not(.btn) {
-    cursor: pointer;
-    color: @cp-link;
+p {
+    a:not(.btn) {
+        cursor: pointer;
+        color: @cp-link;
 
-    text-decoration: none;
+        text-decoration: none;
 
-    &:hover {
-        color: @cp-link-hover;
-    }
-    &:visited {
-        color: @cp-link-visited;
+        &:hover {
+            color: @cp-link-hover;
+        }
+        &:visited {
+            color: @cp-link-visited;
+        }
     }
 }
 a.btn {

customize.dist/src/less/dropdown.less

@@ -21,6 +21,10 @@
             margin-right: 0px;
             margin-left: 5px;
         }
+        * {
+            .unselectable();
+            cursor: default;
+        }
     }
 
     .dropdown-bar-content {

customize.dist/src/less/toolbar.less

@@ -16,15 +16,28 @@
     color: inherit;
 }
 
-#cke_editor1 {
-    .cke_inner {
-        bottom: 0;
-        right: 0;
-        display: flex;
-        flex-flow: column;
-        height: 100vh;
-        width: 100vw;
-    }
+.padColor { color: @toolbar-pad-bg; }
+.codeColor { color: @toolbar-code-bg; }
+.slideColor { color: @toolbar-slide-bg; }
+.pollColor { color: @toolbar-poll-bg; }
+.fileColor { color: @toolbar-file-bg; }
+.whiteboardColor { color: @toolbar-whiteboard-bg; }
+.driveColor { color: @toolbar-drive-bg; }
+.defaultColor { color: @toolbar-default-bg; }
+
+.toolbar-container {
+    display: flex;
+}
+#cke_editor1 .cke_inner {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    display: flex;
+    flex-flow: column;
+    height: 100vh;
+    width: 100vw;
 }
 .cke_toolbox_main {
     display: inline-block;
@@ -35,17 +48,12 @@
     margin-top: -1px;
     display: flex;
     overflow: visible;
+    iframe {
+        height: auto;
+        width: 100%;
+    }
 }
 
-.padColor { color: @toolbar-pad-bg; }
-.codeColor { color: @toolbar-code-bg; }
-.slideColor { color: @toolbar-slide-bg; }
-.pollColor { color: @toolbar-poll-bg; }
-.fileColor { color: @toolbar-file-bg; }
-.whiteboardColor { color: @toolbar-whiteboard-bg; }
-.driveColor { color: @toolbar-drive-bg; }
-.defaultColor { color: @toolbar-default-bg; }
-
 body .userlist-drawer {
     font: normal normal normal 16px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
     min-width: 175px;
@@ -104,6 +112,51 @@ body .userlist-drawer {
             background: rgba(0,0,0,0.1);
             margin: 2px 0;
             font-size: 16px;
+            display: inline-flex;
+            align-items: center;
+            &.clickable {
+                cursor: pointer;
+                &:hover {
+                    background-color: rgba(0,0,0,0.3);
+                }
+            }
+            .default, media-tag {
+                display: inline-flex;
+                width: 50px;
+                height: 50px;
+                justify-content: center;
+                align-items: center;
+                margin-right: 5px;
+                border-radius: 10px / 6px;
+                overflow: hidden;
+                border: 1px solid black;
+                box-sizing: content-box;
+            }
+            .default {
+                .unselectable();
+                background: white;
+                color: black;
+                font-size: 40px;
+            }
+            .name {
+                flex: 1;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+            media-tag {
+                min-height: 50px;
+                min-width: 50px;
+                max-height: 50px;
+                max-width: 50px;
+                img {
+                    min-width: 100%;
+                    min-height: 100%;
+                    max-width: none;
+                    max-height: none; // To override 'media-tag img' in slide.less
+                    flex-shrink: 0;
+                }
+            }
         }
     }
 }
@@ -718,6 +771,8 @@ body .cryptpad-toolbar {
             padding: 0px;
             margin: 0;
             &::before {
+                width: 100%;
+                text-align: center;
                 padding-top: 4px;
             }
             &:hover {
@@ -796,11 +851,10 @@ body .cryptpad-toolbar {
                 width: 64px;
                 padding: 0;
                 span {
+                    text-align: center;
+                    width: 100%;
                     cursor: default;
                     font-size: 32px;
-                    .fa {
-                        margin-left: 3px;
-                    }
                 }
             }
         }
@@ -850,8 +904,10 @@ body .cryptpad-toolbar {
     }
 }
 .cryptpad-toolbar-rightside {
-    height: 32px;
+    min-height: 32px;
+    overflow: hidden;
     &:empty {
+        min-height: 0;
         height: 0;
     }
     text-align: right;
@@ -873,7 +929,7 @@ body .cryptpad-toolbar {
         background: @dropdown-bg;
         display: flex;
         flex-flow: column;
-        z-index:1000;
+        z-index:10000;
         color: black;
         .fa {
             font-size: 17px;
@@ -881,7 +937,7 @@ body .cryptpad-toolbar {
         &> span {
             box-sizing: border-box;
             min-width: 150px;
-            height: 26px;
+            height: 32px;
             border-radius: 0;
             border: 0;
         }

customize.dist/src/less/topbar.less

@@ -72,7 +72,7 @@
                 }
             }
         }
-        a {
+        &.link a {
             font-weight: 500;
             font-size: 0.75em;
             color: @cp-link;

customize.dist/translations/messages.fr.js

@@ -240,6 +240,18 @@ define(function () {
     out.canvas_opacityLabel = "opacité: {0}";
     out.canvas_widthLabel = "taille: {0}";
 
+    // Profile
+    out.profileButton = "Profil"; // dropdown menu
+    out.profile_urlPlaceholder = 'URL';
+    out.profile_namePlaceholder = 'Nom ou pseudo pour le profil';
+    out.profile_avatar = "Avatar";
+    out.profile_upload = " Importer un nouvel avatar";
+    out.profile_error = "Erreur lors de la création du profil : {0}";
+    out.profile_register = "Vous devez vous inscrire pour pouvoir créer un profil !";
+    out.profile_create = "Créer un profil";
+    out.profile_description = "Description";
+    out.profile_fieldSaved = 'Nouvelle valeur enregistrée: {0}';
+
     // File manager
 
     out.fm_rootName = "Documents";

customize.dist/translations/messages.js

@@ -241,7 +241,18 @@ define(function () {
     out.canvas_opacity = "Opacity";
     out.canvas_opacityLabel = "opacity: {0}";
     out.canvas_widthLabel = "Width: {0}";
-    
+
+    // Profile
+    out.profileButton = "Profile"; // dropdown menu
+    out.profile_urlPlaceholder = 'URL';
+    out.profile_namePlaceholder = 'Name displayed in your profile';
+    out.profile_avatar = "Avatar";
+    out.profile_upload = " Upload a new avatar";
+    out.profile_error = "Error while creating your profile: {0}";
+    out.profile_register = "You have to sign up to create a profile!";
+    out.profile_create = "Create a profile";
+    out.profile_description = "Description";
+    out.profile_fieldSaved = 'New value saved: {0}';
 
     // File manager