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-10 03:55:47 -08:00
parent 996e56a835
commit 833b7c1aa4
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
WebsitePanel/Sources/WebsitePanel.WebDav.Core/IHierarchyItem.cs
View file

@ -59,7 +59,10 @@ namespace WebsitePanel.WebDav.Core
{ {
get get
{ {
string displayName = _href.AbsoluteUri.Replace(_baseUri.AbsoluteUri, ""); var href = HttpUtility.UrlDecode(_href.AbsoluteUri);
var baseUri = HttpUtility.UrlDecode(_baseUri.AbsoluteUri);
string displayName = href.Replace(baseUri, "");
displayName = Regex.Replace(displayName, "\\/$", ""); displayName = Regex.Replace(displayName, "\\/$", "");
Match displayNameMatch = Regex.Match(displayName, "([\\/]+)$"); Match displayNameMatch = Regex.Match(displayName, "([\\/]+)$");
if (displayNameMatch.Success) if (displayNameMatch.Success)

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/uploadingData2.js
View file

@ -24,6 +24,8 @@ function GetResources() {
GetResources(); GetResources();
oldResourcesDivHeight = $('#resourcesDiv').height(); oldResourcesDivHeight = $('#resourcesDiv').height();
}; };
recalculateResourseHeight();
} }
}); });
}; };

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
View file

@ -33,7 +33,7 @@
if (account != null) if (account != null)
{ {
<a id="logout" class="nav navbar-text navbar-right" href="@Url.RouteUrl(AccountRouteNames.Logout)" title="Log out"><i class="glyphicon glyphicon-log-out"></i></a> <a id="logout" class="nav navbar-text navbar-right" href="@Url.RouteUrl(AccountRouteNames.Logout)" title="Log out"><i class="glyphicon glyphicon-log-out"></i></a>
<h4 id="username" class="nav navbar-text navbar-right">@account.UserName</h4> <h4 id="username" class="nav navbar-text navbar-right">@account.Login</h4>
} }
} }
</div> </div>