diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html index 7c20cdb7bf..761e6084a1 100644 --- a/dashboard-ui/metadatasubtitles.html +++ b/dashboard-ui/metadatasubtitles.html @@ -4,7 +4,7 @@ ${TitleMetadata} -
+
@@ -18,42 +18,41 @@
-

${HeaderSubtitleDownloadingHelp}

-
- ${HeaderDownloadSubtitlesFor} - - - - -
+
+ +
+ +

${HeaderSubtitleDownloadingHelp}


-
- -
-
+
${HeaderDownloadSubtitlesFor}
+
+ ${OptionMovies} + ${OptionEpisodes}

+
+
${LabelDownloadLanguages}
+
+
+
+

  • - - -
    ${LabelSkipIfAudioTrackPresentHelp}
    + ${LabelSkipIfAudioTrackPresent} +
    ${LabelSkipIfAudioTrackPresentHelp}
  • - - -
    ${LabelSkipIfGraphicalSubsPresentHelp}
    + ${LabelSkipIfGraphicalSubsPresent} +
    ${LabelSkipIfGraphicalSubsPresentHelp}
  • - - +
    ${ButtonRegister}
  • - - +
    diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js index d110a462aa..f3bfbcc65f 100644 --- a/dashboard-ui/scripts/metadatasubtitles.js +++ b/dashboard-ui/scripts/metadatasubtitles.js @@ -2,11 +2,11 @@ function loadPage(page, config, languages) { - $('#chkSubtitlesMovies', page).checked(config.DownloadMovieSubtitles).checkboxradio("refresh"); - $('#chkSubtitlesEpisodes', page).checked(config.DownloadEpisodeSubtitles).checkboxradio("refresh"); + $('#chkSubtitlesMovies', page).checked(config.DownloadMovieSubtitles); + $('#chkSubtitlesEpisodes', page).checked(config.DownloadEpisodeSubtitles); - $('#chkSkipIfGraphicalSubsPresent', page).checked(config.SkipIfGraphicalSubtitlesPresent).checkboxradio("refresh"); - $('#chkSkipIfAudioTrackPresent', page).checked(config.SkipIfAudioTrackMatches).checkboxradio("refresh"); + $('#chkSkipIfGraphicalSubsPresent', page).checked(config.SkipIfGraphicalSubtitlesPresent); + $('#chkSkipIfAudioTrackPresent', page).checked(config.SkipIfAudioTrackMatches); $('#txtOpenSubtitleUsername', page).val(config.OpenSubtitlesUsername); $('#txtOpenSubtitlePassword', page).val(''); @@ -18,20 +18,15 @@ function populateLanguages(page, config, languages) { - var html = '
    '; + var html = ''; for (var i = 0, length = languages.length; i < length; i++) { var culture = languages[i]; - var id = "chkSubtitleLanguage" + i; - - html += ''; - html += ''; + html += '' + culture.DisplayName + ''; } - html += '
    '; - $('.downloadLanguages', page).html(html).trigger('create'); var langs = config.DownloadLanguages || []; @@ -40,7 +35,7 @@ this.checked = langs.indexOf(this.getAttribute('data-lang')) != -1; - }).checkboxradio('refresh'); + }); } function onSubmit() { @@ -64,7 +59,11 @@ config.OpenSubtitlesPasswordHash = newPassword; } - config.DownloadLanguages = $('.chkLang:checked', form).get().map(function (c) { + config.DownloadLanguages = $('.chkLang', form).get().filter(function (c) { + + return c.checked; + + }).map(function (c) { return c.getAttribute('data-lang'); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index ebfe1b8101..d1c43003a5 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2246,10 +2246,10 @@ var AppInfo = {}; deps.push('registrationservices'); deps.push('cordova/back'); - deps.push('cordova/links'); if (browserInfo.android) { deps.push('cordova/android/androidcredentials'); + deps.push('cordova/links'); } }