From 0509b5ff1c9d66c88c5ef576e4c89e4701135dce Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 3 Feb 2015 02:25:52 -0800
Subject: [PATCH]  sync fixes

---
 .../Owa/WopiServer.cs                         |  2 +-
 .../Content/Site.css                          | 11 ++++++++
 .../Controllers/FileSystemController.cs       |  2 +-
 .../Scripts/appScripts/wsp.js                 | 25 ++++++++++++++++++-
 .../Views/Shared/_Layout.cshtml               |  5 ++--
 .../WebsitePanel.WebDavPortal/Web.config      | 13 +++++++++-
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
index 357615f3..7da7cb5d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
@@ -28,7 +28,7 @@ namespace WebsitePanel.WebDav.Core.Owa
             var cFileInfo = new CheckFileInfo
             {
                 BaseFileName = resource.DisplayName,
-                OwnerId = @"4257508bfe174aa28b461536d8b6b648",// WspContext.User.Login,
+                OwnerId = WspContext.User.Login,
                 Size = resource.ContentLength,
                 Version = DateTime.Now.ToString("s"),
                 SupportsCoauth = false,
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index a7f32b61..c45a408b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -146,4 +146,15 @@ div#breadcrumb_wrapper a:last-child {
 }
 .form-control {
     border-radius: 4px;
+}
+
+.header-logo {
+    float: none;
+    display: inline-block;
+    margin-right: 10px;
+}
+
+.header-portal-title {
+    float: none;
+    display: inline-block;
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 28b6e19f..55e887b7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -97,7 +97,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
             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")));
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
index e8ecfdf9..157b821b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
@@ -19,6 +19,25 @@ $(document).on('click', '.element-container', function (e) {
 
     } 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.selectItem(this);
@@ -51,4 +70,8 @@ $(document).click(function (event) {
         wsp.fileBrowser.clearAllSelectedItems();
         wsp.fileBrowser.refreshDeletionBlock();
     }
-})
\ No newline at end of file
+})
+
+function isMobileDevice() {
+    return (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
index e93d4c78..277a17c3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
@@ -11,7 +11,7 @@
 <html>
 <head>
     <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>
     @Styles.Render("~/Content/css")
     @Scripts.Render("~/bundles/modernizr")
@@ -25,7 +25,8 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </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 class="navbar-collapse collapse">
                 @{
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
index ad65ed86..11c6991f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
@@ -60,8 +60,19 @@
       <add extension=".xls" 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=".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>
-    <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=".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;" />