diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index c783c704ef..644c14e561 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -1498,7 +1498,7 @@ define(function(){ 'use strict'; textPictureLineup: 'Picture Lineup', textFramedTextPicture: 'Framed Text Picture', textBubblePictureList: 'Bubble Picture List', - textOffice: 'Office.com', + textOther: 'Other', textPictureOrganizationChart: 'Picture Organization Chart', textChevronAccentProcess: 'Chevron Accent Process', textRadialPictureList: 'Radial Picture List', @@ -1795,12 +1795,11 @@ define(function(){ 'use strict'; { type: Asc.c_oAscSmartArtTypes.PictureAccentProcess, tip: this.textPictureAccentProcess} ] }, - // Office.com + // Other { - id: 'menu-smart-art-group-office', + id: 'menu-smart-art-group-other', sectionId: Asc.c_oAscSmartArtSectionNames.OfficeCom, - caption: this.textOffice, - icon: '', + caption: this.textOther, items: [ { type: Asc.c_oAscSmartArtTypes.PictureOrganizationChart, tip: this.textPictureOrganizationChart}, { type: Asc.c_oAscSmartArtTypes.ChevronAccentProcess, tip: this.textChevronAccentProcess}, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index d98e5fa3d6..bcb3c2a02d 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2217,6 +2217,7 @@ define([ this.btnInsertChart.menu.on('show:before', onShowBefore); this.btnInsertSmartArt.setMenu(new Common.UI.Menu({ + cls: 'shifted-right', items: [] })); @@ -2226,7 +2227,7 @@ define([ caption: item.caption, value: item.sectionId, itemId: item.id, - iconCls: 'menu__icon ' + item.icon, + iconCls: item.icon ? 'menu__icon ' + item.icon : undefined, menu: new Common.UI.Menu({ items: [ {template: _.template('
')} diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 0214f0fb19..5d6864b903 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -266,7 +266,7 @@ "Common.define.smartArt.textPictureLineup": "Picture Lineup", "Common.define.smartArt.textFramedTextPicture": "Framed Text Picture", "Common.define.smartArt.textBubblePictureList": "Bubble Picture List", - "Common.define.smartArt.textOffice": "Office.com", + "Common.define.smartArt.textOther": "Other", "Common.define.smartArt.textPictureOrganizationChart": "Picture Organization Chart", "Common.define.smartArt.textChevronAccentProcess": "Chevron Accent Process", "Common.define.smartArt.textRadialPictureList": "Radial Picture List",