Compare commits

..

5 Commits

Author SHA1 Message Date
d5466f1070 v5.4.1 2019-10-02 12:02:38 +03:00
79d5682a02 Fix #63 - backUrl with custom port 2019-09-25 15:09:50 +03:00
584fb155b7 nodejs: fix style with blockcontent mode 2019-09-23 16:32:14 +03:00
1217de89b3 Add 'blockcontent' mode 2019-09-04 18:15:06 +03:00
118a4d74b0 v5.4.0 2019-09-03 14:37:39 +03:00
5 changed files with 15 additions and 7 deletions

View File

@ -616,14 +616,15 @@ 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(),
backUrl: docManager.getServerUrl() + "/",
curUserHostAddress: docManager.curUserHostAddress(),
lang: lang,
userid: userid,

Binary file not shown.

After

Width:  |  Height:  |  Size: 897 B

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;

View File

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

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>
<% } %>