From 0983f77969768e239dceaf87f98bfb39928413cc Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 30 May 2019 14:28:56 +0300 Subject: [PATCH] [DE mobile] Add initials for users --- .../mobile/app/controller/Collaboration.js | 11 ++++++++--- .../mobile/app/view/Collaboration.js | 2 +- .../mobile/resources/css/app-ios.css | 10 +++++++--- .../mobile/resources/css/app-material.css | 16 +++++++--------- .../mobile/resources/less/app-ios.less | 13 ++++++++++--- .../mobile/resources/less/app-material.less | 18 +++++++++--------- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Collaboration.js b/apps/documenteditor/mobile/app/controller/Collaboration.js index 59cf1ad52..1cbf3264e 100644 --- a/apps/documenteditor/mobile/app/controller/Collaboration.js +++ b/apps/documenteditor/mobile/app/controller/Collaboration.js @@ -580,7 +580,7 @@ define([ '<% _.each(users, function(item) { %>', '
  • ' + '
    ' + - '
    '+ + '
    <%= item.initial %>
    '+ '' + '<% if (item.len>1) { %><% } %>' + '
    '+ @@ -591,14 +591,19 @@ define([ usersSort = [], len; _.each(editUsers, function(item){ - users.push({color: item.asc_getColor(), id: item.id, idOriginal: item.idOriginal, name: item.userName, view: item.view}) + var fio = item.userName.split(' '); + var initials = fio[0].substring(0, 1).toUpperCase(); + if (fio.length > 1) { + initials += fio[fio.length - 1].substring(0, 1).toUpperCase(); + } + users.push({color: item.asc_getColor(), id: item.id, idOriginal: item.idOriginal, name: item.userName, view: item.view, initial: initials}) }); _.each(users.filter(function (itm) {return !itm.view;}), function(item){ if (usersSort.filter(function (itemFil) {return item.idOriginal === itemFil.idOriginal;}).length === 0) { len = users.filter(function (itemFil) { return (item.idOriginal === itemFil.idOriginal && !itemFil.view); }).length; - usersSort.push({color: item.color, id: item.id, idOriginal: item.idOriginal, name: item.name, view: item.view, len: len}) + usersSort.push({color: item.color, id: item.id, idOriginal: item.idOriginal, name: item.name, view: item.view, len: len, initial: item.initial}) } }); var templateUserList = _.template( diff --git a/apps/documenteditor/mobile/app/view/Collaboration.js b/apps/documenteditor/mobile/app/view/Collaboration.js index 784c08a5a..22b8db64a 100644 --- a/apps/documenteditor/mobile/app/view/Collaboration.js +++ b/apps/documenteditor/mobile/app/view/Collaboration.js @@ -152,7 +152,7 @@ define([ textFinal: 'Final', textOriginal: 'Original', textChange: 'Review Change', - textEditUsers: 'Edit Users' + textEditUsers: 'Users' } })(), DE.Views.Collaboration || {})) diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index d885020c7..0157be132 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6925,10 +6925,14 @@ html.pixel-ratio-3 .numbers li { margin-left: 4px; } #user-list .color { - min-width: 26px; - min-height: 26px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; + min-width: 40px; + min-height: 40px; margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #6d6d72; + font-weight: 500; } #user-list ul:before { content: none; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 77557022c..f5ecd33b3 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6696,17 +6696,15 @@ html.pixel-ratio-3 .numbers li { margin-left: 4px; } #user-list .color { - min-width: 26px; - min-height: 26px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; + min-width: 40px; + min-height: 40px; margin-right: 20px; -} -#user-list ul:after { - content: none; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #6d6d72; + font-weight: 400; } #user-list ul:before { content: none; } -#user-list .item-inner:after { - content: none; -} diff --git a/apps/documenteditor/mobile/resources/less/app-ios.less b/apps/documenteditor/mobile/resources/less/app-ios.less index 7e9c431fc..5bb4b6deb 100644 --- a/apps/documenteditor/mobile/resources/less/app-ios.less +++ b/apps/documenteditor/mobile/resources/less/app-ios.less @@ -242,6 +242,8 @@ input, textarea { } //Edit users +@contentBlockColor: #6d6d72; + #user-list { .item-content { padding-left: 0; @@ -254,10 +256,15 @@ input, textarea { margin-left: 4px; } .color { - min-width: 26px; - min-height: 26px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; + min-width: 40px; + min-height: 40px; margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: @contentBlockColor; + font-weight: 500; + } ul:before { content: none; diff --git a/apps/documenteditor/mobile/resources/less/app-material.less b/apps/documenteditor/mobile/resources/less/app-material.less index 38e3bd9b7..47c45aa40 100644 --- a/apps/documenteditor/mobile/resources/less/app-material.less +++ b/apps/documenteditor/mobile/resources/less/app-material.less @@ -229,6 +229,8 @@ input, textarea { } //Edit users +@contentBlockColor: #6d6d72; + #user-list { .item-content { padding-left: 0; @@ -241,18 +243,16 @@ input, textarea { margin-left: 4px; } .color { - min-width: 26px; - min-height: 26px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; + min-width: 40px; + min-height: 40px; margin-right: 20px; - } - ul:after { - content: none; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: @contentBlockColor; + font-weight: 400; } ul:before { content: none; } - .item-inner:after { - content: none; - } } \ No newline at end of file