diff --git a/dashboard-ui/advancedmetadata.html b/dashboard-ui/advancedmetadata.html deleted file mode 100644 index 4b6e1e16c7..0000000000 --- a/dashboard-ui/advancedmetadata.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - Metadata - - -
- -
- -
-
- Basics - Image Downloading - Image Extraction - Advanced -
- -
-
    -
  • - - -
    If enabled, movies will be updated automatically as they are updated on the TheMovieDB.org. This may replace some existing metadata.
    -
    • -
  • - - -
    If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com. This may replace some existing metadata.
    -
    • -
  • - - -
    • -
-
-
- -
- - -
- - diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html index f8324ff213..329738b3cb 100644 --- a/dashboard-ui/metadata.html +++ b/dashboard-ui/metadata.html @@ -10,10 +10,9 @@
- Basics - Image Downloading - Image Extraction - Advanced + Basics + More Options + Advanced
diff --git a/dashboard-ui/metadataimageextraction.html b/dashboard-ui/metadataadvanced.html similarity index 66% rename from dashboard-ui/metadataimageextraction.html rename to dashboard-ui/metadataadvanced.html index b38be98c63..8d42861474 100644 --- a/dashboard-ui/metadataimageextraction.html +++ b/dashboard-ui/metadataadvanced.html @@ -4,19 +4,18 @@ Metadata -
+
Basics - Image Downloading - Image Extraction - Advanced + More Options + Advanced
- +
  • @@ -40,6 +39,19 @@
    Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.
+ +

Automatic Updates

