From ef4188db5b99e15691fc6e56bd5e17532c079732 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Feb 2020 14:31:59 +0100
Subject: [PATCH] Fix translation keys and fix UI

---
 .../src/less2/include/alertify.less           |  4 ++
 www/common/inner/access.js                    | 64 ++++++++++++-------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 52019a912..aba088c2e 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -72,6 +72,10 @@
         z-index: 100000; // alertify container
         font: @colortheme_app-font;
 
+        .cp-checkmark {
+            color: #000000;
+        }
+
         .cp-inline-alert-text {
             flex: 1;
         }
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 746234b43..216e7f94f 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -11,6 +11,12 @@ define([
              Messages, nThen) {
     var Access = {};
 
+        // XXX contacts, teams, access_noContact
+        Messages.contacts = "Contacts"; // XXX
+        Messages.teams = "Teams"; // XXX
+        Messages.access_noContact = "No other contact to add"; // XXX
+
+
     var getOwnersTab = function (common, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
 
@@ -59,7 +65,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _owners[ed] = f || {
+                _owners[ed] = Util.clone(f) || {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -131,10 +137,6 @@ define([
             return $div;
         };
 
-        // XXX contacts, teams
-        Messages.contacts = "Contacts";
-        Messages.teams = "Teams";
-
         // Add owners column
         var drawAdd = function () {
             var $div = $(h('div.cp-share-column'));
@@ -147,14 +149,22 @@ define([
                 }
             });
             // XXX if no more friends, display message...
-            var addCol = UIElements.getUserGrid(Messages.contacts, {
-                common: common,
-                large: true,
-                data: _friends
-            }, function () {
-                //console.log(arguments);
-            });
-            $div.append(addCol.div);
+            if (!Object.keys(_friends).length) {
+                $div.append(h('div.cp-app-prop', [
+                    Messages.contacts,
+                    h('br'),
+                    h('span.cp-app-prop-content', Messages.access_noContact)
+                ]));
+            } else {
+                var addCol = UIElements.getUserGrid(Messages.contacts, {
+                    common: common,
+                    large: true,
+                    data: _friends
+                }, function () {
+                    //console.log(arguments);
+                });
+                $div.append(addCol.div);
+            }
 
             var _teamsData = Util.clone(teamsData);
             Object.keys(teamsData).forEach(function (id) {
@@ -385,7 +395,7 @@ define([
                     f = f || user;
                     if (f.name) { f.edPublic = edPublic; }
                 }
-                _allowed[ed] = f || {
+                _allowed[ed] = Util.clone(f) || {
                     displayName: Messages._getKey('owner_unknownUser', [ed]),
                     edPublic: ed,
                 };
@@ -476,7 +486,7 @@ define([
             $(removeCol.div).addClass('cp-overlay-container').append(h('div.cp-overlay'));
             return h('div', [
                 h('p', Messages.allow_text),
-                cbox,
+                h('p', cbox),
                 removeCol.div
             ]);
         };
@@ -494,14 +504,22 @@ define([
                     delete _friends[curve];
                 }
             });
-            var addCol = UIElements.getUserGrid(Messages.contacts, {
-                common: common,
-                large: true,
-                data: _friends
-            }, function () {
-                //console.log(arguments);
-            });
-            $div.append(addCol.div);
+            if (!Object.keys(_friends).length) {
+                $div.append(h('div.cp-app-prop', [
+                    Messages.contacts,
+                    h('br'),
+                    h('span.cp-app-prop-content', Messages.access_noContact)
+                ]));
+            } else {
+                var addCol = UIElements.getUserGrid(Messages.contacts, {
+                    common: common,
+                    large: true,
+                    data: _friends
+                }, function () {
+                    //console.log(arguments);
+                });
+                $div.append(addCol.div);
+            }
 
             var _teamsData = Util.clone(teamsData);
             Object.keys(teamsData).forEach(function (id) {