diff --git a/apps/common/main/resources/img/doc-formats/ppsx.svg b/apps/common/main/resources/img/doc-formats/ppsx.svg new file mode 100644 index 000000000..62116e9e9 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/ppsx.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 72c8db211..196a6182d 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -62,9 +62,11 @@ define([ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP} ], [ - {name: 'PPTM', imgCls: 'pptm', type: Asc.c_oAscFileType.PPTM}, + {name: 'PPSX', imgCls: 'ppsx', type: Asc.c_oAscFileType.PPSX}, {name: 'PNG', imgCls: 'png', type: Asc.c_oAscFileType.PNG}, {name: 'JPG', imgCls: 'jpg', type: Asc.c_oAscFileType.JPG} + ], [ + {name: 'PPTM', imgCls: 'pptm', type: Asc.c_oAscFileType.PPTM} ]], @@ -132,9 +134,11 @@ define([ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'}, {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP, ext: '.otp'} ], [ - {name: 'PPTM', imgCls: 'pptm', type: Asc.c_oAscFileType.PPTM, ext: '.pptm'}, + {name: 'PPSX', imgCls: 'ppsx', type: Asc.c_oAscFileType.PPSX, ext: '.ppsx'}, {name: 'PNG', imgCls: 'png', type: Asc.c_oAscFileType.PNG, ext: '.png'}, {name: 'JPG', imgCls: 'jpg', type: Asc.c_oAscFileType.JPG, ext: '.jpg'} + ], [ + {name: 'PPTM', imgCls: 'pptm', type: Asc.c_oAscFileType.PPTM, ext: '.pptm'} ]], template: _.template([ diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 23f19862e..9a886f86d 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -323,6 +323,7 @@ + diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index f730751ed..4f5c4c4cb 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -350,6 +350,7 @@ + diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index 35f40e0af..16f730e0e 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -260,6 +260,7 @@ + diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy index d646c3c95..89730f698 100644 --- a/apps/presentationeditor/main/index_loader.html.deploy +++ b/apps/presentationeditor/main/index_loader.html.deploy @@ -317,6 +317,7 @@ +