diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index 6533803466..90b7b9e929 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -23,14 +23,14 @@ "paper-styles": "polymerelements/paper-styles#^1.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-flex-layout", + "homepage": "https://github.com/polymerelements/iron-flex-layout", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9" }, - "_source": "git://github.com/PolymerElements/iron-flex-layout.git", + "_source": "git://github.com/polymerelements/iron-flex-layout.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-flex-layout" + "_originalSource": "polymerelements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790be..8119ebcf41 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 26486f6c6d..321be71437 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -42,7 +42,7 @@ "tag": "v1.0.3", "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index 99a4e194ab..2c4cf074b3 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -73,7 +73,13 @@

- diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index 25ee185ca7..3c4ae6e51e 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -12,9 +12,9 @@
+
-
diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js index 129eaab470..84cbd03982 100644 --- a/dashboard-ui/scripts/livetvnewrecording.js +++ b/dashboard-ui/scripts/livetvnewrecording.js @@ -1,6 +1,44 @@ (function ($, document) { var currentProgram; + var registrationInfo; + var lastRegId; + + function getRegistration(programId) { + + var deferred = DeferredBuilder.Deferred(); + if (registrationInfo && lastRegId == programId) { + deferred.resolveWith(null, [registrationInfo]); + } + registrationInfo = null; + lastRegId = programId; + Dashboard.showLoadingMsg(); + + ApiClient.getJSON(ApiClient.getUrl('LiveTv/Registration', { + + ProgramId: programId, + Feature: 'seriesrecordings' + })).done(function (result) { + + lastRegId = programId; + registrationInfo = result; + deferred.resolveWith(null, [registrationInfo]); + Dashboard.hideLoadingMsg(); + + }).fail(function () { + + deferred.resolveWith(null, [ + { + TrialVersion: true, + IsValid: true, + IsRegistered: false + }]); + + Dashboard.hideLoadingMsg(); + }); + + return deferred.promise(); + } function renderRecording(page, defaultTimer, program) { @@ -141,6 +179,47 @@ return false; } + function hideSeriesRecordingFields(page) { + $('#seriesFields', page).hide(); + page.querySelector('.btnSubmitContainer').classList.remove('hide'); + page.querySelector('.supporterContainer').classList.add('hide'); + } + + function showSeriesRecordingFields(page) { + $('#seriesFields', page).show(); + page.querySelector('.btnSubmitContainer').classList.remove('hide'); + + getRegistration(getParameterByName('programid')).done(function (regInfo) { + + if (regInfo.IsValid) { + page.querySelector('.btnSubmitContainer').classList.remove('hide'); + } else { + page.querySelector('.btnSubmitContainer').classList.add('hide'); + } + + if (regInfo.IsRegistered) { + + page.querySelector('.supporterContainer').classList.add('hide'); + + } else { + + page.querySelector('.supporterContainer').classList.remove('hide'); + + if (AppInfo.enableSupporterMembership) { + page.querySelector('.btnSupporter').classList.remove('hide'); + } else { + page.querySelector('.btnSupporter').classList.add('hide'); + } + + if (regInfo.TrialVersion) { + page.querySelector('.supporterTrial').classList.remove('hide'); + } else { + page.querySelector('.supporterTrial').classList.add('hide'); + } + } + }); + } + $(document).on('pageinitdepends', "#liveTvNewRecordingPage", function () { var page = this; @@ -148,11 +227,10 @@ $('#chkRecordSeries', page).on('change', function () { if (this.checked) { - $('#seriesFields', page).show(); + showSeriesRecordingFields(page); } else { - $('#seriesFields', page).hide(); + hideSeriesRecordingFields(page); } - }); $('#btnCancel', page).on('click', function () { @@ -168,7 +246,7 @@ }).on('pagebeforeshowready', "#liveTvNewRecordingPage", function () { var page = this; - + hideSeriesRecordingFields(page); reload(page); }).on('pagebeforehide', "#liveTvNewRecordingPage", function () { diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index 5b363a9a5a..e13852bc42 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -1527,5 +1527,6 @@ "HeaderUpcomingForKids": "Upcoming for Kids", "HeaderSetupLiveTV": "Setup Live TV", "LabelTunerType": "Tuner type:", - "HelpMoreTunersCanBeAdded": "More tuners can be added later within the Live TV section." + "HelpMoreTunersCanBeAdded": "More tuners can be added later within the Live TV section.", + "MessageActiveSupporterMembershipRequiredSeriesRecordings": "An active Emby Supporter membership is required in order to create automated series recordings." } diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html index 038d5d5258..e9d99760a6 100644 --- a/dashboard-ui/wizardlivetvtuner.html +++ b/dashboard-ui/wizardlivetvtuner.html @@ -25,6 +25,7 @@
+
${HelpMoreTunersCanBeAdded}