diff --git a/web/documentserver-example/csharp-mvc/App_Data/new.docx b/web/documentserver-example/csharp-mvc/App_Data/new.docx new file mode 100644 index 00000000..99c1e6ed Binary files /dev/null and b/web/documentserver-example/csharp-mvc/App_Data/new.docx differ diff --git a/web/documentserver-example/csharp-mvc/App_Data/new.pptx b/web/documentserver-example/csharp-mvc/App_Data/new.pptx new file mode 100644 index 00000000..f4e4bdf0 Binary files /dev/null and b/web/documentserver-example/csharp-mvc/App_Data/new.pptx differ diff --git a/web/documentserver-example/csharp-mvc/App_Data/new.xlsx b/web/documentserver-example/csharp-mvc/App_Data/new.xlsx new file mode 100644 index 00000000..4bc868db Binary files /dev/null and b/web/documentserver-example/csharp-mvc/App_Data/new.xlsx differ diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_upload.png b/web/documentserver-example/csharp-mvc/Content/images/file_upload.png new file mode 100644 index 00000000..5566e6dd Binary files /dev/null and b/web/documentserver-example/csharp-mvc/Content/images/file_upload.png differ diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css index 6c96d643..48a324e6 100644 --- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css +++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css @@ -113,13 +113,14 @@ label .checkbox { .try-editor-list { list-style: none; - margin: 0; + margin: 0 0 16px; padding: 0; } .try-editor-list li { float: left; - margin: 25px; - width: 150px; + margin: 0 15px; + width: 100px; + cursor: pointer; } .try-editor { background-color: transparent; @@ -143,6 +144,11 @@ label .checkbox { background-image: url("images/file_pptx.png"); } +.create-sample { + display: inline-block; + margin-left: 75px; +} + .button, .button:visited, .button:hover, .button:active { display: inline-block; font-weight: normal; @@ -185,25 +191,43 @@ label .checkbox { border: 1px solid #E9EAEA; } +.upload-panel { + border-right: 1px solid #D1D1D1; + float: left; + margin-right: 25px; +} + .file-upload { + background: url("images/file_upload.png") no-repeat center 0 transparent; cursor: pointer; - margin-bottom: 8px; - padding: 0 !important; + display: inline-block; + font-size: 14px; + font-weight: bold; + height: 45px; + margin: 0 40px 16px; overflow: hidden; + padding-top: 100px; position: relative; + text-align: center; + width: 100px; } -.file-upload span { - line-height: 21px; - margin: 2px 12px; + + .file-upload input { + cursor: pointer; + opacity: 0; + position: absolute; + right: 0; + top: 0; + transform: translate(555px, 60px) scale(8); + } + +.create-panel { + float: left; } -.file-upload input { - cursor: pointer; - font-size: 23px; - opacity: 0; - position: absolute; - right: 0; - top: 0; - transform: translate(-300px, 0) scale(4); + +.upload-panel, +.create-panel { + padding: 10px 0; } #mainProgress { @@ -370,4 +394,12 @@ label .checkbox { -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); -webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.5); padding: 0 !important; +} + +.clearFix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs index 45580dee..5bee3fe3 100644 --- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs +++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs @@ -50,9 +50,9 @@ namespace OnlineEditorsExampleMVC.Controllers return View("Editor", file); } - public ActionResult Sample(string fileExt) + public ActionResult Sample(string fileExt, bool? sample) { - var fileName = DocManagerHelper.CreateDemo(fileExt); + var fileName = DocManagerHelper.CreateDemo(fileExt, sample ?? false); Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName })); return null; } diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs index 3b9a1a88..8ab0fa8e 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs @@ -106,9 +106,9 @@ namespace OnlineEditorsExampleMVC.Helpers return storedFiles; } - public static string CreateDemo(string fileExt) + public static string CreateDemo(string fileExt, bool withContent) { - var demoName = "sample." + fileExt; + var demoName = (withContent ? "sample." : "new.") + fileExt; var fileName = GetCorrectName(demoName); diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index b5db222b..85a06af8 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -152,6 +152,7 @@ + diff --git a/web/documentserver-example/csharp-mvc/Scripts/jscript.js b/web/documentserver-example/csharp-mvc/Scripts/jscript.js index c56ae469..5635ad82 100644 --- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js +++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js @@ -91,11 +91,6 @@ if (typeof jQuery != "undefined") { return; } - if (jq("#checkOriginalFormat").is(":checked")) { - loadScripts(); - return; - } - timer = setTimeout(function () { var requestAddress = UrlConverter + "&filename=" + encodeURIComponent(jq("#hiddenFileName").val()); @@ -194,6 +189,18 @@ if (typeof jQuery != "undefined") { jq.unblockUI(); }); + jq(document).on("click", ".try-editor", function (e) { + var url = jq(".try-editor-list")[0].attributes["data-link"].value; + url += "?fileExt=" + e.target.attributes["data-type"].value; + if (jq("#createSample").is(":checked")) { + url += "&sample=true"; + } + var w = window.open(url, "_blank"); + w.onload = function () { + window.location.reload(); + } + }); + jq.dropdownToggle({ switcherSelector: ".question", dropdownID: "hint" diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx index 1b382a7d..03b47617 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx @@ -53,24 +53,32 @@
Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC. -
- Choose file - " /> +
+ Upload your file or create new file +
+
+
+ +
+ + +
+
- - -
-
-
- You are also enabled to view and edit documents pre-uploaded to the portal. - - <% var storedFiles = DocManagerHelper.GetStoredFiles(); if (storedFiles.Any())