+
    +
  • + + +
    If enabled, movies will be updated automatically as they are updated on the TheMovieDB.org. This may replace some existing metadata.
    +
    • +
  • + + +
    If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com. This may replace some existing metadata.
    +
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html index e96f4ff214..9732a8747d 100644 --- a/dashboard-ui/metadataimages.html +++ b/dashboard-ui/metadataimages.html @@ -11,9 +11,8 @@
Basics - Image Downloading - Image Extraction - Advanced + More Options + Advanced
@@ -26,111 +25,154 @@
Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.
-
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -

    Enable additional image downloading:

    +

    Customize options per media type

    Movies

    -
    - - +
    - - +
    + + +
    - - +
    + + +
    - - +

    Download Movie Images

    +
    + + - - + + - - + + + + + + + + + + + +
    -
    -

    TV Series

    -
    - - +

    TV

    +
    - - +
    + + +
    - - +
    + + +
    - - +

    Download TV Images

    - - +
    + + + + + + + + + + + + + + + + + + + + + + +
    - -
    -

    TV Seasons

    -
    - - +

    Music

    +
    - - +
    + + +
    - - +
    + + +
    + +

    Download Music Images

    +
    + + + + + + + + + + + + + + + + + + + + +
    - -
    - -
    -

    Music Artists

    -
    - - - - - - - - - - - -
    -
    -

    Music Albums

    -
    - - +

    Games

    +
    +
    + + +
    - - - - - +
    + + +
    +
    +
    +

    Books

    +
    +
    + + +
    +
    + + +
    +

      diff --git a/dashboard-ui/scripts/advancedmetadataconfigurationpage.js b/dashboard-ui/scripts/metadataadvanced.js similarity index 71% rename from dashboard-ui/scripts/advancedmetadataconfigurationpage.js rename to dashboard-ui/scripts/metadataadvanced.js index 70b209add8..f461452b84 100644 --- a/dashboard-ui/scripts/advancedmetadataconfigurationpage.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -15,6 +15,12 @@ load: function (page, config) { + $('#chkVIdeoImages', page).checked(config.EnableVideoImageExtraction).checkboxradio("refresh"); + + $('#chkMovies', page).checked(config.EnableMovieChapterImageExtraction).checkboxradio("refresh"); + $('#chkEpisodes', page).checked(config.EnableEpisodeChapterImageExtraction).checkboxradio("refresh"); + $('#chkOtherVideos', page).checked(config.EnableOtherVideoChapterImageExtraction).checkboxradio("refresh"); + $('#chkEnableTmdbPersonUpdates', page).checked(config.EnableTmdbUpdates).checkboxradio("refresh"); $('#chkEnableTvdbUpdates', page).checked(config.EnableTvDbUpdates).checkboxradio("refresh"); @@ -48,6 +54,12 @@ ApiClient.getServerConfiguration().done(function (config) { + config.EnableVideoImageExtraction = $('#chkVIdeoImages', form).checked(); + + config.EnableMovieChapterImageExtraction = $('#chkMovies', form).checked(); + config.EnableEpisodeChapterImageExtraction = $('#chkEpisodes', form).checked(); + config.EnableOtherVideoChapterImageExtraction = $('#chkOtherVideos', form).checked(); + config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); config.EnableTmdbUpdates = $('#chkEnableTmdbPersonUpdates', form).checked(); diff --git a/dashboard-ui/scripts/metadataimageextraction.js b/dashboard-ui/scripts/metadataimageextraction.js deleted file mode 100644 index 6e60613e44..0000000000 --- a/dashboard-ui/scripts/metadataimageextraction.js +++ /dev/null @@ -1,46 +0,0 @@ -var MetadataImageExtractionPage = { - - onPageShow: function () { - - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getServerConfiguration().done(function (result) { - MetadataImageExtractionPage.load(page, result); - }); - }, - - load: function (page, config) { - - $('#chkVIdeoImages', page).checked(config.EnableVideoImageExtraction).checkboxradio("refresh"); - - $('#chkMovies', page).checked(config.EnableMovieChapterImageExtraction).checkboxradio("refresh"); - $('#chkEpisodes', page).checked(config.EnableEpisodeChapterImageExtraction).checkboxradio("refresh"); - $('#chkOtherVideos', page).checked(config.EnableOtherVideoChapterImageExtraction).checkboxradio("refresh"); - - Dashboard.hideLoadingMsg(); - }, - - onSubmit: function () { - var form = this; - - Dashboard.showLoadingMsg(); - - ApiClient.getServerConfiguration().done(function (config) { - - config.EnableVideoImageExtraction = $('#chkVIdeoImages', form).checked(); - - config.EnableMovieChapterImageExtraction = $('#chkMovies', form).checked(); - config.EnableEpisodeChapterImageExtraction = $('#chkEpisodes', form).checked(); - config.EnableOtherVideoChapterImageExtraction = $('#chkOtherVideos', form).checked(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } -}; - -$(document).on('pageshow', "#metadataImageExtractionPage", MetadataImageExtractionPage.onPageShow); \ No newline at end of file diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index c273acd01b..660d39b45b 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -13,9 +13,25 @@ load: function (page, config) { - $('#txtNumbackdrops', page).val(config.MaxBackdrops); - $('#txtMinMovieBackdropDownloadWidth', page).val(config.MinMovieBackdropDownloadWidth); - $('#txtMinSeriesBackdropDownloadWidth', page).val(config.MinSeriesBackdropDownloadWidth); + // Movie options + $('#txtMaxMovieBackdrops', page).val(config.MovieOptions.MaxBackdrops); + $('#txtMinMovieBackdropDownloadWidth', page).val(config.MovieOptions.MinBackdropWidth); + + // Tv options + $('#txtMaxTvBackdrops', page).val(config.TvOptions.MaxBackdrops); + $('#txtMinTvBackdropDownloadWidth', page).val(config.TvOptions.MinBackdropWidth); + + // Music options + $('#txtMaxMusicBackdrops', page).val(config.MusicOptions.MaxBackdrops); + $('#txtMinMusicBackdropDownloadWidth', page).val(config.MusicOptions.MinBackdropWidth); + + // Game options + $('#txtMaxGameBackdrops', page).val(config.GameOptions.MaxBackdrops); + $('#txtMinGameBackdropDownloadWidth', page).val(config.GameOptions.MinBackdropWidth); + + // Book options + $('#txtMaxBookBackdrops', page).val(config.BookOptions.MaxBackdrops); + $('#txtMinBookBackdropDownloadWidth', page).val(config.BookOptions.MinBackdropWidth); $('#chkDownloadMovieArt', page).checked(config.DownloadMovieImages.Art).checkboxradio("refresh"); $('#chkDownloadMovieBackdrops', page).checked(config.DownloadMovieImages.Backdrops).checkboxradio("refresh"); @@ -56,37 +72,49 @@ ApiClient.getServerConfiguration().done(function (config) { config.ImageSavingConvention = $('#selectImageSavingConvention', form).val(); - - config.MaxBackdrops = $('#txtNumbackdrops', form).val(); - config.MinMovieBackdropDownloadWidth = $('#txtMinMovieBackdropDownloadWidth', form).val(); - config.MinSeriesBackdropDownloadWidth = $('#txtMinSeriesBackdropDownloadWidth', form).val(); + // Movie options + config.MovieOptions.MaxBackdrops = $('#txtMaxMovieBackdrops', form).val(); + config.MovieOptions.MinBackdropWidth = $('#txtMinMovieBackdropDownloadWidth', form).val(); config.DownloadMovieImages.Art = $('#chkDownloadMovieArt', form).checked(); config.DownloadMovieImages.Backdrops = $('#chkDownloadMovieBackdrops', form).checked(); config.DownloadMovieImages.Banner = $('#chkDownloadMovieBanner', form).checked(); config.DownloadMovieImages.Disc = $('#chkDownloadMovieDisc', form).checked(); config.DownloadMovieImages.Logo = $('#chkDownloadMovieLogo', form).checked(); config.DownloadMovieImages.Thumb = $('#chkDownloadMovieThumb', form).checked(); - + + // Tv options + config.TvOptions.MaxBackdrops = $('#txtMaxTvBackdrops', form).val(); + config.TvOptions.MinBackdropWidth = $('#txtMinTvBackdropDownloadWidth', form).val(); config.DownloadSeriesImages.Art = $('#chKDownloadTVArt', form).checked(); config.DownloadSeriesImages.Backdrops = $('#chkDownloadMovieBackdrops', form).checked(); config.DownloadSeriesImages.Banner = $('#chkDownloadTVBanner', form).checked(); config.DownloadSeriesImages.Logo = $('#chkDownloadTVLogo', form).checked(); config.DownloadSeriesImages.Thumb = $('#chkDownloadTVThumb', form).checked(); - config.DownloadSeasonImages.Banner = $('#chkDownloadSeasonBanner', form).checked(); config.DownloadSeasonImages.Thumb = $('#chkDownloadSeasonThumb', form).checked(); config.DownloadSeasonImages.Backdrops = $('#chkDownloadSeasonBackdrops', form).checked(); - + + // Music options + config.MusicOptions.MaxBackdrops = $('#txtMaxMusicBackdrops', form).val(); + config.MusicOptions.MinBackdropWidth = $('#txtMinMusicBackdropDownloadWidth', form).val(); config.DownloadMusicArtistImages.Backdrops = $('#chkDownloadArtistBackdrops', form).checked(); config.DownloadMusicArtistImages.Logo = $('#chkDownloadArtistLogo', form).checked(); config.DownloadMusicArtistImages.Primary = $('#chkDownloadArtistThumb', form).checked(); config.DownloadMusicArtistImages.Banner = $('#chkDownloadArtistBanner', form).checked(); - config.DownloadMusicAlbumImages.Primary = $('#chkDownloadAlbumPrimary', form).checked(); config.DownloadMusicAlbumImages.Backdrops = $('#chkDownloadAlbumBackdrops', form).checked(); config.DownloadMusicAlbumImages.Disc = $('#chkMusicAlbumDisc', form).checked(); + // Game options + config.GameOptions.MaxBackdrops = $('#txtMaxGameBackdrops', form).val(); + config.GameOptions.MinBackdropWidth = $('#txtMinGameBackdropDownloadWidth', form).val(); + + // Book options + config.BookOptions.MaxBackdrops = $('#txtMaxBookBackdrops', form).val(); + config.BookOptions.MinBackdropWidth = $('#txtMinBookBackdropDownloadWidth', form).val(); + + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html index a66bd0c9b4..609a21c36c 100644 --- a/dashboard-ui/wizarduser.html +++ b/dashboard-ui/wizarduser.html @@ -13,7 +13,7 @@

      Tell us about yourself

      -

      Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and ratings.

      +

      Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.