webdav portal mobile view added, content type counted

This commit is contained in:
vfedosevich 2015-02-25 02:36:39 -08:00
parent 4122caa16d
commit 346059195e
13 changed files with 111 additions and 41 deletions

View file

@ -19,7 +19,7 @@
else
{
@Html.Partial("_ShowContentTopMenu", Model)
@Html.Action("ContentList", "FileSystem", new { model = Model });
}

View file

@ -1,6 +1,7 @@
@model WebsitePanel.WebDavPortal.Models.OfficeOnlineModel
@using WebsitePanel.WebDavPortal.UI.Routes
@model WebsitePanel.WebDavPortal.Models.OfficeOnlineModel
@{
Layout = null;
Layout = null;
}
<!DOCTYPE html>
@ -8,9 +9,25 @@
<head>
<meta name="viewport" content="width=device-width" />
<title>@Html.Raw(Model.FileName)</title>
@if (Request.Browser.IsMobileDevice)
{
@Styles.Render("~/Content/css")
}
</head>
<body>
<iframe src='@Model.Url' width="100%" height="100%" frameborder='0' style="bottom: 0px; left: 0px; position: fixed; right: 0px; top: 0px;">
@if (Request.Browser.IsMobileDevice)
{
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container top-container">
<div class="navbar-header">
<a class="back-button" href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath, new {pathPart = Model.Backurl})">
<i class="glyphicon glyphicon-circle-arrow-left"></i>
</a>
</div>
</div>
</div>
}
<iframe src="@Model.Url" width="100%" height="100%" frameborder='0' style="position: absolute;top: 0;left: 0;bottom: 0;right: 0; @(Request.Browser.IsMobileDevice ? "margin-top: 50px;" : "")">
This is an embedded
<a target='_blank' href='http://office.com'>Microsoft Office</a> document, powered by
<a target='_blank' href='http://office.com/webapps'>Office Web Apps</a>.

View file

@ -17,7 +17,7 @@
switch (opener)
{
case FileOpenerType.OfficeOnline:
isTargetBlank = true;
isTargetBlank = !Request.Browser.IsMobileDevice;
var pathPart = Model.Href.AbsolutePath.Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
href = string.Concat(Url.RouteUrl(FileSystemRouteNames.EditOfficeOnline, new { org = WspContext.User.OrganizationId, pathPart = "" }), pathPart);
break;

View file

@ -31,7 +31,7 @@
</div>
}
<div class="navbar-right">
<div class="file-upload navbar-right">
@if (Request.Browser.IsMobileDevice == false)
{
<div class="btn-toolbar change-view-block" role="toolbar">