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

customize.dist/translations/messages.js

@@ -282,6 +282,9 @@ define(function () {
     out.contacts_info3 = "Double-click their icon to view their profile";
     out.contacts_info4 = "Either participant can clear permanently a chat history";
 
+    out.contacts_confirmRemoveHistory = 'Are you sure you want to permanently remove your chat history? Data cannot be restored';
+    out.contacts_removeHistoryServerError = 'There was an error while removing your chat history. Try again later';
+
     // File manager
 
     out.fm_rootName = "Documents";

www/common/common-messaging.js

@@ -283,24 +283,29 @@ define([
         var data = getFriend(common, curvePublic);
         var proxy = common.getProxy();
 
-        var $header = $('<div>', {'class': 'header avatar'}).appendTo($container);
+        var $header = $('<div>', {
-/*
+            'class': 'cp-contact-top-bar header',
-        var $removeHistory = $('<button>', {
+        }).appendTo($container);
-            'class': 'remove-history'
+
-        }).text('remove chat history').click(function () {
+        var $avatar = $('<div>', {'class': 'avatar'}).appendTo($header);
-            Cryptpad.confirm('are you sure?', function (yes) {
+
+        var $removeHistory = $('<span>', {
+            'class': 'remove-history fa fa-eraser'
+        })
+        // TODO set title
+        .click(function () {
+            Cryptpad.confirm(common.Messages.contacts_confirmRemoveHistory, function (yes) {
                 if (!yes) { return; }
                 Cryptpad.clearOwnedChannel(data.channel, function (e) {
                     if (e) {
                         console.error(e);
-                        Cryptpad.alert("Something went wrong");
+                        Cryptpad.alert(common.Messages.contacts_removeHistoryServerError);
                         return;
                     }
                 });
             });
         });
-        $removeHistory.appendTo($header); //rightCol);
+        $removeHistory.appendTo($header);
-*/
 
         $('<div>', {'class': 'messages'}).appendTo($container);
         var $inputBlock = $('<div>', {'class': 'input'}).appendTo($container);
@@ -362,14 +367,14 @@ define([
         var $rightCol = $('<span>', {'class': 'right-col'});
         $('<span>', {'class': 'name'}).text(data.displayName).appendTo($rightCol);
         if (data.avatar && avatars[data.avatar]) {
-            $header.append(avatars[data.avatar]);
+            $avatar.append(avatars[data.avatar]);
-            $header.append($rightCol);
+            $avatar.append($rightCol);
         } else {
-            common.displayAvatar($header, data.avatar, data.displayName, function ($img) {
+            common.displayAvatar($avatar, data.avatar, data.displayName, function ($img) {
                 if (data.avatar && $img) {
                     avatars[data.avatar] = $img[0].outerHTML;
                 }
-                $header.append($rightCol);
+                $avatar.append($rightCol);
             });
         }
 

www/common/pinpad.js

@@ -142,7 +142,11 @@ define([
                 }
                 rpc.send('CLEAR_OWNED_CHANNEL', channel, function (e, response) {
                     if (e) { return cb(e); }
-                    cb(response);
+                    if (response && response.length) {
+                        cb(void 0, response[0]);
+                    } else {
+                        cb();
+                    }
                 });
             };
 

www/contacts/main.less

@@ -66,7 +66,7 @@ body {
     }
 }
 
-#friendList .friend, #messaging .header {
+#friendList .friend, #messaging .avatar {
     .avatar(30px);
     &.avatar {
         display: flex;
@@ -112,6 +112,24 @@ body {
     }
 }
 
+.cp-contact-top-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .avatar,
+    .right-col {
+         flex:1 1 auto;
+    }
+    .remove-history {
+        height: 100%;
+
+        &:hover {
+            background-color: lighten(@bg-color, 20%);
+        }
+    }
+}
+
 #messaging {
     flex: 1;
     height: 100%;