From f2d928ee806db883e1707daf2a47b8062702d54d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Jun 2015 00:52:01 -0400 Subject: [PATCH 01/59] fix image loading --- .../Api/PackageCreator.cs | 17 +- .../MediaBrowser.WebDashboard.csproj | 154 +++++++++++++++++- SharedVersion.cs | 4 +- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index dd1eba9a56..abed47589f 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -274,10 +274,19 @@ namespace MediaBrowser.WebDashboard.Api var version = GetType().Assembly.GetName().Version; - var imports = ""; - imports = ""; + var imports = new[] + { + "thirdparty/polymer/polymer.html", + "thirdparty/paper-button/paper-button.html", + "thirdparty/iron-icons/iron-icons.html" + }; + var importsHtml = string.Join("", imports.Select(i => "").ToArray()); - html = html.Replace("", "" + GetMetaTags(mode) + GetCommonCss(mode, version) + GetCommonJavascript(mode, version) + imports); + // It would be better to make polymer completely dynamic and loaded on demand, but seeing issues with that + // In chrome it is causing the body to be hidden while loading, which leads to width-check methods to return 0 for everything + //imports = ""; + + html = html.Replace("", "" + GetMetaTags(mode) + GetCommonCss(mode, version) + GetCommonJavascript(mode, version) + importsHtml); var bytes = Encoding.UTF8.GetBytes(html); @@ -396,7 +405,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List { - //"thirdparty/webcomponentsjs/webcomponents-lite.min.js", + "thirdparty/webcomponentsjs/webcomponents-lite.min.js", "scripts/all.js" + versionString }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index b987f2069e..ec81e91024 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -114,6 +114,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -156,6 +159,87 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -2338,22 +2422,82 @@ + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest diff --git a/SharedVersion.cs b/SharedVersion.cs index a8ebfc1ea1..0ea7a7720e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.4")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5641.4")] From 3ff3815b4446e6d83fd426e8c864e98de54154bc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Jun 2015 13:37:49 -0400 Subject: [PATCH 02/59] added ps4 profile --- MediaBrowser.Dlna/DlnaManager.cs | 1 + MediaBrowser.Dlna/MediaBrowser.Dlna.csproj | 4 + MediaBrowser.Dlna/Profiles/SonyPs4Profile.cs | 260 ++++++++++++++++++ .../Profiles/Xml/Sony PlayStation 4.xml | 100 +++++++ .../Localization/Server/server.json | 2 +- .../Api/PackageCreator.cs | 11 +- .../MediaBrowser.WebDashboard.csproj | 15 + 7 files changed, 388 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.Dlna/Profiles/SonyPs4Profile.cs create mode 100644 MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml diff --git a/MediaBrowser.Dlna/DlnaManager.cs b/MediaBrowser.Dlna/DlnaManager.cs index 2d2525919e..9ce62034b4 100644 --- a/MediaBrowser.Dlna/DlnaManager.cs +++ b/MediaBrowser.Dlna/DlnaManager.cs @@ -525,6 +525,7 @@ namespace MediaBrowser.Dlna new Xbox360Profile(), new XboxOneProfile(), new SonyPs3Profile(), + new SonyPs4Profile(), new SonyBravia2010Profile(), new SonyBravia2011Profile(), new SonyBravia2012Profile(), diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj index 204872e7b6..06aaff734e 100644 --- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj +++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj @@ -82,6 +82,7 @@ + @@ -210,6 +211,9 @@ + + +