From 62ffe2c59dd18c58f69275dab55e66020966def8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 11 May 2014 01:11:53 -0400
Subject: [PATCH] web client backdrops

---
 MediaBrowser.Model/Dto/BaseItemDto.cs          |  6 ------
 .../MediaInfo/FFProbeVideoInfo.cs              |  2 +-
 .../Dto/DtoService.cs                          |  8 --------
 .../Localization/Server/server.json            |  3 +++
 .../Api/DashboardService.cs                    |  1 +
 .../MediaBrowser.WebDashboard.csproj           | 18 ++++++++++++++++++
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index f2434afe3a..c469d97d62 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -325,12 +325,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The user data.</value>
         public UserItemDataDto UserData { get; set; }
 
-        /// <summary>
-        /// Gets or sets the recently added item count.
-        /// </summary>
-        /// <value>The recently added item count.</value>
-        public int? RecentlyAddedItemCount { get; set; }
-
         /// <summary>
         /// Gets or sets the played percentage.
         /// </summary>
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index e1857ca600..47a441a4d6 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -413,7 +413,7 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             get
             {
-                return new[] { ".srt", ".ssa", ".ass" };
+                return new[] { ".srt", ".ssa", ".ass", ".sub" };
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 1da0b3db9b..97a0ee7038 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1419,7 +1419,6 @@ namespace MediaBrowser.Server.Implementations.Dto
         /// <returns>Task.</returns>
         private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields)
         {
-            var rcentlyAddedItemCount = 0;
             var recursiveItemCount = 0;
             var unplayed = 0;
             long runtime = 0;
@@ -1456,12 +1455,6 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 recursiveItemCount++;
 
-                // Check is recently added
-                //if (child.IsRecentlyAdded())
-                //{
-                //    rcentlyAddedItemCount++;
-                //}
-
                 var isUnplayed = true;
 
                 // Incrememt totalPercentPlayed
@@ -1490,7 +1483,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
 
             dto.RecursiveItemCount = recursiveItemCount;
-            dto.RecentlyAddedItemCount = rcentlyAddedItemCount;
             dto.RecursiveUnplayedItemCount = unplayed;
 
             if (recursiveItemCount > 0)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 9ad5c77c10..258d7bff22 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -285,10 +285,13 @@
 	"PasswordLocalhostMessage": "Passwords are not required when logging in from localhost.",
 	"TabGuide": "Guide",
 	"TabChannels": "Channels",
+	"TabCollections": "Collections",
 	"HeaderChannels": "Channels",
 	"TabRecordings": "Recordings",
 	"TabScheduled": "Scheduled",
 	"TabSeries": "Series",
+	"TabFavorites": "Favorites",
+	"TabMyLibrary": "My Library",
 	"ButtonCancelRecording": "Cancel Recording",
 	"HeaderPrePostPadding": "Pre/Post Padding",
 	"LabelPrePaddingMinutes": "Pre-padding minutes:",
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 58a0c84b0f..e551a6e6b9 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -518,6 +518,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "mediacontroller.js",
                                 "chromecast.js",
                                 "contextmenu.js",
+                                "backdrops.js",
 
                                 "mediaplayer.js",
                                 "mediaplayer-video.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index ac9d700fab..64ff1cf152 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -166,6 +166,18 @@
     <Content Include="dashboard-ui\css\images\favicon.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\images\headersearch.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\css\images\items\folders\edit.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\css\images\items\folders\settings.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\css\images\menu.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\images\icons\audiocd.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -253,6 +265,9 @@
     <Content Include="dashboard-ui\css\images\media\tvflyout.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\images\remote.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\librarymenu.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -565,6 +580,9 @@
     <Content Include="dashboard-ui\scripts\appsplayback.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\backdrops.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\channelitems.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>