From 3624fc9b06eb18650f4401286ff0bca1b518cd76 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 30 Mar 2016 11:20:40 +0300 Subject: [PATCH 1/4] nodejs: creating new doc --- web/documentserver-example/nodejs/views/index.ejs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs index 62d64ff7..0a8bef9a 100644 --- a/web/documentserver-example/nodejs/views/index.ejs +++ b/web/documentserver-example/nodejs/views/index.ejs @@ -97,17 +97,17 @@ - + <% if (storedFiles.length > 0) { %> From d3c450ba1b2c1d1d5f8724759d66c86f436ffa2d Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 30 Mar 2016 13:41:52 +0300 Subject: [PATCH 2/4] nodejs: create with sample via checkbox --- .../nodejs/public/javascripts/jscript.js | 12 ++++ .../nodejs/public/stylesheets/stylesheet.css | 3 +- .../nodejs/views/index.ejs | 64 +++---------------- 3 files changed, 22 insertions(+), 57 deletions(-) diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js index 2d07b542..dbc2ae20 100644 --- a/web/documentserver-example/nodejs/public/javascripts/jscript.js +++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js @@ -278,6 +278,18 @@ if (typeof jQuery != "undefined") { }); }); + jq("#createSample").click(function () { + jq(".try-editor").each(function () { + var href = jq(this).attr("href"); + if (jq("#createSample").is(":checked")) { + href = href.replace("&create=true", ""); + } else { + href += "&create=true"; + } + jq(this).attr("href", href); + }); + }); + jq.dropdownToggle({ switcherSelector: ".question", dropdownID: "hint" diff --git a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css index 43d9e617..35c3e558 100644 --- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css +++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css @@ -421,6 +421,7 @@ footer { cursor: default; font-family: 'Open Sans', sans-serif; font-size: 13px; + height: 40px; -khtml-user-select: none; user-select: none; -moz-user-select: none; @@ -434,7 +435,7 @@ footer { text-align: left; } .contentCells { - padding: 2px 1px 2px 5px; + padding: 4px 1px 4px 5px; font-family: 'Open Sans', sans-serif; font-size: 16px; border-bottom: 1px solid #e5e5e5; diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs index 0a8bef9a..4f023781 100644 --- a/web/documentserver-example/nodejs/views/index.ejs +++ b/web/documentserver-example/nodejs/views/index.ejs @@ -97,66 +97,20 @@ - -
- Sample documents -
-
-
-
- - - - - - - - - - <% - var listDemo = [{ext:"docx", type:"text"}, {ext:"xlsx", type:"spreadsheet"}, {ext:"pptx", type:"presentation"}]; - for (var i = 0; i < listDemo.length; i++) { %> - - - - - - - - - <% } %> - -
FilenameEditorsViewers
- - sample.docx - - - editor - - - mobile editor - - - viewer - - - mobile viewer - - - embedded -
-
-
-
+ +
+
<% if (storedFiles.length > 0) { %> @@ -166,7 +120,6 @@

-
@@ -210,7 +163,6 @@ <% } %>
-
<% } %> From eafe3adba66ef45720a4fe6b51d0315cce4d9827 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 30 Mar 2016 14:50:12 +0300 Subject: [PATCH 3/4] nodejs: create url without parameters --- web/documentserver-example/nodejs/app.js | 2 +- .../nodejs/public/javascripts/jscript.js | 4 ++-- web/documentserver-example/nodejs/views/index.ejs | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 815e8b83..7f3a1ded 100644 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -384,7 +384,7 @@ app.get("/editor", function (req, res) { var lastname = req.query.lastname ? req.query.lastname : "Smith"; if (fileExt != null) { - var fileName = docManager.createDemo((req.query.create ? "new." : "sample.") + fileExt, userid, firstname + " " + lastname); + var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, firstname + " " + lastname); var redirectPath = docManager.getProtocol() + "://" + docManager.req.get("host") + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams(); res.redirect(redirectPath); diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js index dbc2ae20..e6deeb36 100644 --- a/web/documentserver-example/nodejs/public/javascripts/jscript.js +++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js @@ -282,9 +282,9 @@ if (typeof jQuery != "undefined") { jq(".try-editor").each(function () { var href = jq(this).attr("href"); if (jq("#createSample").is(":checked")) { - href = href.replace("&create=true", ""); + href += "&sample=true"; } else { - href += "&create=true"; + href = href.replace("&sample=true", ""); } jq(this).attr("href", href); }); diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs index 4f023781..c4f6110f 100644 --- a/web/documentserver-example/nodejs/views/index.ejs +++ b/web/documentserver-example/nodejs/views/index.ejs @@ -38,7 +38,7 @@
- + ONLYOFFICE™
@@ -97,13 +97,13 @@