diff --git a/web/documentserver-example/csharp-mvc/Content/images/logo.png b/web/documentserver-example/csharp-mvc/Content/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/csharp-mvc/Content/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/csharp-mvc/Content/images/logo.svg b/web/documentserver-example/csharp-mvc/Content/images/logo.svg new file mode 100644 index 00000000..fafbb3a7 --- /dev/null +++ b/web/documentserver-example/csharp-mvc/Content/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css index 73798b57..fffb3d1d 100644 --- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css +++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css @@ -44,10 +44,13 @@ a, a:hover, a:visited { .top-panel { - background: url("images/logo.png") no-repeat 30px center #3D4A6B; + background: #3D4A6B; height: 80px; width: 100%; } +.top-panel img { + margin: 12px 0 0 16px; +} .main-panel { margin: 80px auto; width: 600px; diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index e037e48c..f0bd0310 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -64,6 +64,12 @@ namespace OnlineEditorsExampleMVC.Models var canEdit = DocManagerHelper.EditedExts.Contains(ext); var mode = canEdit && editorsMode != "view" ? "edit" : "view"; + object favorite = null; + if (!string.IsNullOrEmpty(request.Cookies.GetOrDefault("uid", null))) + { + favorite = request.Cookies.GetOrDefault("uid", null).Equals("uid-2"); + } + var actionLink = request.GetOrDefault("actionLink", null); var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink); @@ -82,7 +88,8 @@ namespace OnlineEditorsExampleMVC.Models "info", new Dictionary { { "author", "Me" }, - { "created", DateTime.Now.ToShortDateString() } + { "created", DateTime.Now.ToShortDateString() }, + { "favorite", favorite} } }, { diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index e144c0c1..f13a48a0 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -104,6 +104,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var config = <%= Model.GetDocConfig(Request, Url) %>; config.width = "100%"; @@ -116,6 +123,7 @@ 'onError': onError, 'onOutdatedVersion': onOutdatedVersion, "onMakeActionLink": onMakeActionLink, + "onMetaChange": onMetaChange, "onRequestInsertImage": onRequestInsertImage, }; diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx index c5865148..07f78ea1 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx @@ -37,7 +37,11 @@ <%: Styles.Render("~/Content/css") %> -
+
+ + ONLYOFFICE + +
ONLYOFFICE Document Editors
diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index 966deef0..8f203b8b 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -11,7 +11,7 @@ - + diff --git a/web/documentserver-example/csharp/App_Themes/images/logo.png b/web/documentserver-example/csharp/App_Themes/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/csharp/App_Themes/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/csharp/App_Themes/images/logo.svg b/web/documentserver-example/csharp/App_Themes/images/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/csharp/App_Themes/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/csharp/App_Themes/stylesheet.css b/web/documentserver-example/csharp/App_Themes/stylesheet.css index 00c390d8..e0c498b1 100644 --- a/web/documentserver-example/csharp/App_Themes/stylesheet.css +++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css @@ -44,10 +44,13 @@ a, a:hover, a:visited { .top-panel { - background: url("images/logo.png") no-repeat 30px center #3D4A6B; + background: #3D4A6B; height: 80px; width: 100%; } +.top-panel img { + margin: 12px 0 0 16px; +} .main-panel { margin: 80px auto; width: 600px; diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx index f9eda455..0bd783a6 100644 --- a/web/documentserver-example/csharp/Default.aspx +++ b/web/documentserver-example/csharp/Default.aspx @@ -57,7 +57,11 @@
-
+
+ + ONLYOFFICE + +
ONLYOFFICE Document Editors
diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index 77f86ea7..44be787e 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -121,6 +121,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var config = <%= DocConfig %>; config.width = "100%"; @@ -133,6 +140,7 @@ 'onError': onError, 'onOutdatedVersion': onOutdatedVersion, 'onMakeActionLink': onMakeActionLink, + 'onMetaChange': onMetaChange, 'onRequestInsertImage': onRequestInsertImage, }; diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 4b3301db..9ab5aefa 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -100,6 +100,12 @@ namespace OnlineEditorsExample var jss = new JavaScriptSerializer(); + object favorite = null; + if (!string.IsNullOrEmpty(Request.Cookies.GetOrDefault("uid", null))) + { + favorite = Request.Cookies.GetOrDefault("uid", null).Equals("uid-2"); + } + var actionLink = Request.GetOrDefault("actionLink", null); var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink); @@ -118,7 +124,8 @@ namespace OnlineEditorsExample "info", new Dictionary { { "author", "Me" }, - { "created", DateTime.Now.ToShortDateString() } + { "created", DateTime.Now.ToShortDateString() }, + { "favorite", favorite } } }, { diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 2f667a6e..7a8b27a1 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -7,7 +7,7 @@ - + diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index 53840daf..00aed9ca 100644 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -57,6 +57,8 @@ public class FileModel document.url = DocumentManager.GetFileUri(fileName); document.fileType = FileUtility.GetFileExtension(fileName).replace(".", ""); document.key = ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + fileName + "/" + Long.toString(new File(DocumentManager.StoragePath(fileName, null)).lastModified())); + document.info = new Info(); + document.info.favorite = uid != null && !uid.isEmpty() ? uid.equals("uid-2") : null; editorConfig = new EditorConfig(actionData); editorConfig.callbackUrl = DocumentManager.GetCallback(fileName); @@ -193,6 +195,7 @@ public class FileModel public String url; public String fileType; public String key; + public Info info; public Permissions permissions; } @@ -218,6 +221,11 @@ public class FileModel } } + public class Info + { + Boolean favorite; + } + public class EditorConfig { public HashMap actionLink = null; diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 3836517f..b69cb3f0 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -3,7 +3,7 @@ storage-folder=app_data files.docservice.viewed-docs=.pdf|.djvu|.xps files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt -files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub +files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub|.fb2 files.docservice.timeout=120000 files.docservice.url.converter=https://documentserver/ConvertService.ashx diff --git a/web/documentserver-example/java/src/main/webapp/css/img/logo.png b/web/documentserver-example/java/src/main/webapp/css/img/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/java/src/main/webapp/css/img/logo.png and /dev/null differ diff --git a/web/documentserver-example/java/src/main/webapp/css/img/logo.svg b/web/documentserver-example/java/src/main/webapp/css/img/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/java/src/main/webapp/css/img/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css index a02a487a..a8bdaa9e 100644 --- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css +++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css @@ -44,10 +44,13 @@ a, a:hover, a:visited { .top-panel { - background: url("img/logo.png") no-repeat 30px center #3D4A6B; + background: #3D4A6B; height: 80px; width: 100%; } +.top-panel img { + margin: 12px 0 0 16px; +} .main-panel { margin: 80px auto; width: 600px; diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index 5bf65118..9b5f4d00 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -86,6 +86,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var onRequestInsertImage = function(event) { docEditor.insertImage({ "c": event.data.c, @@ -103,6 +110,7 @@ "onError": onError, "onOutdatedVersion": onOutdatedVersion, "onMakeActionLink": onMakeActionLink, + "onMetaChange": onMetaChange, "onRequestInsertImage": onRequestInsertImage, }; diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp index 35dfdd6b..a6454a9a 100644 --- a/web/documentserver-example/java/src/main/webapp/index.jsp +++ b/web/documentserver-example/java/src/main/webapp/index.jsp @@ -35,7 +35,11 @@ -
+
+ + ONLYOFFICE + +
ONLYOFFICE Document Editors diff --git a/web/documentserver-example/js/OnlineEditorsExampleJS.html b/web/documentserver-example/js/OnlineEditorsExampleJS.html index 191b821b..8c691754 100644 --- a/web/documentserver-example/js/OnlineEditorsExampleJS.html +++ b/web/documentserver-example/js/OnlineEditorsExampleJS.html @@ -31,7 +31,11 @@
-
+
+ + ONLYOFFICE + +
ONLYOFFICE Document Editors
diff --git a/web/documentserver-example/js/logo.png b/web/documentserver-example/js/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/js/logo.png and /dev/null differ diff --git a/web/documentserver-example/js/logo.svg b/web/documentserver-example/js/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/js/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/js/stylesheet.css b/web/documentserver-example/js/stylesheet.css index 04d7b14f..46939494 100644 --- a/web/documentserver-example/js/stylesheet.css +++ b/web/documentserver-example/js/stylesheet.css @@ -41,10 +41,13 @@ div { .top-panel { - background: url("logo.png") no-repeat 30px center #3D4A6B; + background: #3D4A6B; height: 80px; width: 100%; } +.top-panel img{ + margin: 12px 0 0 16px; +} .main-panel { margin: 105px auto 0; width: 350px; diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index eb22ffa6..744badfb 100644 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -123,7 +123,7 @@ app.get("/download", function(req, res) { } res.setHeader("Content-Length", fileSystem.statSync(path).size); - res.setHeader("Content-Type", mime.lookup(path)); + res.setHeader("Content-Type", mime.getType(path)); res.setHeader("Content-Disposition", "attachment; filename*=UTF-8\'\'" + encodeURIComponent(fileName)); @@ -627,7 +627,8 @@ app.get("/editor", function (req, res) { ext: fileUtility.getFileExtension(fileName, true), uri: url, version: countVersion, - created: new Date().toDateString() + created: new Date().toDateString(), + favorite: req.query.userid ? req.query.userid === "uid-2" : "null" }, editor: { type: type, diff --git a/web/documentserver-example/nodejs/public/images/logo.png b/web/documentserver-example/nodejs/public/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/nodejs/public/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/nodejs/public/images/logo.svg b/web/documentserver-example/nodejs/public/images/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/nodejs/public/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/nodejs/views/config.ejs b/web/documentserver-example/nodejs/views/config.ejs index 41de5658..ec5925a3 100644 --- a/web/documentserver-example/nodejs/views/config.ejs +++ b/web/documentserver-example/nodejs/views/config.ejs @@ -10,7 +10,8 @@ "key": "<%- editor.key %>", "info": { "author": "Me", - "created": "<%- file.created %>" + "created": "<%- file.created %>", + "favorite": <%- file.favorite %> }, "permissions": { "comment": <%- editor.comment %>, diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index e054b9c2..9816032c 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -53,6 +53,13 @@ document.title = title + (event.data ? "*" : ""); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var onRequestEditRights = function () { location.href = location.href.replace(RegExp("mode=view\&?", "i"), ""); }; @@ -129,6 +136,7 @@ "onRequestHistoryClose": onRequestHistoryClose, "onOutdatedVersion": onOutdatedVersion, "onMakeActionLink": onMakeActionLink, + "onMetaChange": onMetaChange "onRequestInsertImage": onRequestInsertImage, } }); diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs index 5a27cf20..a9059358 100644 --- a/web/documentserver-example/nodejs/views/index.ejs +++ b/web/documentserver-example/nodejs/views/index.ejs @@ -31,7 +31,7 @@
- ONLYOFFICE + ONLYOFFICE
diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php index b1bd5eed..b8c43445 100644 --- a/web/documentserver-example/php/config.php +++ b/web/documentserver-example/php/config.php @@ -6,7 +6,7 @@ $GLOBALS['ALONE'] = FALSE; $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps"); $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt"); -$GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub"); +$GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub", ".fb2"); $GLOBALS['DOC_SERV_TIMEOUT'] = "120000"; diff --git a/web/documentserver-example/php/css/images/logo.png b/web/documentserver-example/php/css/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/php/css/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/php/css/images/logo.svg b/web/documentserver-example/php/css/images/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/php/css/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php index ad4faae5..e4d7d2cf 100644 --- a/web/documentserver-example/php/doceditor.php +++ b/web/documentserver-example/php/doceditor.php @@ -77,7 +77,8 @@ "key" => $docKey, "info" => [ "author" => "Me", - "created" => date('d.m.y') + "created" => date('d.m.y'), + "favorite" => isset($_GET["user"]) ? $_GET["user"] == 1 : null ], "permissions" => [ "comment" => $editorsMode != "view" && $editorsMode != "fillForms" && $editorsMode != "embedded" && $editorsMode != "blockcontent", @@ -314,6 +315,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var onRequestInsertImage = function(event) { docEditor.insertImage({ "c": event.data.c, @@ -341,6 +349,7 @@ 'onError': onError, 'onOutdatedVersion': onOutdatedVersion, 'onMakeActionLink': onMakeActionLink, + 'onMetaChange': onMetaChange, 'onRequestInsertImage': onRequestInsertImage, }; diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php index 2f861064..43a4aeee 100644 --- a/web/documentserver-example/php/index.php +++ b/web/documentserver-example/php/index.php @@ -60,7 +60,7 @@
- ONLYOFFICE + ONLYOFFICE
diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py index 13254ec5..2cc0b906 100644 --- a/web/documentserver-example/python/config.py +++ b/web/documentserver-example/python/config.py @@ -10,7 +10,7 @@ DOC_SERV_CONVERT = [ ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", - ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub" + ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub", ".fb2" ] DOC_SERV_TIMEOUT = 120000 diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index e950e091..de617f88 100644 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -141,7 +141,7 @@ def edit(request): 'author': 'Me', 'created': datetime.today().strftime('%d.%m.%Y %H:%M:%S') } - + infObj['favorite'] = request.COOKIES.get('uid') == 'uid-2' if request.COOKIES.get('uid') else None edConfig = { 'type': edType, 'documentType': fileType, diff --git a/web/documentserver-example/python/static/images/logo.png b/web/documentserver-example/python/static/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/python/static/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/python/static/images/logo.svg b/web/documentserver-example/python/static/images/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/python/static/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index bb73ca5e..2cb333db 100644 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -99,6 +99,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var onRequestInsertImage = function(event) { docEditor.insertImage({ "c": event.data.c, @@ -118,6 +125,7 @@ 'onError': onError, 'onOutdatedVersion': onOutdatedVersion, 'onMakeActionLink': onMakeActionLink, + 'onMetaChange': onMetaChange, 'onRequestInsertImage': onRequestInsertImage, }; diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html index 3e6e5075..0264fec1 100644 --- a/web/documentserver-example/python/templates/index.html +++ b/web/documentserver-example/python/templates/index.html @@ -42,7 +42,7 @@
- ONLYOFFICE + ONLYOFFICE
diff --git a/web/documentserver-example/ruby/app/assets/images/logo.png b/web/documentserver-example/ruby/app/assets/images/logo.png deleted file mode 100644 index a1d4b639..00000000 Binary files a/web/documentserver-example/ruby/app/assets/images/logo.png and /dev/null differ diff --git a/web/documentserver-example/ruby/app/assets/images/logo.svg b/web/documentserver-example/ruby/app/assets/images/logo.svg new file mode 100644 index 00000000..eaace216 --- /dev/null +++ b/web/documentserver-example/ruby/app/assets/images/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss index 40fa7415..8cd60fd0 100644 --- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss +++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss @@ -44,10 +44,13 @@ a, a:hover, a:visited { .top-panel { - background: url("logo.png") no-repeat 30px center #3D4A6B; + background: #3D4A6B; height: 80px; width: 100%; } +.top-panel img{ + margin: 12px 0 0 16px; +} .main-panel { margin: 80px auto; width: 600px; diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index a7d2873c..24a332b6 100644 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -75,6 +75,7 @@ class FileModel :info => { :author => "Me", :created => Time.now.to_s, + :favorite => @user_id ? @user_id.eql?("uid-2") : nil }, :permissions => { :comment => !editorsmode.eql?("view") && !editorsmode.eql?("fillForms") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index af31b73a..00d9fa05 100644 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -76,6 +76,13 @@ docEditor.setActionLink(replaceActionLink(location.href, linkParam)); }; + var onMetaChange = function (event) { + var favorite = !!event.data.favorite; + var title = document.title.replace(/^\☆/g, ""); + document.title = (favorite ? "☆" : "") + title; + docEditor.setFavorite(favorite); + }; + var onRequestInsertImage = function(event) { docEditor.insertImage({ "c": event.data.c, @@ -95,6 +102,7 @@ 'onError': onError, 'onOutdatedVersion': onOutdatedVersion, 'onMakeActionLink': onMakeActionLink, + 'onMetaChange': onMetaChange 'onRequestInsertImage': onRequestInsertImage, }; diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb index a5fa281d..8b968e6e 100644 --- a/web/documentserver-example/ruby/app/views/home/index.html.erb +++ b/web/documentserver-example/ruby/app/views/home/index.html.erb @@ -14,7 +14,11 @@ limitations under the License. %> -
+
+ + ONLYOFFICE + +
ONLYOFFICE Document Editors
diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index b07e55f4..930df7c5 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -34,7 +34,7 @@ module OnlineEditorsExampleRuby Rails.configuration.viewedDocs=".pdf|.djvu|.xps" Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt" - Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub" + Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub|.fb2" Rails.configuration.urlConverter="https://documentserver/ConvertService.ashx" Rails.configuration.urlApi="https://documentserver/web-apps/apps/api/documents/api.js"