From 6aca855749fb336b415941dc7b28321450ff381b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 12 Feb 2016 02:08:55 -0500 Subject: [PATCH] update config page --- dashboard-ui/livetvsettings.html | 4 +--- dashboard-ui/scripts/livetvsettings.js | 6 ++++++ dashboard-ui/strings/html/en-US.json | 2 +- dashboard-ui/strings/html/server.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index f62692385e..dc13545385 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -55,9 +55,7 @@
${OptionConvertRecordingsToStreamingFormat}
${OptionConvertRecordingsToStreamingFormatHelp}
- +


diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js index eb9da694ca..e17f0231b7 100644 --- a/dashboard-ui/scripts/livetvsettings.js +++ b/dashboard-ui/scripts/livetvsettings.js @@ -80,6 +80,12 @@ }); + if (AppInfo.enableSupporterMembership) { + $('.lnkSupporterLearnMore', page).show(); + } else { + $('.lnkSupporterLearnMore', page).hide(); + } + }); })(jQuery, document, window); diff --git a/dashboard-ui/strings/html/en-US.json b/dashboard-ui/strings/html/en-US.json index e5e6f994c6..614b0173ca 100644 --- a/dashboard-ui/strings/html/en-US.json +++ b/dashboard-ui/strings/html/en-US.json @@ -1535,5 +1535,5 @@ "LabelCodecIntrosPath": "Codec intros path:", "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.", "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to streaming friendly formats.", - "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on any device. This feature requires an active Emby Premiere subscription." + "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly for easy playback on any device. This feature requires an active Emby Premiere subscription." } \ No newline at end of file diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index a8b3afb494..5f76c3c974 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -1549,6 +1549,6 @@ "ButtonAdvanced": "Advanced", "LabelCodecIntrosPath": "Codec intros path:", "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.", - "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to streaming friendly formats.", + "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to streaming friendly formats", "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on any device. This feature requires an active Emby Premiere subscription." }