From 80390fe2a084ec4f2b57d116d6345b237b5dfd96 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 17 Nov 2015 11:37:16 -0500 Subject: [PATCH] update cinema mode config page --- dashboard-ui/cinemamodeconfiguration.html | 99 +++++++++---------- dashboard-ui/css/site.css | 2 +- .../scripts/cinemamodeconfiguration.js | 36 +++---- dashboard-ui/scripts/dashboardpage.js | 4 - 4 files changed, 66 insertions(+), 75 deletions(-) diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 7a6c9bba80..2286bb9718 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -19,60 +19,55 @@

${CinemaModeConfigurationHelp}

-
-
- ${LabelEnableCinemaModeFor} - - - - -
+
+

${LabelEnableCinemaModeFor}

+
+ ${OptionMovies} + ${OptionEpisodes} +
+
+
+
+

${LabelSelectInternetTrailersForCinemaMode}

+
+ ${OptionUpcomingMoviesInTheaters} + ${OptionUpcomingDvdMovies} + ${OptionUpcomingStreamingMovies} + ${OptionOtherTrailers} +
+
${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}
+
+
+
+
+ ${OptionTrailersFromMyMovies} +
${OptionTrailersFromMyMoviesHelp}
+
+ ${ButtonLearnMore} +
+
+
+
+ +
+
+
+ ${LabelEnableIntroParentalControl} +
${LabelEnableIntroParentalControlHelp}
+
+
+
+ ${LabelLimitIntrosToUnwatchedContent} +
+
+
+
+ + +
+
${LabelCustomIntrosPathHelp}

-
    -
  • -
    - ${LabelSelectInternetTrailersForCinemaMode} - - - - - - - - -
    -
    ${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}
    -
    -
    • -
  • - - -
    ${OptionTrailersFromMyMoviesHelp}
    -
    ${ButtonLearnMore}
    -
    • -
  • - -
    - - -
    -
    ${LabelCustomIntrosPathHelp}
    -
    • -
  • - - -
    • -
  • - - -
    ${LabelEnableIntroParentalControlHelp}
    -
    • -
  • - - -
    • -

${CinemaModeConfigurationHelp2}

  • diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 123686ff57..e0de443044 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -844,7 +844,7 @@ h1 .imageLink { } .paperCheckboxFieldDescription { - padding-left: 34px; + padding-left: 31px; padding-top: 5px; } diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js index 95a2f318af..efe971ddc1 100644 --- a/dashboard-ui/scripts/cinemamodeconfiguration.js +++ b/dashboard-ui/scripts/cinemamodeconfiguration.js @@ -2,18 +2,18 @@ function loadPage(page, config) { - $('#chkMovies', page).checked(config.EnableIntrosForMovies).checkboxradio('refresh'); - $('#chkEpisodes', page).checked(config.EnableIntrosForEpisodes).checkboxradio('refresh'); + $('.chkMovies', page).checked(config.EnableIntrosForMovies); + $('.chkEpisodes', page).checked(config.EnableIntrosForEpisodes); - $('#chkMyMovieTrailers', page).checked(config.EnableIntrosFromMoviesInLibrary).checkboxradio('refresh'); + $('.chkMyMovieTrailers', page).checked(config.EnableIntrosFromMoviesInLibrary); - $('#chkUpcomingTheaterTrailers', page).checked(config.EnableIntrosFromUpcomingTrailers).checkboxradio('refresh'); - $('#chkUpcomingDvdTrailers', page).checked(config.EnableIntrosFromUpcomingDvdMovies).checkboxradio('refresh'); - $('#chkUpcomingStreamingTrailers', page).checked(config.EnableIntrosFromUpcomingStreamingMovies).checkboxradio('refresh'); - $('#chkOtherTrailers', page).checked(config.EnableIntrosFromSimilarMovies).checkboxradio('refresh'); + $('.chkUpcomingTheaterTrailers', page).checked(config.EnableIntrosFromUpcomingTrailers); + $('.chkUpcomingDvdTrailers', page).checked(config.EnableIntrosFromUpcomingDvdMovies); + $('.chkUpcomingStreamingTrailers', page).checked(config.EnableIntrosFromUpcomingStreamingMovies); + $('.chkOtherTrailers', page).checked(config.EnableIntrosFromSimilarMovies); - $('#chkUnwatchedOnly', page).checked(!config.EnableIntrosForWatchedContent).checkboxradio('refresh'); - $('#chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl).checkboxradio('refresh'); + $('.chkUnwatchedOnly', page).checked(!config.EnableIntrosForWatchedContent); + $('.chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl); $('#txtCustomIntrosPath', page).val(config.CustomIntroPath || ''); $('#txtNumTrailers', page).val(config.TrailerLimit); @@ -33,16 +33,16 @@ config.CustomIntroPath = $('#txtCustomIntrosPath', page).val(); config.TrailerLimit = $('#txtNumTrailers', page).val(); - config.EnableIntrosForMovies = $('#chkMovies', page).checked(); - config.EnableIntrosForEpisodes = $('#chkEpisodes', page).checked(); - config.EnableIntrosFromMoviesInLibrary = $('#chkMyMovieTrailers', page).checked(); - config.EnableIntrosForWatchedContent = !$('#chkUnwatchedOnly', page).checked(); - config.EnableIntrosParentalControl = $('#chkEnableParentalControl', page).checked(); + config.EnableIntrosForMovies = $('.chkMovies', page).checked(); + config.EnableIntrosForEpisodes = $('.chkEpisodes', page).checked(); + config.EnableIntrosFromMoviesInLibrary = $('.chkMyMovieTrailers', page).checked(); + config.EnableIntrosForWatchedContent = !$('.chkUnwatchedOnly', page).checked(); + config.EnableIntrosParentalControl = $('.chkEnableParentalControl', page).checked(); - config.EnableIntrosFromUpcomingTrailers = $('#chkUpcomingTheaterTrailers', page).checked(); - config.EnableIntrosFromUpcomingDvdMovies = $('#chkUpcomingDvdTrailers', page).checked(); - config.EnableIntrosFromUpcomingStreamingMovies = $('#chkUpcomingStreamingTrailers', page).checked(); - config.EnableIntrosFromSimilarMovies = $('#chkOtherTrailers', page).checked(); + config.EnableIntrosFromUpcomingTrailers = $('.chkUpcomingTheaterTrailers', page).checked(); + config.EnableIntrosFromUpcomingDvdMovies = $('.chkUpcomingDvdTrailers', page).checked(); + config.EnableIntrosFromUpcomingStreamingMovies = $('.chkUpcomingStreamingTrailers', page).checked(); + config.EnableIntrosFromSimilarMovies = $('.chkOtherTrailers', page).checked(); ApiClient.updateNamedConfiguration("cinemamode", config).done(Dashboard.processServerConfigurationUpdateResult); }); diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 4ac3c32956..35b8446efc 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -670,10 +670,6 @@ return ""; } - if (clientLowered == "windows rt") { - - return ""; - } if (clientLowered == "windows phone") { return "";