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

sync fixes

Browse source
This commit is contained in:
vfedosevich 2015-02-03 02:25:52 -08:00
parent 721a886afb
commit 0509b5ff1c
6 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
View file

@ -28,7 +28,7 @@ namespace WebsitePanel.WebDav.Core.Owa
var cFileInfo = new CheckFileInfo var cFileInfo = new CheckFileInfo
{ {
BaseFileName = resource.DisplayName, BaseFileName = resource.DisplayName,
OwnerId = @"4257508bfe174aa28b461536d8b6b648",// WspContext.User.Login, OwnerId = WspContext.User.Login,
Size = resource.ContentLength, Size = resource.ContentLength,
Version = DateTime.Now.ToString("s"), Version = DateTime.Now.ToString("s"),
SupportsCoauth = false, SupportsCoauth = false,

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

@ -146,4 +146,15 @@ div#breadcrumb_wrapper a:last-child {
} }
.form-control { .form-control {
border-radius: 4px; border-radius: 4px;
}
.header-logo {
float: none;
display: inline-block;
margin-right: 10px;
}
.header-portal-title {
float: none;
display: inline-block;
} }

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

@ -97,7 +97,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
string wopiSrc = Server.UrlDecode(url); string wopiSrc = Server.UrlDecode(url);
string owaOpenerUri = permissions.HasFlag(WebDavPermissions.Write) ? owaOpener.OwaEditor : owaOpener.OwaView; string owaOpenerUri = permissions.HasFlag(WebDavPermissions.Write) ? owaOpener.OwaView : owaOpener.OwaView;
var uri = string.Format("{0}/{1}WOPISrc={2}&access_token={3}", WebDavAppConfigManager.Instance.OfficeOnline.Url, owaOpenerUri, Server.UrlEncode(wopiSrc), Server.UrlEncode(accessToken.AccessToken.ToString("N"))); var uri = string.Format("{0}/{1}WOPISrc={2}&access_token={3}", WebDavAppConfigManager.Instance.OfficeOnline.Url, owaOpenerUri, Server.UrlEncode(wopiSrc), Server.UrlEncode(accessToken.AccessToken.ToString("N")));

25
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
View file

@ -19,6 +19,25 @@ $(document).on('click', '.element-container', function (e) {
} else { } else {
if (isMobileDevice()) {
var now = new Date().getTime();
var lastTouch = $(this).data('lastTouch') || now + 1;
var delta = now - lastTouch;
if (delta < 500 && delta > 0) {
wsp.fileBrowser.openItem(this);
$(this).data('lastTouch', 0);
} else {
wsp.fileBrowser.clearAllSelectedItems();
wsp.fileBrowser.selectItem(this);
}
$(this).data('lastTouch', now);
}
wsp.fileBrowser.clearAllSelectedItems(); wsp.fileBrowser.clearAllSelectedItems();
wsp.fileBrowser.selectItem(this); wsp.fileBrowser.selectItem(this);
@ -51,4 +70,8 @@ $(document).click(function (event) {
wsp.fileBrowser.clearAllSelectedItems(); wsp.fileBrowser.clearAllSelectedItems();
wsp.fileBrowser.refreshDeletionBlock(); wsp.fileBrowser.refreshDeletionBlock();
} }
}) })
function isMobileDevice() {
return (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
}

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

@ -11,7 +11,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<title>@ViewBag.Title</title> <title>@ViewBag.Title</title>
@Styles.Render("~/Content/css") @Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr") @Scripts.Render("~/bundles/modernizr")
@ -25,7 +25,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
@Html.RouteLink(WebDavAppConfigManager.Instance.ApplicationName, FileSystemRouteNames.ShowContentPath, new { pathPart = string.Empty }, new { @class = "navbar-brand" }) <img class="header-logo" src="@Url.Content("~/Content/Images/logo.png")" />
@Html.RouteLink(WebDavAppConfigManager.Instance.ApplicationName, FileSystemRouteNames.ShowContentPath, new { pathPart = string.Empty }, new { @class = "navbar-brand header-portal-title" })
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">
@{ @{

13
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
View file

@ -60,8 +60,19 @@
<add extension=".xls" path="~/Content/Images/excel-icon.png" /> <add extension=".xls" path="~/Content/Images/excel-icon.png" />
<add extension=".xlsx" path="~/Content/Images/excel-icon.png" /> <add extension=".xlsx" path="~/Content/Images/excel-icon.png" />
<add extension=".png" path="~/Content/Images/png-icon.png" /> <add extension=".png" path="~/Content/Images/png-icon.png" />
<add extension=".avi" path="~/Content/Images/avi-icon.png" />
<add extension=".cdr" path="~/Content/Images/coreldraw-icon.png" />
<add extension=".csv" path="~/Content/Images/csv-icon.png" />
<add extension=".mp3" path="~/Content/Images/mp3-icon.png" />
<add extension=".pdf" path="~/Content/Images/pdf-icon.png" />
<add extension=".png" path="~/Content/Images/png-icon.png" />
<add extension=".ppt" path="~/Content/Images/ppt-icon.png" />
<add extension=".pptx" path="~/Content/Images/ppt-icon.png" />
<add extension=".rar" path="~/Content/Images/rar-icon.png" />
<add extension=".csv" path="~/Content/Images/csv-icon.png" />
<add extension=".zip" path="~/Content/Images/zip-icon.png" />
</fileIcons> </fileIcons>
<officeOnline isEnabled="True" url="https://vir-owa.virtuworks.net" cobaltFileTtl="30"> <officeOnline isEnabled="True" url="https://vir-owa.virtuworks.net" cobaltFileTtl="1">
<add extension=".doc" OwaView="wv/wordviewerframe.aspx?" OwaEditor="wv/wordviewerframe.aspx?" /> <add extension=".doc" OwaView="wv/wordviewerframe.aspx?" OwaEditor="wv/wordviewerframe.aspx?" />
<add extension=".docx" OwaView="wv/wordviewerframe.aspx?" OwaEditor="we/wordeditorframe.aspx?" /> <add extension=".docx" OwaView="wv/wordviewerframe.aspx?" OwaEditor="we/wordeditorframe.aspx?" />
<add extension=".xls" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" /> <add extension=".xls" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" />