Merge
This commit is contained in:
commit
2cdc8e24a9
7 changed files with 36 additions and 23 deletions
|
@ -0,0 +1,7 @@
|
|||
namespace WebsitePanel.WebDavPortal.Constants
|
||||
{
|
||||
public class Formtas
|
||||
{
|
||||
public const string DateFormatWithTime = "MM/dd/yyyy hh:mm tt";
|
||||
}
|
||||
}
|
|
@ -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,18 @@ tr.selected-file {
|
|||
width: 200px;
|
||||
}
|
||||
|
||||
.dataTables_processing {
|
||||
width: 185px !important;
|
||||
margin: 0 !important;
|
||||
padding: 0 !important;
|
||||
left: 43% !important;
|
||||
background: initial !important;
|
||||
background-color: #FFFFFF !important;
|
||||
border: 1px solid #CDCDCD;
|
||||
height: 44px !important;
|
||||
z-index: 30;
|
||||
}
|
||||
|
||||
.breadcrumb-wsp {
|
||||
display: inline-block;
|
||||
padding-top: 5px;
|
||||
|
|
|
@ -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()
|
||||
{
|
||||
|
|
|
@ -7,6 +7,7 @@ using AutoMapper;
|
|||
using WebsitePanel.WebDav.Core.Client;
|
||||
using WebsitePanel.WebDav.Core.Config;
|
||||
using WebsitePanel.WebDav.Core.Extensions;
|
||||
using WebsitePanel.WebDavPortal.Constants;
|
||||
using WebsitePanel.WebDavPortal.FileOperations;
|
||||
using WebsitePanel.WebDavPortal.Models.FileSystem;
|
||||
|
||||
|
@ -43,7 +44,7 @@ namespace WebsitePanel.WebDavPortal.Mapping.Profiles.Webdav
|
|||
.ForMember(ti => ti.IconHref, x => x.MapFrom(hi => hi.ItemType == ItemType.Folder ? WebDavAppConfigManager.Instance.FileIcons.FolderPath.Trim('~') : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(hi.DisplayName.Trim('/'))].Trim('~')))
|
||||
.ForMember(ti => ti.IsTargetBlank, x => x.MapFrom(hi => openerManager.GetIsTargetBlank(hi)))
|
||||
.ForMember(ti => ti.LastModified, x => x.MapFrom(hi => hi.LastModified))
|
||||
.ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
|
||||
.ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString(Formtas.DateFormatWithTime)))
|
||||
|
||||
.ForMember(ti => ti.Summary, x => x.MapFrom(hi => hi.Summary))
|
||||
.ForMember(ti => ti.IsRoot, x => x.MapFrom(hi => hi.IsRootItem))
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
} ,
|
||||
createNewItemDialogId: "#createNewItemDialog",
|
||||
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.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
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -25,7 +25,9 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
<a href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath)" class="processing-dialog">@UI.SearchResults</a>
|
||||
<a href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath)" class="processing-dialog">@(elements.Any() ?elements.Last():WspContext.User.OrganizationId)</a>
|
||||
<span style="top: 2px;"> / </span>
|
||||
<span>@UI.SearchResults</span>
|
||||
}
|
||||
</div>
|
||||
|
||||
|
|
|
@ -165,6 +165,7 @@
|
|||
<Compile Include="Configurations\ActionSelectors\OwaActionSelector.cs" />
|
||||
<Compile Include="Configurations\Constraints\OrganizationRouteConstraint.cs" />
|
||||
<Compile Include="Configurations\ControllerConfigurations\OwaControllerConfiguration.cs" />
|
||||
<Compile Include="Constants\Formtas.cs" />
|
||||
<Compile Include="Controllers\AccountController.cs" />
|
||||
<Compile Include="Controllers\ErrorController.cs" />
|
||||
<Compile Include="Controllers\FileSystemController.cs" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue