infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Rename ooslide and oodoc

Browse Source
pull/1/head
yflory 4 years ago
parent 38b5be92d0
commit b108960d67
10 changed files with 25 additions and 87 deletions
Show Stats Download Patch File Download Diff File

4
customize.dist/src/less2/include/colortheme-dark.less
Unescape Escape View File

@ -13,8 +13,8 @@
whiteboard: #a72ba7;
kanban: #8C4;
sheet: #40865c;
oodoc: #5170B5;
ooslide: #C65D27;
doc: #5170B5;
presentation: #C65D27;
file: #CD2532;
}

4
customize.dist/src/less2/include/colortheme.less
Unescape Escape View File

@ -13,8 +13,8 @@
whiteboard: #a72ba7;
kanban: #8C4;
sheet: #40865c;
oodoc: #5170B5;
ooslide: #C65D27;
doc: #5170B5;
presentation: #C65D27;
file: #CD2532;
}

2
server.js
Unescape Escape View File

@ -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;

6
www/common/application_config_internal.js
Unescape Escape View File

@ -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',

10
www/common/onlyoffice/app-oo.less
Unescape Escape View File

@ -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],
);
}

24
www/common/onlyoffice/inner.js
Unescape Escape View File

@ -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()) {

12
www/oodoc/index.html
Unescape Escape View File

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head>
<body>
<iframe-placeholder>

19
www/oodoc/inner.html
Unescape Escape View File

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html class="cp-app-noscroll">
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script async data-bootload="/common/onlyoffice/inner.js" data-main="/common/sframe-boot.js?ver=1.7" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<style>
.loading-hidden { display: none; }
</style>
</head>
<body class="cp-app-oodoc">
<div id="cp-toolbar" class="cp-toolbar-container"></div>
<div id="cp-app-oo-container">
<div id="cp-app-oo-editor">
<div id="cp-app-oo-placeholder-a"></div>
<!--<script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>-->
</div>
</div>
</body>

12
www/ooslide/index.html
Unescape Escape View File

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head>
<body>
<iframe-placeholder>

19
www/ooslide/inner.html
Unescape Escape View File

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html class="cp-app-noscroll">
<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script async data-bootload="/common/onlyoffice/inner.js" data-main="/common/sframe-boot.js?ver=1.7" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<style>
.loading-hidden { display: none; }
</style>
</head>
<body class="cp-app-ooslide">
<div id="cp-toolbar" class="cp-toolbar-container"></div>
<div id="cp-app-oo-container">
<div id="cp-app-oo-editor">
<div id="cp-app-oo-placeholder-a"></div>
<!--<script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>-->
</div>
</div>
</body>
Write Preview
Loading…
Cancel
Save