diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css index 65108355..ae360b0b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css @@ -102,6 +102,7 @@ tr.selected-file { #summary.summary { font-size: 11px; color: rgb(152, 152, 152); + word-wrap: break-word; } .drag-and-drop-area input { @@ -266,7 +267,7 @@ tr.selected-file { margin-top: 15px; } -#processDialog .dialog-text { +#processDialog .dialog-text, .container .dialog-text{ display: inline-block; margin-left: 10px; } @@ -275,6 +276,15 @@ tr.selected-file { width: 200px; } +.dataTables_processing { + width: 165px !important; + margin: 0 !important;; + padding: 0 !important;; + left: 43% !important;; + background: initial !important;; + background-color: #FFFFFF !important;; +} + .breadcrumb-wsp { display: inline-block; padding-top: 5px; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs index 4f709e53..bf79329a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs @@ -325,7 +325,7 @@ namespace WebsitePanel.WebDavPortal.Controllers [HttpPost] public JsonResult ItemExist(string org, string pathPart, string newItemName) { - var exist = _webdavManager.FileExist(string.Format("{0}/{1}", pathPart, newItemName)); + var exist = _webdavManager.FileExist(string.Format("{0}/{1}", pathPart.TrimEnd('/'), newItemName.Trim('/'))); return new JsonResult() { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js index d7a33633..5849d557 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js @@ -11,7 +11,8 @@ } , createNewItemDialogId: "#createNewItemDialog", createNewItemButtonId: "#create-button", - createNewItemTitleId: '#create-dalog-label' + createNewItemTitleId: '#create-dalog-label', + processingDialogDom: '

Please wait...

' }; this.itemsTable = null; this.searchTable = null; @@ -96,7 +97,7 @@ WspFileBrowser.prototype = { initDataTable: function (tableId, ajaxUrl) { this.itemsTable = $(tableId).dataTable({ "ajax": ajaxUrl, - "processing": false, + "processing": true, "serverSide": true, "dom": 'rtlp', "columnDefs": [ @@ -131,14 +132,8 @@ WspFileBrowser.prototype = { "createdRow": function(row, data, index) { $(row).addClass('element-container'); }, - "fnPreDrawCallback": function () { - // gather info to compose a message - wsp.dialogs.showProcessDialog(); - return true; - }, - "fnDrawCallback": function () { - // in case your overlay needs to be put away automatically you can put it here - wsp.dialogs.hideProcessDialog(); + "oLanguage": { + "sProcessing": this.settings.processingDialogDom } }); @@ -170,7 +165,7 @@ WspFileBrowser.prototype = { this.searchTable = $(tableId).dataTable({ "ajax": ajaxUrl, - "processing": false, + "processing": true, "serverSide": true, "oSearch": { "sSearch": initSearch }, "dom": 'rtlp', @@ -207,14 +202,8 @@ WspFileBrowser.prototype = { "createdRow": function (row, data, index) { $(row).addClass('element-container'); }, - "fnPreDrawCallback": function () { - // gather info to compose a message - wsp.dialogs.showProcessDialog(); - return true; - }, - "fnDrawCallback": function () { - // in case your overlay needs to be put away automatically you can put it here - wsp.dialogs.hideProcessDialog(); + "oLanguage": { + "sProcessing": this.settings.processingDialogDom } });