diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-08 12:25:46 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-08 12:25:46 -0400 |
| commit | af0d1cada0023872535e15227c192504f8692a6d (patch) | |
| tree | 98789a0d7e961fcaf9fe482f31d98b9a5d25d8b9 | |
| parent | 4389f47fb68e0421b30966600c9a982bff9247d6 (diff) | |
aadd sync services tab
5 files changed, 24 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs index 93fb101a9..746f978ea 100644 --- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs +++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs @@ -156,7 +156,12 @@ namespace MediaBrowser.Server.Implementations.Library var list = new List<MediaSourceInfo>(); list.AddRange(mediaSources); - list.AddRange(dynamicMediaSources); + + foreach (var source in dynamicMediaSources) + { + source.SupportsTranscoding = false; + list.Add(source); + } return SortMediaSources(list); } @@ -273,7 +278,6 @@ namespace MediaBrowser.Server.Implementations.Library .ToList(); } - public MediaSourceInfo GetStaticMediaSource(IHasMediaSources item, string mediaSourceId, bool enablePathSubstitution) { return GetStaticMediaSources(item, enablePathSubstitution).FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase)); diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 484578e31..fd5ff9424 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -38,6 +38,16 @@ "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.", "ValueTimeLimitSingleHour": "Time limit: 1 hour", "ValueTimeLimitMultiHour": "Time limit: {0} hours", + "PluginCategoryGeneral": "General", + "PluginCategoryContentProvider": "Content Providers", + "PluginCategoryScreenSaver": "Screen Savers", + "PluginCategoryTheme": "Themes", + "PluginCategorySync": "Sync", + "PluginCategorySocialIntegration": "Social Networks", + "PluginCategoryNotifications": "Notifications", + "PluginCategoryMetadata": "Metadata", + "PluginCategoryLiveTV": "Live TV", + "PluginCategoryChannel": "Channels", "HeaderSearch": "Search", "ValueDateCreated": "Date created: {0}", "LabelArtist": "Artist", diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index b4ab8ef99..711c141b8 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -61,6 +61,9 @@ "HeaderEasyPinCode": "Easy Pin Code", "HeaderGrownupsOnly": "Grown-ups Only!", "DividerOr": "-- or --", + "HeaderInstalledServices": "Installed Services", + "HeaderAvailableServices": "Available Services", + "MessageNoServicesInstalled": "No services are currently installed.", "HeaderToAccessPleaseEnterEasyPinCode": "To access, please enter your easy pin code", "KidsModeAdultInstruction": "Click the lock icon in the bottom right to configure or leave kids mode. Your pin code will be required.", "ButtonConfigurePinCode": "Configure pin code", diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 8328cf8ab..2807b631c 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -366,6 +366,7 @@ namespace MediaBrowser.WebDashboard.Api "backdrops.js", "sync.js", "syncjob.js", + "syncservices.js", "playlistmanager.js", "mediaplayer.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index fa6413b8b..cc62af5c6 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -144,6 +144,7 @@ <Content Include="dashboard-ui\scripts\syncjob.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\scripts\syncservices.js" />
<Content Include="dashboard-ui\scripts\syncsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -165,6 +166,9 @@ <Content Include="dashboard-ui\syncjob.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\syncservices.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\syncsettings.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|
