diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 55768f207..e516475a2 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -428,7 +428,9 @@ define([
Asc.c_oAscFileType.DOCX,
Asc.c_oAscFileType.HTML,
Asc.c_oAscFileType.PDF,
- Asc.c_oAscFileType.PDFA
+ Asc.c_oAscFileType.PDFA,
+ Asc.c_oAscFileType.DOTX,
+ Asc.c_oAscFileType.OTT
];
if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 7d43b8507..321f0ea88 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -143,7 +143,9 @@ define([
Asc.c_oAscFileType.ODT,
Asc.c_oAscFileType.DOCX,
Asc.c_oAscFileType.HTML,
- Asc.c_oAscFileType.PDFA
+ Asc.c_oAscFileType.PDFA,
+ Asc.c_oAscFileType.DOTX,
+ Asc.c_oAscFileType.OTT
];
if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index c1f3f2428..6320f3720 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -54,14 +54,15 @@ define([
formats: [[
{name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
- {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
- {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT}
+ {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT},
+ {name: 'ODT', imgCls: 'odt', type: Asc.c_oAscFileType.ODT}
],[
-// {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC},
- {name: 'ODT', imgCls: 'odt', type: Asc.c_oAscFileType.ODT},
+ {name: 'DOTX', imgCls: 'dotx', type: Asc.c_oAscFileType.DOTX},
+ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
{name: 'RTF', imgCls: 'rtf', type: Asc.c_oAscFileType.RTF},
+ {name: 'OTT', imgCls: 'ott', type: Asc.c_oAscFileType.OTT}
+ ],[
{name: 'HTML (Zipped)', imgCls: 'html', type: Asc.c_oAscFileType.HTML}
-// {name: 'EPUB', imgCls: 'doc-format btn-epub', type: Asc.c_oAscFileType.EPUB}
]],
@@ -114,14 +115,15 @@ define([
formats: [[
{name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX, ext: '.docx'},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF, ext: '.pdf'},
- {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'},
- {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT, ext: '.txt'}
+ {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT, ext: '.txt'},
+ {name: 'ODT', imgCls: 'odt', type: Asc.c_oAscFileType.ODT, ext: '.odt'}
],[
-// {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC, ext: '.doc'},
- {name: 'ODT', imgCls: 'odt', type: Asc.c_oAscFileType.ODT, ext: '.odt'},
+ {name: 'DOTX', imgCls: 'dotx', type: Asc.c_oAscFileType.DOTX, ext: '.dotx'},
+ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'},
{name: 'RTF', imgCls: 'rtf', type: Asc.c_oAscFileType.RTF, ext: '.rtf'},
+ {name: 'OTT', imgCls: 'ott', type: Asc.c_oAscFileType.OTT, ext: '.ott'}
+ ],[
{name: 'HTML (Zipped)', imgCls: 'html', type: Asc.c_oAscFileType.HTML, ext: '.html'}
-// {name: 'EPUB', imgCls: 'doc-format btn-epub', type: Asc.c_oAscFileType.EPUB, ext: '.epub'}
]],
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 7aaa2df5d..eb828a57d 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -263,10 +263,12 @@
+
+
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 32fdf0a44..58c504339 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -284,10 +284,12 @@
+
+
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 083c69e03..ac6732cee 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -402,7 +402,9 @@ define([
Asc.c_oAscFileType.PPTX,
Asc.c_oAscFileType.ODP,
Asc.c_oAscFileType.PDF,
- Asc.c_oAscFileType.PDFA
+ Asc.c_oAscFileType.PDFA,
+ Asc.c_oAscFileType.POTX,
+ Asc.c_oAscFileType.OTP
];
if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 807066687..fc0b93b4c 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -151,7 +151,9 @@ define([
var _supported = [
Asc.c_oAscFileType.PPTX,
Asc.c_oAscFileType.ODP,
- Asc.c_oAscFileType.PDFA
+ Asc.c_oAscFileType.PDFA,
+ Asc.c_oAscFileType.POTX,
+ Asc.c_oAscFileType.OTP
];
if ( !_format || _supported.indexOf(_format) < 0 )
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index dd84ebf0c..f8a4ca404 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -55,8 +55,11 @@ define([
formats: [[
{name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
- {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
{name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP}
+ ],[
+ {name: 'POTX', imgCls: 'potx', type: Asc.c_oAscFileType.POTX},
+ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
+ {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP}
]],
@@ -109,8 +112,11 @@ define([
formats: [[
{name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX, ext: '.pptx'},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF, ext: '.pdf'},
- {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'},
{name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP, ext: '.odp'}
+ ],[
+ {name: 'POTX', imgCls: 'potx', type: Asc.c_oAscFileType.POTX, ext: '.potx'},
+ {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'},
+ {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP, ext: '.otp'}
]],
template: _.template([
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 340badc67..27f64755b 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -262,9 +262,11 @@
+
+
+
+