[SSE DE PE] Add avatar in version history

ONLYOFFICE · Oct 11, 2023 · 9765935 · 9765935
1 parent 673b53e
commit 9765935
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js
@@ -91,8 +91,20 @@ define([
                             '<div class="revision-expand  ' + '<% if (isExpanded) { %>' + 'up' + '<% } %>' + '"></div>',
                         '<% } %>',
                         '<div class="user-name">',
-                            '<div class="color" style="display: inline-block; background-color:' + '<%=usercolor%>;' + '" >',
-                            '</div><%= Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(username)) %>',
+                            '<div class="color"', 
+                                '<% if (avatar) { %>',
+                                    'style="<% if (usercolor !== null) { %> border-color:<%=usercolor%>; border-style:solid;<% }%>"', 
+                                '<% } else { %>',
+                                    'style="background-color: <% if (usercolor !== null) { %> <%=usercolor%> <% } else { %> #cfcfcf <% }%>;"',
+                                '<% } %>',
+                            '>',
+                                '<% if (avatar) { %>',
+                                    '<img src="<%=avatar%>" />',
+                                '<% } else { %>',
+                                    '<%=initials%>',
+                                '<% } %>',
+                            '</div>',
+                            '<span><%= Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(username)) %></span>',
                         '</div>',
                         '<% if (canRestore && selected) { %>',
                             '<label class="revision-restore" role="presentation" tabindex="-1">' + this.textRestore + '</label>',

diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less
@@ -139,15 +139,26 @@
         }
 
         .color {
-            width: 12px;
-            height: 12px;
-            border: @scaled-one-px-value-ie solid @border-toolbar-ie;
-            border: @scaled-one-px-value solid @border-toolbar;
-            margin: 0 5px 3px 0;
+            position: relative;
+            width: 26px;
+            height: 26px;
+            border-radius: 20px;
+            border-width: @scaled-two-px-value;
+            display: inline-block;
             vertical-align: middle;
+            overflow: hidden;
+            .margin-right-8();
 
-            .rtl & {
-                margin: 0 0 3px 5px;
+            color: #ffffff;
+            line-height: 26px;
+            text-align: center;
+
+            img {
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                top: 0;
+                left: 0;
             }
         }
 

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
@@ -721,6 +721,8 @@ define([
                                     userid : version.user.id,
                                     username : version.user.name || this.textAnonymous,
                                     usercolor: user.get('color'),
+                                    initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(version.user.name || this.textAnonymous)),
+                                    avatar : undefined,
                                     created: version.created,
                                     docId: version.key,
                                     markedAsVersion: (group!==version.versionGroup),
@@ -771,6 +773,8 @@ define([
                                                 userid : change.user.id,
                                                 username : change.user.name || this.textAnonymous,
                                                 usercolor: user.get('color'),
+                                                initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(change.user.name || this.textAnonymous)),
+                                                avatar : undefined,
                                                 created: change.created,
                                                 docId: version.key,
                                                 docIdPrev: docIdPrev,

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
@@ -2637,6 +2637,8 @@ define([
                                     userid : version.user.id,
                                     username : version.user.name,
                                     usercolor: user.get('color'),
+                                    initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(version.user.name || this.textAnonymous)),
+                                    avatar : undefined,
                                     created: version.created,
                                     docId: version.key,
                                     markedAsVersion: (group!==version.versionGroup),
@@ -2687,6 +2689,8 @@ define([
                                                 userid : change.user.id,
                                                 username : change.user.name,
                                                 usercolor: user.get('color'),
+                                                initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(change.user.name || this.textAnonymous)),
+                                                avatar : undefined,
                                                 created: change.created,
                                                 docId: version.key,
                                                 docIdPrev: docIdPrev,

diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -3252,6 +3252,8 @@ define([
                                     userid : version.user.id,
                                     username : version.user.name,
                                     usercolor: user.get('color'),
+                                    initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(version.user.name || this.textAnonymous)),
+                                    avatar : undefined,
                                     created: version.created,
                                     docId: version.key,
                                     markedAsVersion: (group!==version.versionGroup),
@@ -3302,6 +3304,8 @@ define([
                                                 userid : change.user.id,
                                                 username : change.user.name,
                                                 usercolor: user.get('color'),
+                                                initials : Common.Utils.getUserInitials(AscCommon.UserInfoParser.getParsedName(change.user.name || this.textAnonymous)),
+                                                avatar : undefined,
                                                 created: change.created,
                                                 docId: version.key,
                                                 docIdPrev: docIdPrev,