From b108960d67927cf6204f9baecec1feff00c08613 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 24 Mar 2021 15:01:52 +0100 Subject: [PATCH] Rename ooslide and oodoc --- .../src/less2/include/colortheme-dark.less | 4 ++-- .../src/less2/include/colortheme.less | 4 ++-- server.js | 2 +- www/common/application_config_internal.js | 6 ++--- www/common/onlyoffice/app-oo.less | 10 ++++---- www/common/onlyoffice/inner.js | 24 +++++++++---------- www/oodoc/index.html | 12 ---------- www/oodoc/inner.html | 19 --------------- www/ooslide/index.html | 12 ---------- www/ooslide/inner.html | 19 --------------- 10 files changed, 25 insertions(+), 87 deletions(-) delete mode 100644 www/oodoc/index.html delete mode 100644 www/oodoc/inner.html delete mode 100644 www/ooslide/index.html delete mode 100644 www/ooslide/inner.html diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index fc17d7d24..fdb3ad772 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -13,8 +13,8 @@ whiteboard: #a72ba7; kanban: #8C4; sheet: #40865c; - oodoc: #5170B5; - ooslide: #C65D27; + doc: #5170B5; + presentation: #C65D27; file: #CD2532; } diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index f353758c8..430273089 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -13,8 +13,8 @@ whiteboard: #a72ba7; kanban: #8C4; sheet: #40865c; - oodoc: #5170B5; - ooslide: #C65D27; + doc: #5170B5; + presentation: #C65D27; file: #CD2532; } diff --git a/server.js b/server.js index d2df3bba6..a7ce63a79 100644 --- a/server.js +++ b/server.js @@ -117,7 +117,7 @@ var setHeaders = (function () { // targeted CSP, generic policies, maybe custom headers const h = [ /^\/common\/onlyoffice\/.*\/index\.html.*/, - /^\/(sheet|ooslide|oodoc)\/inner\.html.*/, + /^\/(sheet|presentation|doc)\/inner\.html.*/, ].some((regex) => { return regex.test(req.url); }) ? padHeaders : headers; diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js index c58856d09..f2c75c8a1 100644 --- a/www/common/application_config_internal.js +++ b/www/common/application_config_internal.js @@ -12,7 +12,7 @@ define(function() { * You should never remove the drive from this list. */ config.availablePadTypes = ['drive', 'teams', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard', - /*'oodoc', 'ooslide',*/ 'file', /*'todo',*/ 'contacts']; + /*'doc', 'presentation',*/ 'file', /*'todo',*/ 'contacts']; /* The registered only types are apps restricted to registered users. * You should never remove apps from this list unless you know what you're doing. The apps * listed here by default can't work without a user account. @@ -115,8 +115,8 @@ define(function() { todo: 'cptools-todo', contacts: 'fa-address-book', kanban: 'cptools-kanban', - oodoc: 'fa-file-word-o', - ooslide: 'fa-file-powerpoint-o', + doc: 'fa-file-word-o', + presentation: 'fa-file-powerpoint-o', sheet: 'cptools-sheet', drive: 'fa-hdd-o', teams: 'fa-users', diff --git a/www/common/onlyoffice/app-oo.less b/www/common/onlyoffice/app-oo.less index 982e18684..8238582ed 100644 --- a/www/common/onlyoffice/app-oo.less +++ b/www/common/onlyoffice/app-oo.less @@ -1,7 +1,7 @@ @import (reference) "../../customize/src/less2/include/framework.less"; // body -body.cp-app-sheet, body.cp-app-oodoc, body.cp-app-ooslide { +body.cp-app-sheet, body.cp-app-doc, body.cp-app-presentation { display: flex; flex-flow: column; @@ -10,14 +10,14 @@ body.cp-app-sheet, body.cp-app-oodoc, body.cp-app-ooslide { @bg-color: @colortheme_apps[sheet], ); } - &.cp-app-oodoc { + &.cp-app-doc { .framework_main( - @bg-color: @colortheme_apps[oodoc], + @bg-color: @colortheme_apps[doc], ); } - &.cp-app-ooslide { + &.cp-app-presentation { .framework_main( - @bg-color: @colortheme_apps[ooslide], + @bg-color: @colortheme_apps[presentation], ); } diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 929c3b479..50e45f7d0 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -231,7 +231,7 @@ define([ var title = common.getMetadataMgr().getMetadataLazy().title; var file = {}; switch(type) { - case 'oodoc': + case 'doc': file.type = 'docx'; file.title = title + '.docx' || 'document.docx'; file.doc = 'text'; @@ -241,7 +241,7 @@ define([ file.title = title + '.xlsx' || 'spreadsheet.xlsx'; file.doc = 'spreadsheet'; break; - case 'ooslide': + case 'presentation': file.type = 'pptx'; file.title = title + '.pptx' || 'presentation.pptx'; file.doc = 'presentation'; @@ -557,10 +557,10 @@ define([ case 'sheet' : newText = EmptyCell(useNewDefault); break; - case 'oodoc': + case 'doc': newText = EmptyDoc(); break; - case 'ooslide': + case 'presentation': newText = EmptySlide(); break; default: @@ -1816,10 +1816,10 @@ define([ if (type === "sheet" && extension !== 'xlsx') { xlsData = x2tConvertDataInternal(x2t, data, filename, 'xlsx'); filename += '.xlsx'; - } else if (type === "ooslide" && extension !== "pptx") { + } else if (type === "presentation" && extension !== "pptx") { xlsData = x2tConvertDataInternal(x2t, data, filename, 'pptx'); filename += '.pptx'; - } else if (type === "oodoc" && extension !== "docx") { + } else if (type === "doc" && extension !== "docx") { xlsData = x2tConvertDataInternal(x2t, data, filename, 'docx'); filename += '.docx'; } @@ -1843,9 +1843,9 @@ define([ var ext = ['.xlsx', '.ods', '.bin', '.csv', '.pdf']; var type = common.getMetadataMgr().getPrivateData().ooType; var warning = ''; - if (type==="ooslide") { + if (type==="presentation") { ext = ['.pptx', /*'.odp',*/ '.bin']; - } else if (type==="oodoc") { + } else if (type==="doc") { ext = ['.docx', /*'.odt',*/ '.bin']; } @@ -2068,10 +2068,10 @@ define([ case 'sheet' : newText = EmptyCell(useNewDefault); break; - case 'oodoc': + case 'doc': newText = EmptyDoc(); break; - case 'ooslide': + case 'presentation': newText = EmptySlide(); break; default: @@ -2431,9 +2431,9 @@ define([ var type = privateData.ooType; var accept = [".bin", ".ods", ".xlsx"]; - if (type === "ooslide") { + if (type === "presentation") { accept = ['.bin', '.odp', '.pptx']; - } else if (type === "oodoc") { + } else if (type === "doc") { accept = ['.bin', '.odt', '.docx']; } if (!supportsXLSX()) { diff --git a/www/oodoc/index.html b/www/oodoc/index.html deleted file mode 100644 index 321b16709..000000000 --- a/www/oodoc/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - CryptPad - - - - - - - - diff --git a/www/oodoc/inner.html b/www/oodoc/inner.html deleted file mode 100644 index 1891839ff..000000000 --- a/www/oodoc/inner.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - -
-
-
-
- -
-
- - diff --git a/www/ooslide/index.html b/www/ooslide/index.html deleted file mode 100644 index 321b16709..000000000 --- a/www/ooslide/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - CryptPad - - - - - - - - diff --git a/www/ooslide/inner.html b/www/ooslide/inner.html deleted file mode 100644 index 53833e600..000000000 --- a/www/ooslide/inner.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - -
-
-
-
- -
-
- -