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-01-23 02:03:27 -08:00
parent 29747087ff
commit 68b2ef1e0c
5 changed files with 41 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,14 +29,20 @@ textarea {
cursor: pointer;
}
.selected-file {
.element-container .element {
position: relative;
text-align:center;
}
.selected-file .element {
position: relative;
box-sizing:border-box;
-moz-box-sizing:border-box;
-webkit-box-sizing:border-box;
border: 1px solid rgb(80, 152, 249);
}
.selected-file div.selected-element-overlay {
.selected-file .element div.selected-element-overlay {
position:absolute;
top:0px;
left: 0px;

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

@ -133,11 +133,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
if (filePathes == null)
{
model.Messages.Add(new Message
{
Type = MessageType.Error,
Value = Resources.NoFilesAreSelected
});
model.AddMessage(MessageType.Error, Resources.NoFilesAreSelected);
return Json(model);
}
@ -152,21 +148,13 @@ namespace WebsitePanel.WebDavPortal.Controllers
}
catch (WebDavException exception)
{
model.Messages.Add(new Message
{
Type = MessageType.Error,
Value = exception.Message
});
model.AddMessage(MessageType.Error, exception.Message);
}
}
if (model.DeletedFiles.Any())
{
model.Messages.Insert(0, new Message
{
Type = MessageType.Success,
Value = string.Format(Resources.ItemsWasRemovedFormat, model.DeletedFiles.Count)
});
model.AddMessage(MessageType.Success, string.Format(Resources.ItemsWasRemovedFormat, model.DeletedFiles.Count));
}
return Json(model);

10
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/Common/BaseModel.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Web.Mvc;
using WebsitePanel.WebDavPortal.Models.Common.Enums;
namespace WebsitePanel.WebDavPortal.Models.Common
{
@ -11,5 +12,14 @@ namespace WebsitePanel.WebDavPortal.Models.Common
}
public List<Message> Messages { get; private set; }
public void AddMessage(MessageType type, string value)
{
Messages.Add(new Message
{
Type =type,
Value = value
});
}
}
}

4
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/recalculateResourseHeight.js
View file

@ -6,6 +6,10 @@
maxHeight = Math.max.apply(null, heights);
if (maxHeight < 135) {
maxHeight = 135;
}
$(".element-container").height(maxHeight);
});
}

30
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
View file

@ -39,22 +39,24 @@
}
<div class="col-sm-2 element-container">
<img class="icon-size" src="@Url.Content(actualPath)" />
<a href="@href" @Html.Raw(isTargetBlank ? "target=\"_blank\"" : string.Empty) class="file-link" title="@name">
<p style="word-wrap: break-word;">@name</p>
</a>
<div class="element">
<img class="icon-size" src="@Url.Content(actualPath)" />
@if (showStatistic)
{
<div class="progress web-dav-folder-progress">
<div class="progress-bar" role="progressbar" aria-valuenow="@percent" aria-valuemin="0" aria-valuemax="100" style="width: @percent%;">
<p class="progress-text">@percent%</p>
<a href="@href" @Html.Raw(isTargetBlank ? "target=\"_blank\"" : string.Empty) class="file-link" title="@name">
<p style="word-wrap: break-word;">@name</p>
</a>
@if (showStatistic)
{
<div class="progress web-dav-folder-progress">
<div class="progress-bar" role="progressbar" aria-valuenow="@percent" aria-valuemin="0" aria-valuemax="100" style="width: @percent%;">
<p class="progress-text">@percent%</p>
</div>
</div>
<p>@Math.Round(Convert.ToDecimal(resource.ContentLength) / 1024, 2) / @Math.Round(Convert.ToDecimal(resource.AllocatedSpace) / 1024, 2) @Resources.GigabyteShort</p>
}
<div class="selected-element-overlay">
</div>
<p>@Math.Round(Convert.ToDecimal(resource.ContentLength) / 1024, 2) / @Math.Round(Convert.ToDecimal(resource.AllocatedSpace) / 1024, 2) @Resources.GigabyteShort</p>
}
<div class="selected-element-overlay">
</div>
</div>