diff --git a/CHANGELOG.md b/CHANGELOG.md index 022e80ff..62cff6a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Change Log +- csharp-mvc: filling by default - java-spring: filling by default - php: filling by default - python: filling by default - ruby: filling by default +- csharp-mvc: creating and editing pdf instead docxf - java-spring: creating and editing pdf instead docxf - php: creating and editing pdf instead docxf - python: creating and editing pdf instead docxf diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg deleted file mode 100644 index ab5f0268..00000000 --- a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_pdf.svg b/web/documentserver-example/csharp-mvc/Content/images/file_pdf.svg new file mode 100644 index 00000000..33694e18 --- /dev/null +++ b/web/documentserver-example/csharp-mvc/Content/images/file_pdf.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/web/documentserver-example/csharp-mvc/Content/images/icon_pdf.svg b/web/documentserver-example/csharp-mvc/Content/images/icon_pdf.svg new file mode 100644 index 00000000..1867081a --- /dev/null +++ b/web/documentserver-example/csharp-mvc/Content/images/icon_pdf.svg @@ -0,0 +1 @@ + \ 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 962a6f29..2de064da 100644 --- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css +++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css @@ -172,7 +172,7 @@ label .checkbox { } .try-editor.form { - background-image: url("images/file_docxf.svg"); + background-image: url("images/file_pdf.svg"); } .side-option { @@ -536,6 +536,11 @@ footer table tr td:first-child { background-image: url("images/icon_pptx.svg"); } +.stored-edit.pdf, +.uploadFileName.pdf { + background-image: url("images/icon_pdf.svg"); +} + .stored-edit span { font-size: 12px; line-height: 12px; diff --git a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs index 36798a4e..eb39e565 100644 --- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs +++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs @@ -95,7 +95,7 @@ namespace OnlineEditorsExampleMVC.Controllers var id = Request.Cookies.GetOrDefault("uid", null); var user = Users.getUser(id); DocManagerHelper.CreateMeta(fileName, user.id, user.name); // create meta information for the sample document - Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName })); + Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName, editorsMode="edit" })); return null; } } diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index b88a060a..29147473 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -77,18 +77,19 @@ namespace OnlineEditorsExampleMVC.Models var jss = new JavaScriptSerializer(); var ext = Path.GetExtension(FileName).ToLower(); // get file extension - var editorsMode = Mode ?? "edit"; // get editor mode + var canFill = DocManagerHelper.FillFormExts.Contains(ext); + var editorsMode = Mode ?? (canFill ? "fillForms" : "edit"); // get editor mode var canEdit = DocManagerHelper.EditedExts.Contains(ext); // check if the file with such an extension can be edited var id = request.Cookies.GetOrDefault("uid", null); var user = Users.getUser(id); // get the user - if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) { + if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && canFill) { editorsMode = "fillForms"; canEdit = true; } - var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1"); // check if the Submit form button is displayed or not + var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1"); // check if the Submit form button is displayed or not var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // set the mode parameter: change it to view if the document can't be edited // favorite icon state diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index 99b2357d..e55797fb 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -33,7 +33,8 @@ namespace OnlineEditorsExampleMVC.Models { Word, Cell, - Slide + Slide, + Pdf } // get file type @@ -41,6 +42,7 @@ namespace OnlineEditorsExampleMVC.Models { var ext = Path.GetExtension(fileName).ToLower(); + if (FormatManager.PdfExtensions().Contains(ext)) return FileType.Pdf; // pdf type for document extensions if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word; // word type for document extensions if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell; // cell type for spreadsheet extensions if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide; // slide type for presentation extensions @@ -185,6 +187,20 @@ namespace OnlineEditorsExampleMVC.Models .ToList(); } + public static List PdfExtensions() + { + return Pdfs() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Pdfs() + { + return All() + .Where(format => format.Type == FileType.Pdf) + .ToList(); + } + public static List AllExtensions() { return All() diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx index 4979bcbe..421f7c2c 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx @@ -80,7 +80,7 @@ Presentation
  • - PDF form + PDF form