From ce737e9d7b83647a520304e6f25c451bb365cd9b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 5 Jan 2015 22:25:23 -0500 Subject: [PATCH] sync updates --- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/wizardagreement.js | 22 ++++++++++++ dashboard-ui/scripts/wizardservice.js | 2 +- dashboard-ui/scripts/wizardsettings.js | 2 +- dashboard-ui/useredit.html | 4 +-- dashboard-ui/wizardagreement.html | 45 +++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 dashboard-ui/scripts/wizardagreement.js create mode 100644 dashboard-ui/wizardagreement.html diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 56aeebc958..b5286979d7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -833,7 +833,7 @@ if (item.Type == 'Series' || item.Type == 'Season' || item.Type == 'BoxSet' || item.MediaType == 'Video') { if (item.UserData.UnplayedItemCount) { - html += '' + item.UserData.UnplayedItemCount + ''; + //html += '' + item.UserData.UnplayedItemCount + ''; } else if (item.UserData.Played && item.Type != 'TvChannel') { html += '
'; } diff --git a/dashboard-ui/scripts/wizardagreement.js b/dashboard-ui/scripts/wizardagreement.js new file mode 100644 index 0000000000..781581407b --- /dev/null +++ b/dashboard-ui/scripts/wizardagreement.js @@ -0,0 +1,22 @@ +(function (window, $) { + + function onSubmit(page) { + + if ($('#chkAccept', page).checked()) { + Dashboard.navigate('wizardfinish.html'); + } + } + + window.WizardAgreementPage = { + + onSubmit: function () { + + var page = $(this).parents('.page'); + + onSubmit(page); + + return false; + } + }; + +})(window, jQuery); \ No newline at end of file diff --git a/dashboard-ui/scripts/wizardservice.js b/dashboard-ui/scripts/wizardservice.js index c993ee32b6..dc8922c6c8 100644 --- a/dashboard-ui/scripts/wizardservice.js +++ b/dashboard-ui/scripts/wizardservice.js @@ -6,7 +6,7 @@ $('#btnNextPage', page).on('click', function () { - Dashboard.navigate('wizardfinish.html'); + Dashboard.navigate('wizardagreement.html'); }); }); diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js index 6a7dda6b3b..0592698f2f 100644 --- a/dashboard-ui/scripts/wizardsettings.js +++ b/dashboard-ui/scripts/wizardsettings.js @@ -67,7 +67,7 @@ Dashboard.navigate('wizardservice.html'); } else { - Dashboard.navigate('wizardfinish.html'); + Dashboard.navigate('wizardagreement.html'); } }); } diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index 0863f77078..59b58b227e 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -49,8 +49,8 @@ - - +
diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html new file mode 100644 index 0000000000..aef302f697 --- /dev/null +++ b/dashboard-ui/wizardagreement.html @@ -0,0 +1,45 @@ + + + + ${TitleMediaBrowser} + + +
+ +
+ +
+
+ +
+

+ ${HeaderTermsOfService} +

+
+ +
+

${MessagePleaseAcceptTermsOfService}

+ +

${ButtonPrivacyPolicy}

+

${ButtonTermsOfService}

+
    +
  • + + +
  • +
+ +
+ +
+
+
+ +
+ + +
+ +