pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/v5.4.1' into develop

Browse Source
This commit is contained in:
Sergey Linnik
2019-09-23 16:32:48 +03:00
parent 95a15661d0 584fb155b7
commit c0366c0134
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/documentserver-example/nodejs/app.js
View File

@ -616,11 +616,12 @@ app.get("/editor", function (req, res) {
key: key,
token: "",
callbackUrl: docManager.getCallback(fileName),
isEdit: canEdit && (mode == "edit" || mode == "filter"),
isEdit: canEdit && (mode == "edit" || mode == "filter" || mode == "blockcontent"),
review: mode == "edit" || mode == "review",
comment: mode != "view" && mode != "fillForms" && mode != "embedded",
fillForms: mode != "view" && mode != "comment" && mode != "embedded",
comment: mode != "view" && mode != "fillForms" && mode != "embedded" && mode != "blockcontent",
fillForms: mode != "view" && mode != "comment" && mode != "embedded" && mode != "blockcontent",
modifyFilter: mode != "filter",
modifyContentControl: mode != "blockcontent",
mode: canEdit && mode != "view" ? "edit" : "view",
canBackToFolder: type != "embedded",
backUrl: docManager.getServerUrl(),

BIN
web/documentserver-example/nodejs/public/images/block-content.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 B

2
web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
View File

@ -290,7 +290,7 @@ footer {
background-repeat: no-repeat;
display: inline-block;
height: 16px;
max-width: 250px;
max-width: 200px;
margin-bottom: -6px;
overflow: hidden;
padding: 8px 0 1px 34px;

1
web/documentserver-example/nodejs/views/config.ejs
View File

@ -18,6 +18,7 @@
"edit": <%- editor.isEdit %>,
"fillForms": <%- editor.fillForms %>,
"modifyFilter": <%- editor.modifyFilter %>,
"modifyContentControl": <%- editor.modifyContentControl %>,
"review": <%- editor.review %>
}
},

10
web/documentserver-example/nodejs/views/index.ejs
View File

@ -143,7 +143,7 @@
<thead>
<tr class="tableHeader">
<td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
<td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
<td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
<td colspan="3" class="tableHeaderCell">Viewers</td>
</tr>
</thead>
@ -180,12 +180,18 @@
<a href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
<img src="images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment" /></a>
</td>
<td class="contentCells contentCells-shift contentCells-icon">
<td class="contentCells contentCells-icon">
<% if (storedFiles[i].documentType == "text") { %>
<a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
<img src="images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
<% } %>
</td>
<td class="contentCells contentCells-shift contentCells-icon">
<% if (storedFiles[i].documentType == "text") { %>
<a href="editor?type=desktop&mode=blockcontent&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
<img src="images/block-content.png" alt="Open in editor without content control modification" title="Open in editor without content control modification" /></a>
<% } %>
</td>
<% } else { %>
<td class="contentCells contentCells-shift contentCells-icon" colspan="5"></td>
<% } %>