diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js index 568b5b742e..6e4ac7b5bc 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.js +++ b/dashboard-ui/components/guestinviter/guestinviter.js @@ -1,23 +1,19 @@ -define(['paperdialoghelper', 'paper-input', 'paper-button', 'jqmcollapsible'], function (paperDialogHelper) { +define(['paperdialoghelper', 'paper-input', 'paper-button', 'jqmcollapsible', 'paper-checkbox'], function (paperDialogHelper) { function renderLibrarySharingList(context, result) { var folderHtml = ''; - folderHtml += '
'; + folderHtml += '
'; folderHtml += result.Items.map(function (i) { var currentHtml = ''; - var id = 'chkShareFolder' + i.Id; - - currentHtml += ''; - var isChecked = true; var checkedHtml = isChecked ? ' checked="checked"' : ''; - currentHtml += ''; + currentHtml += '' + i.Name + ''; return currentHtml; @@ -25,7 +21,7 @@ folderHtml += '
'; - $('.librarySharingList', context).html(folderHtml).trigger('create'); + context.querySelector('.librarySharingList').innerHTML = folderHtml; } function inviteUser(dlg) { @@ -34,7 +30,11 @@ ApiClient.getJSON(ApiClient.getUrl("Channels", {})).then(function (channelsResult) { - var shareExcludes = $(".chkShareFolder:checked", dlg).get().map(function (i) { + var shareExcludes = $(".chkShareFolder", dlg).get().filter(function (i) { + + return i.checked; + + }).map(function (i) { return i.getAttribute('data-folderid'); }); diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html index cd2bb6dcbd..7d819f4c2e 100644 --- a/dashboard-ui/metadataadvanced.html +++ b/dashboard-ui/metadataadvanced.html @@ -4,7 +4,7 @@ ${TitleMetadata} -
+
@@ -27,8 +27,8 @@
  • - - + ${OptionSaveMetadataAsHidden} +

  • @@ -45,14 +45,12 @@
    • - - -
      ${LabelAutomaticUpdatesTmdbHelp}
      + ${LabelAutomaticUpdatesTmdb} +
      ${LabelAutomaticUpdatesTmdbHelp}
    • - - -
      ${LabelAutomaticUpdatesTvdbHelp}
      + ${LabelAutomaticUpdatesTvdb} +
      ${LabelAutomaticUpdatesTvdbHelp}
    @@ -64,25 +62,21 @@
    • - -
      - - +
      ${HeaderExtractChapterImagesFor}
      +
      + ${OptionMovies} - - + ${OptionEpisodes} - - + ${OptionOtherVideos}
      -
      ${ExtractChapterImagesHelp}
      +
      ${ExtractChapterImagesHelp}

    - - -
    ${LabelExtractChaptersDuringLibraryScanHelp}
    + ${LabelExtractChaptersDuringLibraryScan} +
    ${LabelExtractChaptersDuringLibraryScanHelp}

    • @@ -94,8 +88,7 @@
    • - - +
      ${LabelFanartApiKeyHelp}
      ${ButtonLearnMore}
      • @@ -114,30 +107,23 @@
      • - -
        - - +
        ${HeaderDownloadPeopleMetadataFor}
        +
        + ${OptionActors} - - + ${OptionComposers} - - + ${OptionDirectors} - - + ${OptionGuestStars} - - + ${OptionProducers} - - + ${OptionWriters} - - + ${OptionOthers}
        -
        ${HeaderDownloadPeopleMetadataForHelp}
        +
        ${HeaderDownloadPeopleMetadataForHelp}
    diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html index 35d007583d..e92de37f47 100644 --- a/dashboard-ui/metadataimages.html +++ b/dashboard-ui/metadataimages.html @@ -4,7 +4,7 @@ ${TitleMetadata} -
    +
    @@ -63,54 +63,20 @@
    -
    - ${HeaderFetchImages} - +
    ${HeaderFetchImages}
    +
    + ${OptionDownloadPrimaryImage} + ${OptionDownloadArtImage} + ${OptionDownloadBackImage} + ${OptionDownloadBannerImage} + ${OptionDownloadBoxImage} - - - - - - - - - - - - - - - -
    + ${OptionDownloadDiscImage} + ${OptionDownloadLogoImage} + ${OptionDownloadMenuImage} + ${OptionDownloadThumbImage} +
    diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index db6f459dde..104f0d657f 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -115,6 +115,12 @@ html = LibraryBrowser.getPosterViewHtml(posterOptions); } + else if (view == "Thumb") { + + posterOptions.preferThumb = true; + posterOptions.shape = "backdrop"; + html = LibraryBrowser.getPosterViewHtml(posterOptions); + } var elem = page.querySelector('#items'); elem.innerHTML = html + pagingHtml; diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index e61725e016..9bef25fb09 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -2,17 +2,17 @@ function loadAdvancedConfig(page, config) { - $('#chkSaveMetadataHidden', page).checked(config.SaveMetadataHidden).checkboxradio("refresh"); + $('#chkSaveMetadataHidden', page).checked(config.SaveMetadataHidden); $('#txtMetadataPath', page).val(config.MetadataPath || ''); - $('#chkPeopleActors', page).checked(config.PeopleMetadataOptions.DownloadActorMetadata).checkboxradio("refresh"); - $('#chkPeopleComposers', page).checked(config.PeopleMetadataOptions.DownloadComposerMetadata).checkboxradio("refresh"); - $('#chkPeopleDirectors', page).checked(config.PeopleMetadataOptions.DownloadDirectorMetadata).checkboxradio("refresh"); - $('#chkPeopleProducers', page).checked(config.PeopleMetadataOptions.DownloadProducerMetadata).checkboxradio("refresh"); - $('#chkPeopleWriters', page).checked(config.PeopleMetadataOptions.DownloadWriterMetadata).checkboxradio("refresh"); - $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh"); - $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh"); + $('#chkPeopleActors', page).checked(config.PeopleMetadataOptions.DownloadActorMetadata); + $('#chkPeopleComposers', page).checked(config.PeopleMetadataOptions.DownloadComposerMetadata); + $('#chkPeopleDirectors', page).checked(config.PeopleMetadataOptions.DownloadDirectorMetadata); + $('#chkPeopleProducers', page).checked(config.PeopleMetadataOptions.DownloadProducerMetadata); + $('#chkPeopleWriters', page).checked(config.PeopleMetadataOptions.DownloadWriterMetadata); + $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata); + $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata); Dashboard.hideLoadingMsg(); } @@ -24,27 +24,27 @@ function loadTmdbConfig(page, config) { - $('#chkEnableTmdbUpdates', page).checked(config.EnableAutomaticUpdates).checkboxradio("refresh"); + $('#chkEnableTmdbUpdates', page).checked(config.EnableAutomaticUpdates); } function loadTvdbConfig(page, config) { - $('#chkEnableTvdbUpdates', page).checked(config.EnableAutomaticUpdates).checkboxradio("refresh"); + $('#chkEnableTvdbUpdates', page).checked(config.EnableAutomaticUpdates); } function loadFanartConfig(page, config) { - $('#chkEnableFanartUpdates', page).checked(config.EnableAutomaticUpdates).checkboxradio("refresh"); + $('#chkEnableFanartUpdates', page).checked(config.EnableAutomaticUpdates); $('#txtFanartApiKey', page).val(config.UserApiKey || ''); } function loadChapters(page, config, providers) { - $('#chkChaptersMovies', page).checked(config.EnableMovieChapterImageExtraction).checkboxradio("refresh"); - $('#chkChaptersEpisodes', page).checked(config.EnableEpisodeChapterImageExtraction).checkboxradio("refresh"); - $('#chkChaptersOtherVideos', page).checked(config.EnableOtherVideoChapterImageExtraction).checkboxradio("refresh"); + $('#chkChaptersMovies', page).checked(config.EnableMovieChapterImageExtraction); + $('#chkChaptersEpisodes', page).checked(config.EnableEpisodeChapterImageExtraction); + $('#chkChaptersOtherVideos', page).checked(config.EnableOtherVideoChapterImageExtraction); - $('#chkExtractChaptersDuringLibraryScan', page).checked(config.ExtractDuringLibraryScan).checkboxradio("refresh"); + $('#chkExtractChaptersDuringLibraryScan', page).checked(config.ExtractDuringLibraryScan); Dashboard.hideLoadingMsg(); } diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index 6aa1e54ee7..33b310912a 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -91,17 +91,17 @@ var imageType = this.getAttribute('data-imagetype'); if (metadataInfo.SupportedImageTypes.indexOf(imageType) == -1) { - $(this).hide(); + this.classList.add('hide'); } else { - $(this).show(); + this.classList.remove('hide'); } if (getImageConfig(config, imageType).Limit) { - $('input', this).checked(true).checkboxradio('refresh'); + this.checked = true; } else { - $('input', this).checked(false).checkboxradio('refresh'); + this.checked = false; } }); @@ -452,11 +452,11 @@ }); - config.ImageOptions = $('.imageType:visible input', form).get().map(function (c) { + config.ImageOptions = $('.imageType:not(.hide)', form).get().map(function (c) { return { - Type: $(c).parents('.imageType').attr('data-imagetype'), + Type: c.getAttribute('data-imagetype'), Limit: c.checked ? 1 : 0, MinWidth: 0 }; diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js index fe11ff8480..4a401e554c 100644 --- a/dashboard-ui/scripts/userparentalcontrol.js +++ b/dashboard-ui/scripts/userparentalcontrol.js @@ -55,23 +55,20 @@ var html = ''; - html += '
    '; + html += '

    ' + Globalize.translate('HeaderBlockItemsWithNoRating') + '

    '; - html += '' + Globalize.translate('HeaderBlockItemsWithNoRating') + ''; + html += '
    '; for (var i = 0, length = items.length; i < length; i++) { var item = items[i]; - var id = 'unratedItem' + i; - var checkedAttribute = user.Policy.BlockUnratedItems.indexOf(item.value) != -1 ? ' checked="checked"' : ''; - html += ''; - html += ''; + html += '' + item.name + ''; } - html += '
    '; + html += ''; $('.blockUnratedItems', page).html(html).trigger('create'); } @@ -201,11 +198,15 @@ user.Policy.MaxParentalRating = $('#selectMaxParentalRating', page).val() || null; - user.Policy.BlockUnratedItems = $('.chkUnratedItem:checked', page).map(function () { + user.Policy.BlockUnratedItems = $('.chkUnratedItem', page).get().filter(function(i) { - return this.getAttribute('data-itemtype'); + return i.checked; - }).get(); + }).map(function (i) { + + return i.getAttribute('data-itemtype'); + + }); user.Policy.AccessSchedules = getSchedulesFromPage(page); diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 659fe0720f..63ce30701e 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -438,11 +438,16 @@ paper-input label, paper-textarea label { font-family: inherit !important; } -.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription { +.paperCheckboxListLabel { + font-size: 16px; + margin-bottom: .5em; +} + +.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .paperCheckboxListLabel, .ui-body-b .fieldDescription { color: #ccc; } -.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription { +.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .paperCheckboxListLabel, .ui-body-a .fieldDescription { color: #656565; } diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html index 9063869f65..e5cc287e14 100644 --- a/dashboard-ui/userparentalcontrol.html +++ b/dashboard-ui/userparentalcontrol.html @@ -4,7 +4,7 @@ -
    +