zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webdav portal fixes

Browse source
This commit is contained in:
vfedosevich 2015-03-12 04:44:39 -07:00
parent fa588c8559
commit 0f61d148ff
3 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
View file

@ -102,6 +102,7 @@ tr.selected-file {
#summary.summary { #summary.summary {
font-size: 11px; font-size: 11px;
color: rgb(152, 152, 152); color: rgb(152, 152, 152);
word-wrap: break-word;
} }
.drag-and-drop-area input { .drag-and-drop-area input {
@ -266,7 +267,7 @@ tr.selected-file {
margin-top: 15px; margin-top: 15px;
} }
#processDialog .dialog-text { #processDialog .dialog-text, .container .dialog-text{
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
} }
@ -275,6 +276,15 @@ tr.selected-file {
width: 200px; 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 { .breadcrumb-wsp {
display: inline-block; display: inline-block;
padding-top: 5px; padding-top: 5px;

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
View file

@ -325,7 +325,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
[HttpPost] [HttpPost]
public JsonResult ItemExist(string org, string pathPart, string newItemName) 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() return new JsonResult()
{ {

27
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
View file

@ -11,7 +11,8 @@
} , } ,
createNewItemDialogId: "#createNewItemDialog", createNewItemDialogId: "#createNewItemDialog",
createNewItemButtonId: "#create-button", createNewItemButtonId: "#create-button",
createNewItemTitleId: '#create-dalog-label' createNewItemTitleId: '#create-dalog-label',
processingDialogDom: '<div><img src="/Content/Images/indicator_medium.gif"><h4 class="dialog-text">Please wait...</h4></div>'
}; };
this.itemsTable = null; this.itemsTable = null;
this.searchTable = null; this.searchTable = null;
@ -96,7 +97,7 @@ WspFileBrowser.prototype = {
initDataTable: function (tableId, ajaxUrl) { initDataTable: function (tableId, ajaxUrl) {
this.itemsTable = $(tableId).dataTable({ this.itemsTable = $(tableId).dataTable({
"ajax": ajaxUrl, "ajax": ajaxUrl,
"processing": false, "processing": true,
"serverSide": true, "serverSide": true,
"dom": 'rtlp', "dom": 'rtlp',
"columnDefs": [ "columnDefs": [
@ -131,14 +132,8 @@ WspFileBrowser.prototype = {
"createdRow": function(row, data, index) { "createdRow": function(row, data, index) {
$(row).addClass('element-container'); $(row).addClass('element-container');
}, },
"fnPreDrawCallback": function () { "oLanguage": {
// gather info to compose a message "sProcessing": this.settings.processingDialogDom
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();
} }
}); });
@ -170,7 +165,7 @@ WspFileBrowser.prototype = {
this.searchTable = $(tableId).dataTable({ this.searchTable = $(tableId).dataTable({
"ajax": ajaxUrl, "ajax": ajaxUrl,
"processing": false, "processing": true,
"serverSide": true, "serverSide": true,
"oSearch": { "sSearch": initSearch }, "oSearch": { "sSearch": initSearch },
"dom": 'rtlp', "dom": 'rtlp',
@ -207,14 +202,8 @@ WspFileBrowser.prototype = {
"createdRow": function (row, data, index) { "createdRow": function (row, data, index) {
$(row).addClass('element-container'); $(row).addClass('element-container');
}, },
"fnPreDrawCallback": function () { "oLanguage": {
// gather info to compose a message "sProcessing": this.settings.processingDialogDom
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();
} }
}); });