From 72752fc5596e37c32c47de9bfb4cd0c0f22976c5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 22 Jun 2015 11:43:19 -0400 Subject: [PATCH] update menus --- .../Localization/JavaScript/javascript.json | 1 + .../MediaBrowser.ServerApplication.csproj | 1 - .../Api/PackageCreator.cs | 3 +- .../MediaBrowser.WebDashboard.csproj | 43 ++++++++++++------- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 8b8d7d30ca..8bc2448916 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -38,6 +38,7 @@ "HeaderSupportTheTeam": "Support the Emby Team", "TextEnjoyBonusFeatures": "Enjoy Bonus Features", "TitleLiveTV": "Live TV", + "ButtonCancelSyncJob": "Cancel sync job", "TitleSync": "Sync", "HeaderSelectDate": "Select Date", "ButtonDonate": "Donate", diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9b20ac7175..c0830c8c94 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -99,7 +99,6 @@ Component - Form diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 06fbd1a7d6..fd353962a0 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -262,7 +262,7 @@ namespace MediaBrowser.WebDashboard.Api html = html.Replace("", "") .Replace("", "
") - .Replace("", "
"); + .Replace("", ""); } if (enableMinification) @@ -666,7 +666,6 @@ namespace MediaBrowser.WebDashboard.Api "pluginupdates.css", "remotecontrol.css", "userimage.css", - "livetv.css", "nowplaying.css", "materialize.css" }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 39481e9a43..074628a8db 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -178,6 +178,18 @@ + + + + + + + + + + + + @@ -421,6 +433,13 @@ + + + + + + + @@ -541,6 +560,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -634,18 +656,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -2750,6 +2760,9 @@ + + + @@ -2793,6 +2806,9 @@ + + + @@ -2933,9 +2949,6 @@ PreserveNewest - - PreserveNewest -